Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+7
-7
+4
Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml
+4
Documentation/devicetree/bindings/w1/fsl-imx-owire.yaml
···
24
24
reg:
25
25
maxItems: 1
26
26
27
+
interrupts:
28
+
maxItems: 1
29
+
27
30
clocks:
28
31
maxItems: 1
29
32
···
43
40
owire@63fa4000 {
44
41
compatible = "fsl,imx53-owire", "fsl,imx21-owire";
45
42
reg = <0x63fa4000 0x4000>;
43
+
interrupts = <88>;
46
44
clocks = <&clks IMX5_CLK_OWIRE_GATE>;
47
45
};
+3
-7
drivers/w1/masters/matrox_w1.c
+3
-7
drivers/w1/masters/matrox_w1.c
···
47
47
48
48
unsigned long phys_addr;
49
49
void __iomem *virt_addr;
50
-
unsigned long found;
51
50
52
51
struct w1_bus_master *bus_master;
53
52
};
···
157
158
158
159
pci_set_drvdata(pdev, dev);
159
160
160
-
dev->found = 1;
161
-
162
161
dev_info(&pdev->dev, "Matrox G400 GPIO transport layer for 1-wire.\n");
163
162
164
163
return 0;
···
173
176
{
174
177
struct matrox_device *dev = pci_get_drvdata(pdev);
175
178
176
-
if (dev->found) {
177
-
w1_remove_master_device(dev->bus_master);
178
-
iounmap(dev->virt_addr);
179
-
}
179
+
w1_remove_master_device(dev->bus_master);
180
+
iounmap(dev->virt_addr);
181
+
180
182
kfree(dev);
181
183
}
182
184