Commit 63f0c6a2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'w1-drv-6.18' of... 

Merge tag 'w1-drv-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1 into char-misc-next

Krzysztof writes:

1-Wire bus drivers for v6.18

1. Correct missing interrupts in IMX 1-Wire Devicetree bindings.
2. Drop old, dead code from Matrox driver.

* tag 'w1-drv-6.18' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1:
  w1: matrox: Remove some deadcode in matrox_w1_remove()
  dt-bindings: w1: imx: Add an entry for the interrupts property
parents 7704e6be 25fb0ea9

Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml

+4 −0
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ properties: 
  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    maxItems: 1
@@ -40,5 +43,6 @@ examples: 
    owire@63fa4000 {

        compatible = "fsl,imx53-owire", "fsl,imx21-owire";

        reg = <0x63fa4000 0x4000>;

        interrupts = <88>;

        clocks = <&clks IMX5_CLK_OWIRE_GATE>;

    };

drivers/w1/masters/matrox_w1.c

+3 −7
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ struct matrox_device { 


	unsigned long phys_addr;

	void __iomem *virt_addr;

	unsigned long found;



	struct w1_bus_master *bus_master;

};
@@ -158,8 +157,6 @@ static int matrox_w1_probe(struct pci_dev *pdev, const struct pci_device_id *ent 


	pci_set_drvdata(pdev, dev);



	dev->found = 1;



	dev_info(&pdev->dev, "Matrox G400 GPIO transport layer for 1-wire.\n");



	return 0;
@@ -176,10 +173,9 @@ static void matrox_w1_remove(struct pci_dev *pdev) 
{

	struct matrox_device *dev = pci_get_drvdata(pdev);



	if (dev->found) {

	w1_remove_master_device(dev->bus_master);

	iounmap(dev->virt_addr);

	}



	kfree(dev);

}