ARM: nomadik: push accelerometer down to boards

The two Nomadik variants have the accelerometer mounted on
different I2C lines. Push the definition down to the top-level
board DTS files to get things right.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/arch/arm/boot/dts/ste-nomadik-nhk15.dts b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
index 9d888b0e75af3c59aeb2acd8fb13e7a72fe0a741..4a21c6492dbb89b386bb4ab365b9b10a16f4a72f 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-nhk15.dts
+++ b/arch/arm/boot/dts/ste-nomadik-nhk15.dts
@@ -83,6 +83,11 @@
        };
 
        i2c0 {
+               lis3lv02dl@1d {
+                       /* Accelerometer */
+                       compatible = "st,lis3lv02dl-accel";
+                       reg = <0x1d>;
+               };
                stmpe0: stmpe2401@43 {
                        compatible = "st,stmpe2401";
                        reg = <0x43>;

diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index 11b5e34150b835d002e473a49a75ba49e867ed78..35282c0105c6a1de01b80371b77e98aa82cfadf1 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/arch/arm/boot/dts/ste-nomadik-s8815.dts
@@ -105,6 +105,14 @@
                };
        };
 
+       i2c1 {
+               lis3lv02dl@1d {
+                       /* Accelerometer */
+                       compatible = "st,lis3lv02dl-accel";
+                       reg = <0x1d>;
+               };
+       };
+
        /* GPIO I2C connected to the USB portions of the STw4811 only */
        gpio-i2c {
                compatible = "i2c-gpio";

diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index ce8936bebe5e7a24e5c83e4d060d0d8dc5142dd3..176e332fc0bd6b48843f2dd3dfaa5a488c7260b2 100644 (file)
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -720,11 +720,6 @@
                           compatible = "st,stw5095";
                           reg = <0x1a>;
                };
-               lis3lv02dl@1d {
-                       /* Accelerometer */
-                       compatible = "st,lis3lv02dl-accel";
-                       reg = <0x1d>;
-               };
        };
 
        amba {