iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Linus Torvalds
2015-07-28 10:24:37 -07:00
parent 90c8acceac 599ad5ac9a
commit 02ff371afd
4 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Documentation/devicetree/bindings/spi/spi-ath79.txt
View File

@@ -3,7 +3,7 @@ Binding for Qualcomm Atheros AR7xxx/AR9xxx SPI controller
Required properties: Required properties:
- compatible: has to be "qca,<soc-type>-spi", "qca,ar7100-spi" as fallback. - compatible: has to be "qca,<soc-type>-spi", "qca,ar7100-spi" as fallback.
- reg: Base address and size of the controllers memory area - reg: Base address and size of the controllers memory area
- clocks: phandle to the AHB clock. - clocks: phandle of the AHB clock.
- clock-names: has to be "ahb". - clock-names: has to be "ahb".
- #address-cells: <1>, as required by generic SPI binding. - #address-cells: <1>, as required by generic SPI binding.
- #size-cells: <0>, also as required by generic SPI binding. - #size-cells: <0>, also as required by generic SPI binding.
@@ -12,9 +12,9 @@ Child nodes as per the generic SPI binding.
Example: Example:
spi@1F000000 { spi@1f000000 {
compatible = "qca,ar9132-spi", "qca,ar7100-spi"; compatible = "qca,ar9132-spi", "qca,ar7100-spi";
reg = <0x1F000000 0x10>; reg = <0x1f000000 0x10>;
clocks = <&pll 2>; clocks = <&pll 2>;
clock-names = "ahb"; clock-names = "ahb";

2
drivers/of/Kconfig
View File

@@ -47,7 +47,7 @@ config OF_DYNAMIC
config OF_ADDRESS config OF_ADDRESS
def_bool y def_bool y
depends on !SPARC depends on !SPARC && HAS_IOMEM
select OF_ADDRESS_PCI if PCI select OF_ADDRESS_PCI if PCI
config OF_ADDRESS_PCI config OF_ADDRESS_PCI

3
drivers/of/unittest.c
View File

@@ -979,7 +979,6 @@ static struct platform_driver unittest_driver = {
.remove = unittest_remove, .remove = unittest_remove,
.driver = { .driver = {
.name = "unittest", .name = "unittest",
.owner = THIS_MODULE,
.of_match_table = of_match_ptr(unittest_match), .of_match_table = of_match_ptr(unittest_match),
}, },
}; };
@@ -1666,7 +1665,6 @@ static const struct i2c_device_id unittest_i2c_dev_id[] = {
static struct i2c_driver unittest_i2c_dev_driver = { static struct i2c_driver unittest_i2c_dev_driver = {
.driver = { .driver = {
.name = "unittest-i2c-dev", .name = "unittest-i2c-dev",
.owner = THIS_MODULE,
}, },
.probe = unittest_i2c_dev_probe, .probe = unittest_i2c_dev_probe,
.remove = unittest_i2c_dev_remove, .remove = unittest_i2c_dev_remove,
@@ -1761,7 +1759,6 @@ static const struct i2c_device_id unittest_i2c_mux_id[] = {
static struct i2c_driver unittest_i2c_mux_driver = { static struct i2c_driver unittest_i2c_mux_driver = {
.driver = { .driver = {
.name = "unittest-i2c-mux", .name = "unittest-i2c-mux",
.owner = THIS_MODULE,
}, },
.probe = unittest_i2c_mux_probe, .probe = unittest_i2c_mux_probe,
.remove = unittest_i2c_mux_remove, .remove = unittest_i2c_mux_remove,

2
include/linux/of_device.h
View File

@@ -59,7 +59,7 @@ void of_dma_configure(struct device *dev, struct device_node *np);
#else /* CONFIG_OF */ #else /* CONFIG_OF */
static inline int of_driver_match_device(struct device *dev, static inline int of_driver_match_device(struct device *dev,
struct device_driver *drv) const struct device_driver *drv)
{ {
return 0; return 0;
} }