diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 10:27:45 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-08-13 10:27:45 +0200 |
| commit | 50612dd967f6898b597f034ab233c3d9cf46466e (patch) | |
| tree | fbfc43942cdac750c98a1a03f87336d2d076ddbe /dts/src | |
| parent | 7b88e4f491e9313f18591a3e792f567c84608271 (diff) | |
| download | barebox-50612dd967f6898b597f034ab233c3d9cf46466e.tar.gz barebox-50612dd967f6898b597f034ab233c3d9cf46466e.tar.xz | |
dts: update to v4.18-rc6
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src')
| -rw-r--r-- | dts/src/arm/imx6qdl-zii-rdu2.dtsi | 2 | ||||
| -rw-r--r-- | dts/src/arm/omap4-droid4-xt894.dts | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/dts/src/arm/imx6qdl-zii-rdu2.dtsi b/dts/src/arm/imx6qdl-zii-rdu2.dtsi index 19a075aee1..f14df0baf2 100644 --- a/dts/src/arm/imx6qdl-zii-rdu2.dtsi +++ b/dts/src/arm/imx6qdl-zii-rdu2.dtsi @@ -692,7 +692,7 @@ dsa,member = <0 0>; eeprom-length = <512>; interrupt-parent = <&gpio6>; - interrupts = <3 IRQ_TYPE_EDGE_FALLING>; + interrupts = <3 IRQ_TYPE_LEVEL_LOW>; interrupt-controller; #interrupt-cells = <2>; diff --git a/dts/src/arm/omap4-droid4-xt894.dts b/dts/src/arm/omap4-droid4-xt894.dts index bdf73cbcec..e7c3c563ff 100644 --- a/dts/src/arm/omap4-droid4-xt894.dts +++ b/dts/src/arm/omap4-droid4-xt894.dts @@ -159,13 +159,7 @@ dais = <&mcbsp2_port>, <&mcbsp3_port>; }; -}; - -&dss { - status = "okay"; -}; -&gpio6 { pwm8: dmtimer-pwm-8 { pinctrl-names = "default"; pinctrl-0 = <&vibrator_direction_pin>; @@ -192,7 +186,10 @@ pwm-names = "enable", "direction"; direction-duty-cycle-ns = <10000000>; }; +}; +&dss { + status = "okay"; }; &dsi1 { |