diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi index d38384056e4..a4767484a53 100644 --- a/arch/arm/boot/dts/omap3.dtsi +++ b/arch/arm/boot/dts/omap3.dtsi @@ -112,7 +112,7 @@ pinctrl-single,register-width = <16>; pinctrl-single,function-mask = <0x7f1f>; #gpio-range-cells = <3>; - }; + }; gpio1: gpio@48310000 { compatible = "ti,omap3-gpio"; @@ -270,7 +270,6 @@ ti,hwmods = "i2c3"; }; */ - /* mcspi1: spi@48098000 { compatible = "ti,omap2-mcspi"; #address-cells = <1>; @@ -323,8 +322,7 @@ ti,spi-num-cs = <1>; dmas = <&sdma 70>, <&sdma 71>; dma-names = "tx0", "rx0"; - }; - */ + }; mmc1: mmc@4809c000 { compatible = "ti,omap3-hsmmc"; @@ -353,7 +351,6 @@ ti,hwmods = "wd_timer2"; }; - mcbsp1: mcbsp@48074000 { compatible = "ti,omap3-mcbsp"; reg = <0x48074000 0xff>; @@ -558,9 +555,10 @@ /* }; */ }; - /* We're initializing GPMC through the boardfile.*/ - - /* + /* GPMC needs to be initialized here, or everything + * falls apart. + */ + gpmc: gpmc@6e000000 { compatible = "ti,omap3430-gpmc"; ti,hwmods = "gpmc"; @@ -570,7 +568,7 @@ gpmc,num-waitpins = <4>; #address-cells = <2>; #size-cells = <1>; - };*/ + }; /* usb_otg_hs: usb_otg_hs@480ab000 { |