diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-11 08:26:36 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2018-09-11 17:23:13 +0200 |
| commit | 6acd8ef6ccebfcd42e0ede49d6034beeb48b425a (patch) | |
| tree | 77ca233504153b50d7931e2af727fdc0dcecd943 /dts/src/arm/omap4-droid4-xt894.dts | |
| parent | 35f607bc7da71b302fd6bf3d6d48d7ea66df1195 (diff) | |
| download | barebox-6acd8ef6ccebfcd42e0ede49d6034beeb48b425a.tar.gz barebox-6acd8ef6ccebfcd42e0ede49d6034beeb48b425a.tar.xz | |
dts: update to v4.19-rc2
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'dts/src/arm/omap4-droid4-xt894.dts')
| -rw-r--r-- | dts/src/arm/omap4-droid4-xt894.dts | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/dts/src/arm/omap4-droid4-xt894.dts b/dts/src/arm/omap4-droid4-xt894.dts index 12d6822f00..04758a2a87 100644 --- a/dts/src/arm/omap4-droid4-xt894.dts +++ b/dts/src/arm/omap4-droid4-xt894.dts @@ -354,7 +354,7 @@ &mmc2 { vmmc-supply = <&vsdio>; bus-width = <8>; - non-removable; + ti,non-removable; }; &mmc3 { @@ -621,15 +621,6 @@ OMAP4_IOPAD(0x10c, PIN_INPUT | MUX_MODE1) /* abe_mcbsp3_fsx */ >; }; -}; - -&omap4_pmx_wkup { - usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins { - /* gpio_wk0 */ - pinctrl-single,pins = < - OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3) - >; - }; vibrator_direction_pin: pinmux_vibrator_direction_pin { pinctrl-single,pins = < @@ -644,6 +635,15 @@ }; }; +&omap4_pmx_wkup { + usb_gpio_mux_sel2: pinmux_usb_gpio_mux_sel2_pins { + /* gpio_wk0 */ + pinctrl-single,pins = < + OMAP4_IOPAD(0x040, PIN_OUTPUT_PULLDOWN | MUX_MODE3) + >; + }; +}; + /* * As uart1 is wired to mdm6600 with rts and cts, we can use the cts pin for * uart1 wakeirq. |