Merge tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/dt

Merge "Ux500 Device Tree changes for the v4.2 series" form Linus Walleij:

Define CPU topology, connect that with CoreSight blocks,
add sensor information to DT boards.

* tag 'ux500-v4.2-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: add the sensors to the STUIB board
  ARM: ux500: assign the sensor trigger IRQs
  ARM: ux500: fix lsm303dlh magnetometer compat string
  ARM: ux500: add CoreSight blocks to DTS file
  ARM: ux500: define CPU topology

1 files changed, 21 insertions, 2 deletions

diff --git a/arch/arm/boot/dts/ste-snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 1bc84ebdccaa..9edadc37719f 100644
--- a/arch/arm/boot/dts/ste-snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -262,15 +262,19 @@
                                 vddio-supply = <&db8500_vsmps2_reg>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&accel_snowball_mode>;
+                                interrupt-parent = <&gpio5>;
+                                interrupts = <3 IRQ_TYPE_EDGE_RISING>, /* INT1 */
+                                             <4 IRQ_TYPE_EDGE_RISING>; /* INT2 */
                         };
-                        lsm303dlm@1e {
+                        lsm303dlh@1e {
                                 /* Magnetometer */
-                                compatible = "st,lsm303dlm-magn";
+                                compatible = "st,lsm303dlh-magn";
                                 reg = <0x1e>;
                                 vdd-supply = <&ab8500_ldo_aux1_reg>;
                                 vddio-supply = <&db8500_vsmps2_reg>;
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&magneto_snowball_mode>;
+                                gpios = <&gpio5 5 0x4>; /* DRDY line */
                         };
                         l3g4200d@68 {
                                 /* Gyroscope */
@@ -279,6 +283,11 @@
                                 reg = <0x68>;
                                 vdd-supply = <&ab8500_ldo_aux1_reg>;
                                 vddio-supply = <&db8500_vsmps2_reg>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&gyro_snowball_mode>;
+                                gpios = <&gpio5 6 0x4>; /* DRDY line */
+                                interrupt-parent = <&gpio5>;
+                                interrupts = <9 IRQ_TYPE_EDGE_RISING>; /* INT1 */
                         };
                         lsp001wm@5c {
                                 /* Barometer/pressure sensor */
@@ -489,6 +498,16 @@
                                         };
                                 };
                         };
+                        gyro {
+                                gyro_snowball_mode: gyro_snowball {
+                                        snowball_cfg1 {
+                                                pins =
+                                                "GPIO166_A22", /* DRDY */
+                                                "GPIO169_D22"; /* INT */
+                                                ste,config = <&gpio_in_pu>;
+                                        };
+                                };
+                        };
                         magnetometer {
                                 magneto_snowball_mode: magneto_snowball {
                                         snowball_cfg1 {