diff options
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-a4.dts | 5 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-common.dtsi | 251 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda-es.dts | 3 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4-panda.dts | 245 | ||||
-rw-r--r-- | arch/arm/boot/dts/omap4460.dtsi | 1 |
5 files changed, 259 insertions, 246 deletions
diff --git a/arch/arm/boot/dts/omap4-panda-a4.dts b/arch/arm/boot/dts/omap4-panda-a4.dts index 75466d2abfb5..e30cdf0f5ac1 100644 --- a/arch/arm/boot/dts/omap4-panda-a4.dts +++ b/arch/arm/boot/dts/omap4-panda-a4.dts | |||
@@ -5,7 +5,10 @@ | |||
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | /include/ "omap4-panda.dts" | 8 | /dts-v1/; |
9 | |||
10 | /include/ "omap443x.dtsi" | ||
11 | /include/ "omap4-panda-common.dtsi" | ||
9 | 12 | ||
10 | /* Pandaboard Rev A4+ have external pullups on SCL & SDA */ | 13 | /* Pandaboard Rev A4+ have external pullups on SCL & SDA */ |
11 | &dss_hdmi_pins { | 14 | &dss_hdmi_pins { |
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi new file mode 100644 index 000000000000..03bd60deb52b --- /dev/null +++ b/arch/arm/boot/dts/omap4-panda-common.dtsi | |||
@@ -0,0 +1,251 @@ | |||
1 | /* | ||
2 | * Copyright (C) 2011-2013 Texas Instruments Incorporated - http://www.ti.com/ | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | /include/ "elpida_ecb240abacn.dtsi" | ||
9 | |||
10 | / { | ||
11 | model = "TI OMAP4 PandaBoard"; | ||
12 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; | ||
13 | |||
14 | memory { | ||
15 | device_type = "memory"; | ||
16 | reg = <0x80000000 0x40000000>; /* 1 GB */ | ||
17 | }; | ||
18 | |||
19 | leds { | ||
20 | compatible = "gpio-leds"; | ||
21 | heartbeat { | ||
22 | label = "pandaboard::status1"; | ||
23 | gpios = <&gpio1 7 0>; | ||
24 | linux,default-trigger = "heartbeat"; | ||
25 | }; | ||
26 | |||
27 | mmc { | ||
28 | label = "pandaboard::status2"; | ||
29 | gpios = <&gpio1 8 0>; | ||
30 | linux,default-trigger = "mmc0"; | ||
31 | }; | ||
32 | }; | ||
33 | |||
34 | sound: sound { | ||
35 | compatible = "ti,abe-twl6040"; | ||
36 | ti,model = "PandaBoard"; | ||
37 | |||
38 | ti,mclk-freq = <38400000>; | ||
39 | |||
40 | ti,mcpdm = <&mcpdm>; | ||
41 | |||
42 | ti,twl6040 = <&twl6040>; | ||
43 | |||
44 | /* Audio routing */ | ||
45 | ti,audio-routing = | ||
46 | "Headset Stereophone", "HSOL", | ||
47 | "Headset Stereophone", "HSOR", | ||
48 | "Ext Spk", "HFL", | ||
49 | "Ext Spk", "HFR", | ||
50 | "Line Out", "AUXL", | ||
51 | "Line Out", "AUXR", | ||
52 | "HSMIC", "Headset Mic", | ||
53 | "Headset Mic", "Headset Mic Bias", | ||
54 | "AFML", "Line In", | ||
55 | "AFMR", "Line In"; | ||
56 | }; | ||
57 | }; | ||
58 | |||
59 | &omap4_pmx_core { | ||
60 | pinctrl-names = "default"; | ||
61 | pinctrl-0 = < | ||
62 | &twl6040_pins | ||
63 | &mcpdm_pins | ||
64 | &mcbsp1_pins | ||
65 | &dss_hdmi_pins | ||
66 | &tpd12s015_pins | ||
67 | >; | ||
68 | |||
69 | twl6040_pins: pinmux_twl6040_pins { | ||
70 | pinctrl-single,pins = < | ||
71 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | ||
72 | 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ | ||
73 | >; | ||
74 | }; | ||
75 | |||
76 | mcpdm_pins: pinmux_mcpdm_pins { | ||
77 | pinctrl-single,pins = < | ||
78 | 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ | ||
79 | 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ | ||
80 | 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ | ||
81 | 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ | ||
82 | 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ | ||
83 | >; | ||
84 | }; | ||
85 | |||
86 | mcbsp1_pins: pinmux_mcbsp1_pins { | ||
87 | pinctrl-single,pins = < | ||
88 | 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ | ||
89 | 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ | ||
90 | 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ | ||
91 | 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ | ||
92 | >; | ||
93 | }; | ||
94 | |||
95 | dss_hdmi_pins: pinmux_dss_hdmi_pins { | ||
96 | pinctrl-single,pins = < | ||
97 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
98 | 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ | ||
99 | 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ | ||
100 | >; | ||
101 | }; | ||
102 | |||
103 | tpd12s015_pins: pinmux_tpd12s015_pins { | ||
104 | pinctrl-single,pins = < | ||
105 | 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ | ||
106 | 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ | ||
107 | 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ | ||
108 | >; | ||
109 | }; | ||
110 | |||
111 | i2c1_pins: pinmux_i2c1_pins { | ||
112 | pinctrl-single,pins = < | ||
113 | 0xe2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */ | ||
114 | 0xe4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */ | ||
115 | >; | ||
116 | }; | ||
117 | |||
118 | i2c2_pins: pinmux_i2c2_pins { | ||
119 | pinctrl-single,pins = < | ||
120 | 0xe6 0x118 /* i2c2_scl PULLUP | INPUTENABLE | MODE0 */ | ||
121 | 0xe8 0x118 /* i2c2_sda PULLUP | INPUTENABLE | MODE0 */ | ||
122 | >; | ||
123 | }; | ||
124 | |||
125 | i2c3_pins: pinmux_i2c3_pins { | ||
126 | pinctrl-single,pins = < | ||
127 | 0xea 0x118 /* i2c3_scl PULLUP | INPUTENABLE | MODE0 */ | ||
128 | 0xec 0x118 /* i2c3_sda PULLUP | INPUTENABLE | MODE0 */ | ||
129 | >; | ||
130 | }; | ||
131 | |||
132 | i2c4_pins: pinmux_i2c4_pins { | ||
133 | pinctrl-single,pins = < | ||
134 | 0xee 0x118 /* i2c4_scl PULLUP | INPUTENABLE | MODE0 */ | ||
135 | 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */ | ||
136 | >; | ||
137 | }; | ||
138 | }; | ||
139 | |||
140 | &i2c1 { | ||
141 | pinctrl-names = "default"; | ||
142 | pinctrl-0 = <&i2c1_pins>; | ||
143 | |||
144 | clock-frequency = <400000>; | ||
145 | |||
146 | twl: twl@48 { | ||
147 | reg = <0x48>; | ||
148 | /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */ | ||
149 | interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */ | ||
150 | interrupt-parent = <&gic>; | ||
151 | }; | ||
152 | |||
153 | twl6040: twl@4b { | ||
154 | compatible = "ti,twl6040"; | ||
155 | reg = <0x4b>; | ||
156 | /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ | ||
157 | interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */ | ||
158 | interrupt-parent = <&gic>; | ||
159 | ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */ | ||
160 | |||
161 | vio-supply = <&v1v8>; | ||
162 | v2v1-supply = <&v2v1>; | ||
163 | enable-active-high; | ||
164 | }; | ||
165 | }; | ||
166 | |||
167 | /include/ "twl6030.dtsi" | ||
168 | |||
169 | &i2c2 { | ||
170 | pinctrl-names = "default"; | ||
171 | pinctrl-0 = <&i2c2_pins>; | ||
172 | |||
173 | clock-frequency = <400000>; | ||
174 | }; | ||
175 | |||
176 | &i2c3 { | ||
177 | pinctrl-names = "default"; | ||
178 | pinctrl-0 = <&i2c3_pins>; | ||
179 | |||
180 | clock-frequency = <100000>; | ||
181 | |||
182 | /* | ||
183 | * Display monitor features are burnt in their EEPROM as EDID data. | ||
184 | * The EEPROM is connected as I2C slave device. | ||
185 | */ | ||
186 | eeprom@50 { | ||
187 | compatible = "ti,eeprom"; | ||
188 | reg = <0x50>; | ||
189 | }; | ||
190 | }; | ||
191 | |||
192 | &i2c4 { | ||
193 | pinctrl-names = "default"; | ||
194 | pinctrl-0 = <&i2c4_pins>; | ||
195 | |||
196 | clock-frequency = <400000>; | ||
197 | }; | ||
198 | |||
199 | &mmc1 { | ||
200 | vmmc-supply = <&vmmc>; | ||
201 | bus-width = <8>; | ||
202 | }; | ||
203 | |||
204 | &mmc2 { | ||
205 | status = "disabled"; | ||
206 | }; | ||
207 | |||
208 | &mmc3 { | ||
209 | status = "disabled"; | ||
210 | }; | ||
211 | |||
212 | &mmc4 { | ||
213 | status = "disabled"; | ||
214 | }; | ||
215 | |||
216 | &mmc5 { | ||
217 | ti,non-removable; | ||
218 | bus-width = <4>; | ||
219 | }; | ||
220 | |||
221 | &emif1 { | ||
222 | cs1-used; | ||
223 | device-handle = <&elpida_ECB240ABACN>; | ||
224 | }; | ||
225 | |||
226 | &emif2 { | ||
227 | cs1-used; | ||
228 | device-handle = <&elpida_ECB240ABACN>; | ||
229 | }; | ||
230 | |||
231 | &mcbsp2 { | ||
232 | status = "disabled"; | ||
233 | }; | ||
234 | |||
235 | &mcbsp3 { | ||
236 | status = "disabled"; | ||
237 | }; | ||
238 | |||
239 | &dmic { | ||
240 | status = "disabled"; | ||
241 | }; | ||
242 | |||
243 | &twl_usb_comparator { | ||
244 | usb-supply = <&vusb>; | ||
245 | }; | ||
246 | |||
247 | &usb_otg_hs { | ||
248 | interface-type = <1>; | ||
249 | mode = <3>; | ||
250 | power = <50>; | ||
251 | }; | ||
diff --git a/arch/arm/boot/dts/omap4-panda-es.dts b/arch/arm/boot/dts/omap4-panda-es.dts index 2a6e3440753f..f1d8c217ce12 100644 --- a/arch/arm/boot/dts/omap4-panda-es.dts +++ b/arch/arm/boot/dts/omap4-panda-es.dts | |||
@@ -5,9 +5,10 @@ | |||
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
6 | * published by the Free Software Foundation. | 6 | * published by the Free Software Foundation. |
7 | */ | 7 | */ |
8 | /dts-v1/; | ||
8 | 9 | ||
9 | /include/ "omap4-panda.dts" | ||
10 | /include/ "omap4460.dtsi" | 10 | /include/ "omap4460.dtsi" |
11 | /include/ "omap4-panda-common.dtsi" | ||
11 | 12 | ||
12 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ | 13 | /* Audio routing is differnet between PandaBoard4430 and PandaBoardES */ |
13 | &sound { | 14 | &sound { |
diff --git a/arch/arm/boot/dts/omap4-panda.dts b/arch/arm/boot/dts/omap4-panda.dts index e05b1b033cfa..f8b221f0168e 100644 --- a/arch/arm/boot/dts/omap4-panda.dts +++ b/arch/arm/boot/dts/omap4-panda.dts | |||
@@ -8,247 +8,4 @@ | |||
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap443x.dtsi" | 10 | /include/ "omap443x.dtsi" |
11 | /include/ "elpida_ecb240abacn.dtsi" | 11 | /include/ "omap4-panda-common.dtsi" |
12 | |||
13 | / { | ||
14 | model = "TI OMAP4 PandaBoard"; | ||
15 | compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4"; | ||
16 | |||
17 | memory { | ||
18 | device_type = "memory"; | ||
19 | reg = <0x80000000 0x40000000>; /* 1 GB */ | ||
20 | }; | ||
21 | |||
22 | leds { | ||
23 | compatible = "gpio-leds"; | ||
24 | heartbeat { | ||
25 | label = "pandaboard::status1"; | ||
26 | gpios = <&gpio1 7 0>; | ||
27 | linux,default-trigger = "heartbeat"; | ||
28 | }; | ||
29 | |||
30 | mmc { | ||
31 | label = "pandaboard::status2"; | ||
32 | gpios = <&gpio1 8 0>; | ||
33 | linux,default-trigger = "mmc0"; | ||
34 | }; | ||
35 | }; | ||
36 | |||
37 | sound: sound { | ||
38 | compatible = "ti,abe-twl6040"; | ||
39 | ti,model = "PandaBoard"; | ||
40 | |||
41 | ti,mclk-freq = <38400000>; | ||
42 | |||
43 | ti,mcpdm = <&mcpdm>; | ||
44 | |||
45 | ti,twl6040 = <&twl6040>; | ||
46 | |||
47 | /* Audio routing */ | ||
48 | ti,audio-routing = | ||
49 | "Headset Stereophone", "HSOL", | ||
50 | "Headset Stereophone", "HSOR", | ||
51 | "Ext Spk", "HFL", | ||
52 | "Ext Spk", "HFR", | ||
53 | "Line Out", "AUXL", | ||
54 | "Line Out", "AUXR", | ||
55 | "HSMIC", "Headset Mic", | ||
56 | "Headset Mic", "Headset Mic Bias", | ||
57 | "AFML", "Line In", | ||
58 | "AFMR", "Line In"; | ||
59 | }; | ||
60 | }; | ||
61 | |||
62 | &omap4_pmx_core { | ||
63 | pinctrl-names = "default"; | ||
64 | pinctrl-0 = < | ||
65 | &twl6040_pins | ||
66 | &mcpdm_pins | ||
67 | &mcbsp1_pins | ||
68 | &dss_hdmi_pins | ||
69 | &tpd12s015_pins | ||
70 | >; | ||
71 | |||
72 | twl6040_pins: pinmux_twl6040_pins { | ||
73 | pinctrl-single,pins = < | ||
74 | 0xe0 0x3 /* hdq_sio.gpio_127 OUTPUT | MODE3 */ | ||
75 | 0x160 0x100 /* sys_nirq2.sys_nirq2 INPUT | MODE0 */ | ||
76 | >; | ||
77 | }; | ||
78 | |||
79 | mcpdm_pins: pinmux_mcpdm_pins { | ||
80 | pinctrl-single,pins = < | ||
81 | 0xc6 0x108 /* abe_pdm_ul_data.abe_pdm_ul_data INPUT PULLDOWN | MODE0 */ | ||
82 | 0xc8 0x108 /* abe_pdm_dl_data.abe_pdm_dl_data INPUT PULLDOWN | MODE0 */ | ||
83 | 0xca 0x118 /* abe_pdm_frame.abe_pdm_frame INPUT PULLUP | MODE0 */ | ||
84 | 0xcc 0x108 /* abe_pdm_lb_clk.abe_pdm_lb_clk INPUT PULLDOWN | MODE0 */ | ||
85 | 0xce 0x108 /* abe_clks.abe_clks INPUT PULLDOWN | MODE0 */ | ||
86 | >; | ||
87 | }; | ||
88 | |||
89 | mcbsp1_pins: pinmux_mcbsp1_pins { | ||
90 | pinctrl-single,pins = < | ||
91 | 0xbe 0x100 /* abe_mcbsp1_clkx.abe_mcbsp1_clkx INPUT | MODE0 */ | ||
92 | 0xc0 0x108 /* abe_mcbsp1_dr.abe_mcbsp1_dr INPUT PULLDOWN | MODE0 */ | ||
93 | 0xc2 0x8 /* abe_mcbsp1_dx.abe_mcbsp1_dx OUTPUT PULLDOWN | MODE0 */ | ||
94 | 0xc4 0x100 /* abe_mcbsp1_fsx.abe_mcbsp1_fsx INPUT | MODE0 */ | ||
95 | >; | ||
96 | }; | ||
97 | |||
98 | dss_hdmi_pins: pinmux_dss_hdmi_pins { | ||
99 | pinctrl-single,pins = < | ||
100 | 0x5a 0x118 /* hdmi_cec.hdmi_cec INPUT PULLUP | MODE 0 */ | ||
101 | 0x5c 0x118 /* hdmi_scl.hdmi_scl INPUT PULLUP | MODE 0 */ | ||
102 | 0x5e 0x118 /* hdmi_sda.hdmi_sda INPUT PULLUP | MODE 0 */ | ||
103 | >; | ||
104 | }; | ||
105 | |||
106 | tpd12s015_pins: pinmux_tpd12s015_pins { | ||
107 | pinctrl-single,pins = < | ||
108 | 0x22 0x3 /* gpmc_a17.gpio_41 OUTPUT | MODE3 */ | ||
109 | 0x48 0x3 /* gpmc_nbe1.gpio_60 OUTPUT | MODE3 */ | ||
110 | 0x58 0x10b /* hdmi_hpd.gpio_63 INPUT PULLDOWN | MODE3 */ | ||
111 | >; | ||
112 | }; | ||
113 | |||
114 | i2c1_pins: pinmux_i2c1_pins { | ||
115 | pinctrl-single,pins = < | ||
116 | 0xe2 0x118 /* i2c1_scl PULLUP | INPUTENABLE | MODE0 */ | ||
117 | 0xe4 0x118 /* i2c1_sda PULLUP | INPUTENABLE | MODE0 */ | ||
118 | >; | ||
119 | }; | ||
120 | |||
121 | i2c2_pins: pinmux_i2c2_pins { | ||
122 | pinctrl-single,pins = < | ||
123 | 0xe6 0x118 /* i2c2_scl PULLUP | INPUTENABLE | MODE0 */ | ||
124 | 0xe8 0x118 /* i2c2_sda PULLUP | INPUTENABLE | MODE0 */ | ||
125 | >; | ||
126 | }; | ||
127 | |||
128 | i2c3_pins: pinmux_i2c3_pins { | ||
129 | pinctrl-single,pins = < | ||
130 | 0xea 0x118 /* i2c3_scl PULLUP | INPUTENABLE | MODE0 */ | ||
131 | 0xec 0x118 /* i2c3_sda PULLUP | INPUTENABLE | MODE0 */ | ||
132 | >; | ||
133 | }; | ||
134 | |||
135 | i2c4_pins: pinmux_i2c4_pins { | ||
136 | pinctrl-single,pins = < | ||
137 | 0xee 0x118 /* i2c4_scl PULLUP | INPUTENABLE | MODE0 */ | ||
138 | 0xf0 0x118 /* i2c4_sda PULLUP | INPUTENABLE | MODE0 */ | ||
139 | >; | ||
140 | }; | ||
141 | }; | ||
142 | |||
143 | &i2c1 { | ||
144 | pinctrl-names = "default"; | ||
145 | pinctrl-0 = <&i2c1_pins>; | ||
146 | |||
147 | clock-frequency = <400000>; | ||
148 | |||
149 | twl: twl@48 { | ||
150 | reg = <0x48>; | ||
151 | /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */ | ||
152 | interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */ | ||
153 | interrupt-parent = <&gic>; | ||
154 | }; | ||
155 | |||
156 | twl6040: twl@4b { | ||
157 | compatible = "ti,twl6040"; | ||
158 | reg = <0x4b>; | ||
159 | /* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */ | ||
160 | interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */ | ||
161 | interrupt-parent = <&gic>; | ||
162 | ti,audpwron-gpio = <&gpio4 31 0>; /* gpio line 127 */ | ||
163 | |||
164 | vio-supply = <&v1v8>; | ||
165 | v2v1-supply = <&v2v1>; | ||
166 | enable-active-high; | ||
167 | }; | ||
168 | }; | ||
169 | |||
170 | /include/ "twl6030.dtsi" | ||
171 | |||
172 | &i2c2 { | ||
173 | pinctrl-names = "default"; | ||
174 | pinctrl-0 = <&i2c2_pins>; | ||
175 | |||
176 | clock-frequency = <400000>; | ||
177 | }; | ||
178 | |||
179 | &i2c3 { | ||
180 | pinctrl-names = "default"; | ||
181 | pinctrl-0 = <&i2c3_pins>; | ||
182 | |||
183 | clock-frequency = <100000>; | ||
184 | |||
185 | /* | ||
186 | * Display monitor features are burnt in their EEPROM as EDID data. | ||
187 | * The EEPROM is connected as I2C slave device. | ||
188 | */ | ||
189 | eeprom@50 { | ||
190 | compatible = "ti,eeprom"; | ||
191 | reg = <0x50>; | ||
192 | }; | ||
193 | }; | ||
194 | |||
195 | &i2c4 { | ||
196 | pinctrl-names = "default"; | ||
197 | pinctrl-0 = <&i2c4_pins>; | ||
198 | |||
199 | clock-frequency = <400000>; | ||
200 | }; | ||
201 | |||
202 | &mmc1 { | ||
203 | vmmc-supply = <&vmmc>; | ||
204 | bus-width = <8>; | ||
205 | }; | ||
206 | |||
207 | &mmc2 { | ||
208 | status = "disabled"; | ||
209 | }; | ||
210 | |||
211 | &mmc3 { | ||
212 | status = "disabled"; | ||
213 | }; | ||
214 | |||
215 | &mmc4 { | ||
216 | status = "disabled"; | ||
217 | }; | ||
218 | |||
219 | &mmc5 { | ||
220 | ti,non-removable; | ||
221 | bus-width = <4>; | ||
222 | }; | ||
223 | |||
224 | &emif1 { | ||
225 | cs1-used; | ||
226 | device-handle = <&elpida_ECB240ABACN>; | ||
227 | }; | ||
228 | |||
229 | &emif2 { | ||
230 | cs1-used; | ||
231 | device-handle = <&elpida_ECB240ABACN>; | ||
232 | }; | ||
233 | |||
234 | &mcbsp2 { | ||
235 | status = "disabled"; | ||
236 | }; | ||
237 | |||
238 | &mcbsp3 { | ||
239 | status = "disabled"; | ||
240 | }; | ||
241 | |||
242 | &dmic { | ||
243 | status = "disabled"; | ||
244 | }; | ||
245 | |||
246 | &twl_usb_comparator { | ||
247 | usb-supply = <&vusb>; | ||
248 | }; | ||
249 | |||
250 | &usb_otg_hs { | ||
251 | interface-type = <1>; | ||
252 | mode = <3>; | ||
253 | power = <50>; | ||
254 | }; | ||
diff --git a/arch/arm/boot/dts/omap4460.dtsi b/arch/arm/boot/dts/omap4460.dtsi index 0a1d38bdcd04..e09b3e1f9106 100644 --- a/arch/arm/boot/dts/omap4460.dtsi +++ b/arch/arm/boot/dts/omap4460.dtsi | |||
@@ -7,6 +7,7 @@ | |||
7 | * version 2. This program is licensed "as is" without any warranty of any | 7 | * version 2. This program is licensed "as is" without any warranty of any |
8 | * kind, whether express or implied. | 8 | * kind, whether express or implied. |
9 | */ | 9 | */ |
10 | /include/ "omap4.dtsi" | ||
10 | 11 | ||
11 | / { | 12 | / { |
12 | pmu { | 13 | pmu { |