diff options
Diffstat (limited to 'arch/arm/boot/dts/omap3-beagle.dts')
-rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 72 |
1 files changed, 55 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle.dts b/arch/arm/boot/dts/omap3-beagle.dts index 6eec69997607..dfd83103657a 100644 --- a/arch/arm/boot/dts/omap3-beagle.dts +++ b/arch/arm/boot/dts/omap3-beagle.dts | |||
@@ -7,7 +7,7 @@ | |||
7 | */ | 7 | */ |
8 | /dts-v1/; | 8 | /dts-v1/; |
9 | 9 | ||
10 | /include/ "omap34xx.dtsi" | 10 | #include "omap34xx.dtsi" |
11 | 11 | ||
12 | / { | 12 | / { |
13 | model = "TI OMAP3 BeagleBoard"; | 13 | model = "TI OMAP3 BeagleBoard"; |
@@ -28,18 +28,18 @@ | |||
28 | compatible = "gpio-leds"; | 28 | compatible = "gpio-leds"; |
29 | pmu_stat { | 29 | pmu_stat { |
30 | label = "beagleboard::pmu_stat"; | 30 | label = "beagleboard::pmu_stat"; |
31 | gpios = <&twl_gpio 19 0>; /* LEDB */ | 31 | gpios = <&twl_gpio 19 GPIO_ACTIVE_HIGH>; /* LEDB */ |
32 | }; | 32 | }; |
33 | 33 | ||
34 | heartbeat { | 34 | heartbeat { |
35 | label = "beagleboard::usr0"; | 35 | label = "beagleboard::usr0"; |
36 | gpios = <&gpio5 22 0>; /* 150 -> D6 LED */ | 36 | gpios = <&gpio5 22 GPIO_ACTIVE_HIGH>; /* 150 -> D6 LED */ |
37 | linux,default-trigger = "heartbeat"; | 37 | linux,default-trigger = "heartbeat"; |
38 | }; | 38 | }; |
39 | 39 | ||
40 | mmc { | 40 | mmc { |
41 | label = "beagleboard::usr1"; | 41 | label = "beagleboard::usr1"; |
42 | gpios = <&gpio5 21 0>; /* 149 -> D7 LED */ | 42 | gpios = <&gpio5 21 GPIO_ACTIVE_HIGH>; /* 149 -> D7 LED */ |
43 | linux,default-trigger = "mmc0"; | 43 | linux,default-trigger = "mmc0"; |
44 | }; | 44 | }; |
45 | }; | 45 | }; |
@@ -71,6 +71,26 @@ | |||
71 | reset-supply = <&hsusb2_reset>; | 71 | reset-supply = <&hsusb2_reset>; |
72 | vcc-supply = <&hsusb2_power>; | 72 | vcc-supply = <&hsusb2_power>; |
73 | }; | 73 | }; |
74 | |||
75 | gpio_keys { | ||
76 | compatible = "gpio-keys"; | ||
77 | |||
78 | user { | ||
79 | label = "user"; | ||
80 | gpios = <&gpio1 7 GPIO_ACTIVE_HIGH>; | ||
81 | linux,code = <0x114>; | ||
82 | gpio-key,wakeup; | ||
83 | }; | ||
84 | |||
85 | }; | ||
86 | }; | ||
87 | |||
88 | &omap3_pmx_wkup { | ||
89 | gpio1_pins: pinmux_gpio1_pins { | ||
90 | pinctrl-single,pins = < | ||
91 | 0x14 (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE4) /* sys_boot5.gpio_7 */ | ||
92 | >; | ||
93 | }; | ||
74 | }; | 94 | }; |
75 | 95 | ||
76 | &omap3_pmx_core { | 96 | &omap3_pmx_core { |
@@ -81,18 +101,25 @@ | |||
81 | 101 | ||
82 | hsusbb2_pins: pinmux_hsusbb2_pins { | 102 | hsusbb2_pins: pinmux_hsusbb2_pins { |
83 | pinctrl-single,pins = < | 103 | pinctrl-single,pins = < |
84 | 0x5c0 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_clk OUTPUT */ | 104 | 0x5c0 (PIN_OUTPUT | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_clk */ |
85 | 0x5c2 0x3 /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_stp OUTPUT */ | 105 | 0x5c2 (PIN_OUTPUT | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_stp */ |
86 | 0x5c4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dir INPUT | PULLDOWN */ | 106 | 0x5c4 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dir */ |
87 | 0x5c6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_nxt INPUT | PULLDOWN */ | 107 | 0x5c6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_nxt */ |
88 | 0x5c8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat0 INPUT | PULLDOWN */ | 108 | 0x5c8 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat0 */ |
89 | 0x5cA 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat1 INPUT | PULLDOWN */ | 109 | 0x5cA (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat1 */ |
90 | 0x1a4 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat2 INPUT | PULLDOWN */ | 110 | 0x1a4 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat2 */ |
91 | 0x1a6 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat3 INPUT | PULLDOWN */ | 111 | 0x1a6 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat3 */ |
92 | 0x1a8 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat4 INPUT | PULLDOWN */ | 112 | 0x1a8 (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat4 */ |
93 | 0x1aa 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat5 INPUT | PULLDOWN */ | 113 | 0x1aa (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat5 */ |
94 | 0x1ac 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat6 INPUT | PULLDOWN */ | 114 | 0x1ac (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat6 */ |
95 | 0x1ae 0x10b /* USBB2_ULPITLL_CLK_MUXMODE.usbb1_ulpiphy_dat7 INPUT | PULLDOWN */ | 115 | 0x1ae (PIN_INPUT_PULLDOWN | MUX_MODE3) /* usbb2_ulpitll_clk.usbb1_ulpiphy_dat7 */ |
116 | >; | ||
117 | }; | ||
118 | |||
119 | uart3_pins: pinmux_uart3_pins { | ||
120 | pinctrl-single,pins = < | ||
121 | 0x16e (PIN_INPUT | PIN_OFF_WAKEUPENABLE | MUX_MODE0) /* uart3_rx_irrx.uart3_rx_irrx */ | ||
122 | 0x170 (PIN_OUTPUT | MUX_MODE0) /* uart3_tx_irtx.uart3_tx_irtx */ | ||
96 | >; | 123 | >; |
97 | }; | 124 | }; |
98 | }; | 125 | }; |
@@ -107,7 +134,8 @@ | |||
107 | }; | 134 | }; |
108 | }; | 135 | }; |
109 | 136 | ||
110 | /include/ "twl4030.dtsi" | 137 | #include "twl4030.dtsi" |
138 | #include "twl4030_omap3.dtsi" | ||
111 | 139 | ||
112 | &mmc1 { | 140 | &mmc1 { |
113 | vmmc-supply = <&vmmc1>; | 141 | vmmc-supply = <&vmmc1>; |
@@ -142,3 +170,13 @@ | |||
142 | */ | 170 | */ |
143 | ti,pulldowns = <0x03a1c4>; | 171 | ti,pulldowns = <0x03a1c4>; |
144 | }; | 172 | }; |
173 | |||
174 | &uart3 { | ||
175 | pinctrl-names = "default"; | ||
176 | pinctrl-0 = <&uart3_pins>; | ||
177 | }; | ||
178 | |||
179 | &gpio1 { | ||
180 | pinctrl-names = "default"; | ||
181 | pinctrl-0 = <&gpio1_pins>; | ||
182 | }; | ||