diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-07-17 02:10:27 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-07-17 02:10:27 +1000 |
| commit | bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0 (patch) | |
| tree | dee9f8b31f3d6d2fb141541da88e1cc1329b017e /arch/arm/boot/dts/omap3-lilly-a83x.dtsi | |
| parent | Merge commit 'v3.15' into next (diff) | |
| parent | Linux 3.16-rc5 (diff) | |
| download | linux-dev-bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0.tar.xz linux-dev-bd89bb78f35fd175db7a9cfc504d789b6ca0f7b0.zip | |
Sync with the changes pushed by Serge in the last merge window.
Diffstat (limited to 'arch/arm/boot/dts/omap3-lilly-a83x.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/omap3-lilly-a83x.dtsi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi index cc1dce6978f5..d97308896f0c 100644 --- a/arch/arm/boot/dts/omap3-lilly-a83x.dtsi +++ b/arch/arm/boot/dts/omap3-lilly-a83x.dtsi @@ -176,9 +176,6 @@ &omap3_pmx_core2 { pinctrl-names = "default"; - pinctrl-0 = < - &hsusb1_2_pins - >; hsusb1_2_pins: pinmux_hsusb1_2_pins { pinctrl-single,pins = < @@ -357,6 +354,10 @@ power = <50>; }; +&mcbsp2 { + status = "okay"; +}; + &gpmc { ranges = <0 0 0x30000000 0x1000000>, <7 0 0x15000000 0x01000000>; |