Merge tag 'mvebu_dt_for_v3.10' of git://git.infradead.org/users/jcooper/linux into next/dt

From Jason Cooper <jason@lakedaemon.net>:

mvebu DT changes for v3.10

 - mvebu: gpio expander for the Mirabox
 - kirkwood: thermal sensor
 - dove: thermal sensor

* tag 'mvebu_dt_for_v3.10' of git://git.infradead.org/users/jcooper/linux:
  Dove: Thermal: Add DT node and enable in defconfig
  ARM: Kirkwood: Add support thermal sensor for 88F6282 and 88F6283
  arm: mvebu: enable gpio expander over i2c on Mirabox platform

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

5 files changed, 26 insertions, 0 deletions

diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index dd0c57dd9f30..193ae1467816 100644
--- 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 67dbe20868a2..0056214935f4 100644
--- 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 192cf76fbf93..23991e45bc55 100644
--- 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 3fe8dae8d32d..4364eff5b01e 100644
--- 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 13482ea58b09..8f0065bb6f39 100644
--- 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