Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'devicetree-fixes-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:
"A handful of DT related fixes for 4.2-rc"

* tag 'devicetree-fixes-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
of: Drop owner assignment from platform and i2c driver
DEVICETREE: Misc fix for the AR7100 SPI controller binding
of: constify drv arg of of_driver_match_device stub
of: add HAS_IOMEM depends to OF_ADDRESS

+5 -8
+3 -3
Documentation/devicetree/bindings/spi/spi-ath79.txt
··· 3 3 Required properties: 4 4 - compatible: has to be "qca,<soc-type>-spi", "qca,ar7100-spi" as fallback. 5 5 - reg: Base address and size of the controllers memory area 6 - - clocks: phandle to the AHB clock. 6 + - clocks: phandle of the AHB clock. 7 7 - clock-names: has to be "ahb". 8 8 - #address-cells: <1>, as required by generic SPI binding. 9 9 - #size-cells: <0>, also as required by generic SPI binding. ··· 12 12 13 13 Example: 14 14 15 - spi@1F000000 { 15 + spi@1f000000 { 16 16 compatible = "qca,ar9132-spi", "qca,ar7100-spi"; 17 - reg = <0x1F000000 0x10>; 17 + reg = <0x1f000000 0x10>; 18 18 19 19 clocks = <&pll 2>; 20 20 clock-names = "ahb";
+1 -1
drivers/of/Kconfig
··· 47 47 48 48 config OF_ADDRESS 49 49 def_bool y 50 - depends on !SPARC 50 + depends on !SPARC && HAS_IOMEM 51 51 select OF_ADDRESS_PCI if PCI 52 52 53 53 config OF_ADDRESS_PCI
-3
drivers/of/unittest.c
··· 979 979 .remove = unittest_remove, 980 980 .driver = { 981 981 .name = "unittest", 982 - .owner = THIS_MODULE, 983 982 .of_match_table = of_match_ptr(unittest_match), 984 983 }, 985 984 }; ··· 1665 1666 static struct i2c_driver unittest_i2c_dev_driver = { 1666 1667 .driver = { 1667 1668 .name = "unittest-i2c-dev", 1668 - .owner = THIS_MODULE, 1669 1669 }, 1670 1670 .probe = unittest_i2c_dev_probe, 1671 1671 .remove = unittest_i2c_dev_remove, ··· 1759 1761 static struct i2c_driver unittest_i2c_mux_driver = { 1760 1762 .driver = { 1761 1763 .name = "unittest-i2c-mux", 1762 - .owner = THIS_MODULE, 1763 1764 }, 1764 1765 .probe = unittest_i2c_mux_probe, 1765 1766 .remove = unittest_i2c_mux_remove,
+1 -1
include/linux/of_device.h
··· 59 59 #else /* CONFIG_OF */ 60 60 61 61 static inline int of_driver_match_device(struct device *dev, 62 - struct device_driver *drv) 62 + const struct device_driver *drv) 63 63 { 64 64 return 0; 65 65 }