ARM: dts: ux500: Push sensors to TVK R2 board

These sensors are particular to the TVK UIB R2 board and
will conflict with the R3 board, so push them down to
the actual UIB include DTSI.

Rename the nodes appropriately to accelerometer@ etc
in the process.

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
index de6acee738e5a83659a426edac7c224d87ac4dbc..b9b85ffc142db46340416353a1e383a16649efe8 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618-r2.dtsi
@@ -8,7 +8,7 @@
 / {
        soc {
                i2c@80128000 {
-                       lsm303dlh@18 {
+                       accelerometer@18 {
                                /* Accelerometer */
                                compatible = "st,lsm303dlh-accel";
                                st,drdy-int-pin = <1>;
@@ -30,7 +30,7 @@
                                 * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>;
                                 */
                        };
-                       lsm303dlh@1e {
+                       magnetometer@1e {
                                /* Magnetometer */
                                compatible = "st,lsm303dlh-magn";
                                reg = <0x1e>;
@@ -48,7 +48,7 @@
                                 * <&gpio2 19 IRQ_TYPE_EDGE_FALLING>;
                                 */
                        };
-                       lis331dl@1c {
+                       accelerometer@1c {
                                /* Accelerometer */
                                compatible = "st,lis331dl-accel";
                                st,drdy-int-pin = <1>;
@@ -62,6 +62,46 @@
                                interrupts = <18 IRQ_TYPE_EDGE_RISING>,
                                             <19 IRQ_TYPE_EDGE_RISING>;
                        };
+                       magnetometer@f {
+                               /* Magnetometer */
+                               compatible = "asahi-kasei,ak8974";
+                               reg = <0x0f>;
+                               avdd-supply = <&ab8500_ldo_aux1_reg>;
+                               dvdd-supply = <&db8500_vsmps2_reg>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&gyro_magn_tvk_mode>;
+                               /*
+                                * These interrupts cannot be used: the other component
+                                * ST-Micro L3D4200D gyro that is connected to the same lines
+                                * cannot set its DRDY line to open drain, so it cannot be
+                                * shared with other peripherals. The should be defined for
+                                * the falling edge if they could be wired together.
+                                *
+                                * interrupts-extended =
+                                * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>,
+                                * <&gpio0 31 IRQ_TYPE_EDGE_FALLING>;
+                                */
+                       };
+                       gyroscope@68 {
+                               /* Gyroscope */
+                               compatible = "st,l3g4200d-gyro";
+                               st,drdy-int-pin = <2>;
+                               reg = <0x68>;
+                               vdd-supply = <&ab8500_ldo_aux1_reg>;
+                               vddio-supply = <&db8500_vsmps2_reg>;
+                               pinctrl-names = "default";
+                               pinctrl-0 = <&gyro_magn_tvk_mode>;
+                               interrupts-extended =
+                               <&gpio1 0 IRQ_TYPE_EDGE_RISING>,
+                               <&gpio0 31 IRQ_TYPE_EDGE_RISING>;
+                       };
+                       pressure@5c {
+                               /* Barometer/pressure sensor */
+                               compatible = "st,lps001wp-press";
+                               reg = <0x5c>;
+                               vdd-supply = <&ab8500_ldo_aux1_reg>;
+                               vddio-supply = <&db8500_vsmps2_reg>;
+                       };
                };
                i2c@80110000 {
                        synaptics@4b {
@@ -102,6 +142,33 @@
                        };
                };
                pinctrl {
+                       accelerometer {
+                               accel_tvk_mode: accel_tvk {
+                                       /* Accelerometer interrupt lines 1 & 2 */
+                                       tvk_cfg {
+                                               pins = "GPIO82_C1", "GPIO83_D3";
+                                               ste,config = <&gpio_in_pd>;
+                                       };
+                               };
+                       };
+                       gyroscope {
+                               /*
+                                * These lines are shared between Gyroscope l3g400dh
+                                * and AK8974 magnetometer.
+                                */
+                               gyro_magn_tvk_mode: gyro_magn_tvk {
+                                        /* GPIO 31 used for INT pull down the line */
+                                       tvk_cfg1 {
+                                               pins = "GPIO31_V3";
+                                               ste,config = <&gpio_in_pd>;
+                                       };
+                                       /* GPIO 32 used for DRDY, pull this down */
+                                       tvk_cfg2 {
+                                               pins = "GPIO32_V2";
+                                               ste,config = <&gpio_in_pd>;
+                                       };
+                               };
+                       };
                        synaptics {
                                synaptics_tvk_mode: synaptics_tvk {
                                        /* Touchscreen uses GPIO 84 */

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 34b9f434b4b7714571cb96f6fec64766e2edb1b1..aa68224560f6006f0a67e30aac33fbf50666a1ad 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -81,49 +81,6 @@
                                };
                        };
                };
-               /* Sensors mounted on all board variants */
-               i2c@80128000 {
-                       ak8974@f {
-                               /* Magnetometer */
-                               compatible = "asahi-kasei,ak8974";
-                               reg = <0x0f>;
-                               avdd-supply = <&ab8500_ldo_aux1_reg>;
-                               dvdd-supply = <&db8500_vsmps2_reg>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&gyro_magn_tvk_mode>;
-                               /*
-                                * These interrupts cannot be used: the other component
-                                * ST-Micro L3D4200D gyro that is connected to the same lines
-                                * cannot set its DRDY line to open drain, so it cannot be
-                                * shared with other peripherals. The should be defined for
-                                * the falling edge if they could be wired together.
-                                *
-                                * interrupts-extended =
-                                * <&gpio1 0 IRQ_TYPE_EDGE_FALLING>,
-                                * <&gpio0 31 IRQ_TYPE_EDGE_FALLING>;
-                                */
-                       };
-                       l3g4200d@68 {
-                               /* Gyroscope */
-                               compatible = "st,l3g4200d-gyro";
-                               st,drdy-int-pin = <2>;
-                               reg = <0x68>;
-                               vdd-supply = <&ab8500_ldo_aux1_reg>;
-                               vddio-supply = <&db8500_vsmps2_reg>;
-                               pinctrl-names = "default";
-                               pinctrl-0 = <&gyro_magn_tvk_mode>;
-                               interrupts-extended =
-                               <&gpio1 0 IRQ_TYPE_EDGE_RISING>,
-                               <&gpio0 31 IRQ_TYPE_EDGE_RISING>;
-                       };
-                       lsp001wm@5c {
-                               /* Barometer/pressure sensor */
-                               compatible = "st,lps001wp-press";
-                               reg = <0x5c>;
-                               vdd-supply = <&ab8500_ldo_aux1_reg>;
-                               vddio-supply = <&db8500_vsmps2_reg>;
-                       };
-               };
 
                pinctrl {
                        /* Pull up this GPIO pin */
@@ -151,33 +108,6 @@
                                        };
                                };
                        };
-                       accelerometer {
-                               accel_tvk_mode: accel_tvk {
-                                       /* Accelerometer interrupt lines 1 & 2 */
-                                       tvk_cfg {
-                                               pins = "GPIO82_C1", "GPIO83_D3";
-                                               ste,config = <&gpio_in_pd>;
-                                       };
-                               };
-                       };
-                       gyroscope {
-                               /*
-                                * These lines are shared between Gyroscope l3g400dh
-                                * and AK8974 magnetometer.
-                                */
-                               gyro_magn_tvk_mode: gyro_magn_tvk {
-                                        /* GPIO 31 used for INT pull down the line */
-                                       tvk_cfg1 {
-                                               pins = "GPIO31_V3";
-                                               ste,config = <&gpio_in_pd>;
-                                       };
-                                       /* GPIO 32 used for DRDY, pull this down */
-                                       tvk_cfg2 {
-                                               pins = "GPIO32_V2";
-                                               ste,config = <&gpio_in_pd>;
-                                       };
-                               };
-                       };
                };
        };
 };