Merge tag 'at91-dt' of git://github.com/at91linux/linux-at91 into next/dt

From Nicolas Ferre <nicolas.ferre@atmel.com>:

DT modifications for at91rm9200 and at91sam9x5 SoCs, mainly around
I2C. Also some cleanup of some unneeded properties and conflicting
nodes.
One more DT-only board based on at91rm9200.

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91/at91sam9x5cm: add 1-wire chip on CM board
  ARM: at91/at91sam9x5ek: i2c1 and i2c2 conflict with macb and lcd
  ARM: at91/dt: gpio-keys: remove address-cells and size-cells properties
  ARM: at91: add MPA 1600 DT board
  ARM: at91: add pinctrl nodes to i2c-gpio on RM92000 DT
  ARM: at91: add TWI bindings to RM9200 DT
  ARM: at91: dt: at91sam9x5: add i2c-gpio pinctrl
  ARM: at91: dt: at91sam9x5: add i2c pinctrl

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index dd0c57dd9f3096ae40b35e2b4e43fc3c983f3ea1..193ae1467816009ab658eac727f8d563c60d91e0 100644 (file)
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -70,5 +70,16 @@
                usb@d0051000 {
                        status = "okay";
                };
+
+               i2c@d0011000 {
+                       status = "okay";
+                       clock-frequency = <100000>;
+                       pca9505: pca9505@25 {
+                               compatible = "nxp,pca9505";
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                               reg = <0x25>;
+                       };
+               };
        };
 };

diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index f7509cafc377a14dc38aa5d77232c264a8d8a301..6cab46849cdb471d44b81ddf21f216999c6baeb4 100644 (file)
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -50,6 +50,11 @@
                        #clock-cells = <1>;
                };
 
+               thermal: thermal@d001c {
+                       compatible = "marvell,dove-thermal";
+                       reg = <0xd001c 0x0c>, <0xd005c 0x08>;
+               };
+
                uart0: serial@12000 {
                        compatible = "ns16550a";
                        reg = <0x12000 0x100>;

diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index 192cf76fbf93ca92914a76df62b9fd45bf892249..23991e45bc55f946609e84cc319c81aeed6d0122 100644 (file)
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -49,6 +49,12 @@
                        };
                };
 
+               thermal@10078 {
+                       compatible = "marvell,kirkwood-thermal";
+                       reg = <0x10078 0x4>;
+                       status = "okay";
+               };
+
                i2c@11100 {
                        compatible = "marvell,mv64xxx-i2c";
                        reg = <0x11100 0x20>;

diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 3fe8dae8d32df9df58296701c9de71b86d2a3222..4364eff5b01ea79f95f9e31d82ec1ef22678eadf 100644 (file)
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -75,6 +75,8 @@ CONFIG_I2C_MV64XXX=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 # CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_DOVE_THERMAL=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y

diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 13482ea58b09e2007e140b87b66ac151938b036c..8f0065bb6f3934e042aaee26ce33e558f5ec7994 100644 (file)
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -119,6 +119,8 @@ CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 CONFIG_GPIO_SYSFS=y
 # CONFIG_HWMON is not set
+CONFIG_THERMAL=y
+CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_HID_DRAGONRISE=y