Merge tag 'md/4.2' of git://neil.brown.name/md

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / ste-href-tvk1281618.dtsi

diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
index 062c6aae3afa8406580976ddd95869a321d8d69c..0e1c96943d4795e7bd7355c03f5449ec71ae626a 100644 (file)
--- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
+++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi
@@ -99,10 +99,13 @@
                                vddio-supply = <&db8500_vsmps2_reg>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&accel_tvk_mode>;
+                               interrupt-parent = <&gpio2>;
+                               interrupts = <18 IRQ_TYPE_EDGE_RISING>,
+                                            <19 IRQ_TYPE_EDGE_RISING>;
                        };
-                       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>;