diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-31 06:11:54 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-04-27 02:20:23 -0400 |
commit | 6bd0027ee14aa13c3d23583c3d29f1a02dd7ad80 (patch) | |
tree | a15dd82499e484b51c4c7f711cb53caffdcf5ba2 /arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | |
parent | 5b178791a9a7817e691cb0fac9625826d5bea1e6 (diff) |
ARM: sun7i: olinuxino lime2: Convert to DT label based syntax
In order to lessen the amount of duplication of the DT tree, ease the
new and follow the trend that prefers to use label based references
when overriding DTSI nodes, convert the board to this syntax
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts')
-rw-r--r-- | arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 288 |
1 files changed, 143 insertions, 145 deletions
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts index 260dbd3bf29d..5e57157f742d 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | |||
@@ -57,176 +57,174 @@ | |||
57 | model = "Olimex A20-OLinuXino-LIME2"; | 57 | model = "Olimex A20-OLinuXino-LIME2"; |
58 | compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; | 58 | compatible = "olimex,a20-olinuxino-lime2", "allwinner,sun7i-a20"; |
59 | 59 | ||
60 | soc@01c00000 { | 60 | leds { |
61 | mmc0: mmc@01c0f000 { | 61 | compatible = "gpio-leds"; |
62 | pinctrl-names = "default"; | 62 | pinctrl-names = "default"; |
63 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; | 63 | pinctrl-0 = <&led_pins_olinuxinolime>; |
64 | vmmc-supply = <®_vcc3v3>; | ||
65 | bus-width = <4>; | ||
66 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ | ||
67 | cd-inverted; | ||
68 | status = "okay"; | ||
69 | }; | ||
70 | 64 | ||
71 | usbphy: phy@01c13400 { | 65 | green { |
72 | usb1_vbus-supply = <®_usb1_vbus>; | 66 | label = "a20-olinuxino-lime2:green:usr"; |
73 | usb2_vbus-supply = <®_usb2_vbus>; | 67 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; |
74 | status = "okay"; | 68 | default-state = "on"; |
75 | }; | 69 | }; |
70 | }; | ||
76 | 71 | ||
77 | ehci0: usb@01c14000 { | 72 | reg_axp_ipsout: axp_ipsout { |
78 | status = "okay"; | 73 | compatible = "regulator-fixed"; |
79 | }; | 74 | regulator-name = "axp-ipsout"; |
75 | regulator-min-microvolt = <5000000>; | ||
76 | regulator-max-microvolt = <5000000>; | ||
77 | regulator-always-on; | ||
78 | }; | ||
79 | }; | ||
80 | 80 | ||
81 | ohci0: usb@01c14400 { | 81 | &ahci { |
82 | status = "okay"; | 82 | target-supply = <®_ahci_5v>; |
83 | }; | 83 | status = "okay"; |
84 | }; | ||
84 | 85 | ||
85 | ahci: sata@01c18000 { | 86 | &ehci0 { |
86 | target-supply = <®_ahci_5v>; | 87 | status = "okay"; |
87 | status = "okay"; | 88 | }; |
88 | }; | ||
89 | 89 | ||
90 | ehci1: usb@01c1c000 { | 90 | &ehci1 { |
91 | status = "okay"; | 91 | status = "okay"; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | ohci1: usb@01c1c400 { | 94 | &gmac { |
95 | status = "okay"; | 95 | pinctrl-names = "default"; |
96 | }; | 96 | pinctrl-0 = <&gmac_pins_rgmii_a>; |
97 | phy = <&phy1>; | ||
98 | phy-mode = "rgmii"; | ||
99 | status = "okay"; | ||
97 | 100 | ||
98 | pinctrl@01c20800 { | 101 | phy1: ethernet-phy@1 { |
99 | ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { | 102 | reg = <1>; |
100 | allwinner,pins = "PC3"; | 103 | }; |
101 | allwinner,function = "gpio_out"; | 104 | }; |
102 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | ||
103 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; | ||
104 | }; | ||
105 | 105 | ||
106 | led_pins_olinuxinolime: led_pins@0 { | 106 | &i2c0 { |
107 | allwinner,pins = "PH2"; | 107 | pinctrl-names = "default"; |
108 | allwinner,function = "gpio_out"; | 108 | pinctrl-0 = <&i2c0_pins_a>; |
109 | allwinner,drive = <SUN4I_PINCTRL_20_MA>; | 109 | status = "okay"; |
110 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; | 110 | |
111 | axp209: pmic@34 { | ||
112 | compatible = "x-powers,axp209"; | ||
113 | reg = <0x34>; | ||
114 | interrupt-parent = <&nmi_intc>; | ||
115 | interrupts = <0 IRQ_TYPE_LEVEL_LOW>; | ||
116 | |||
117 | interrupt-controller; | ||
118 | #interrupt-cells = <1>; | ||
119 | |||
120 | acin-supply = <®_axp_ipsout>; | ||
121 | vin2-supply = <®_axp_ipsout>; | ||
122 | vin3-supply = <®_axp_ipsout>; | ||
123 | ldo24in-supply = <®_axp_ipsout>; | ||
124 | ldo3in-supply = <®_axp_ipsout>; | ||
125 | |||
126 | regulators { | ||
127 | vdd_rtc: ldo1 { | ||
128 | regulator-min-microvolt = <1300000>; | ||
129 | regulator-max-microvolt = <1300000>; | ||
130 | regulator-always-on; | ||
111 | }; | 131 | }; |
112 | }; | ||
113 | 132 | ||
114 | uart0: serial@01c28000 { | 133 | avcc: ldo2 { |
115 | pinctrl-names = "default"; | 134 | regulator-min-microvolt = <1800000>; |
116 | pinctrl-0 = <&uart0_pins_a>; | 135 | regulator-max-microvolt = <3300000>; |
117 | status = "okay"; | 136 | regulator-always-on; |
118 | }; | 137 | }; |
119 | 138 | ||
120 | i2c0: i2c@01c2ac00 { | 139 | vcc_csi0: ldo3 { |
121 | pinctrl-names = "default"; | 140 | regulator-min-microvolt = <700000>; |
122 | pinctrl-0 = <&i2c0_pins_a>; | 141 | regulator-max-microvolt = <3500000>; |
123 | status = "okay"; | 142 | regulator-always-on; |
124 | |||
125 | axp209: pmic@34 { | ||
126 | compatible = "x-powers,axp209"; | ||
127 | reg = <0x34>; | ||
128 | interrupt-parent = <&nmi_intc>; | ||
129 | interrupts = <0 IRQ_TYPE_LEVEL_LOW>; | ||
130 | |||
131 | interrupt-controller; | ||
132 | #interrupt-cells = <1>; | ||
133 | |||
134 | acin-supply = <®_axp_ipsout>; | ||
135 | vin2-supply = <®_axp_ipsout>; | ||
136 | vin3-supply = <®_axp_ipsout>; | ||
137 | ldo24in-supply = <®_axp_ipsout>; | ||
138 | ldo3in-supply = <®_axp_ipsout>; | ||
139 | |||
140 | regulators { | ||
141 | vdd_rtc: ldo1 { | ||
142 | regulator-min-microvolt = <1300000>; | ||
143 | regulator-max-microvolt = <1300000>; | ||
144 | regulator-always-on; | ||
145 | }; | ||
146 | |||
147 | avcc: ldo2 { | ||
148 | regulator-min-microvolt = <1800000>; | ||
149 | regulator-max-microvolt = <3300000>; | ||
150 | regulator-always-on; | ||
151 | }; | ||
152 | |||
153 | vcc_csi0: ldo3 { | ||
154 | regulator-min-microvolt = <700000>; | ||
155 | regulator-max-microvolt = <3500000>; | ||
156 | regulator-always-on; | ||
157 | }; | ||
158 | |||
159 | vcc_csi1: ldo4 { | ||
160 | regulator-min-microvolt = <1250000>; | ||
161 | regulator-max-microvolt = <3300000>; | ||
162 | regulator-always-on; | ||
163 | }; | ||
164 | |||
165 | vdd_cpu: dcdc2 { | ||
166 | regulator-min-microvolt = <700000>; | ||
167 | regulator-max-microvolt = <2275000>; | ||
168 | regulator-always-on; | ||
169 | }; | ||
170 | |||
171 | vdd_int: dcdc3 { | ||
172 | regulator-min-microvolt = <700000>; | ||
173 | regulator-max-microvolt = <3500000>; | ||
174 | regulator-always-on; | ||
175 | }; | ||
176 | }; | ||
177 | }; | 143 | }; |
178 | }; | ||
179 | 144 | ||
180 | i2c1: i2c@01c2b000 { | 145 | vcc_csi1: ldo4 { |
181 | pinctrl-names = "default"; | 146 | regulator-min-microvolt = <1250000>; |
182 | pinctrl-0 = <&i2c1_pins_a>; | 147 | regulator-max-microvolt = <3300000>; |
183 | status = "okay"; | 148 | regulator-always-on; |
184 | }; | 149 | }; |
185 | 150 | ||
186 | gmac: ethernet@01c50000 { | 151 | vdd_cpu: dcdc2 { |
187 | pinctrl-names = "default"; | 152 | regulator-min-microvolt = <700000>; |
188 | pinctrl-0 = <&gmac_pins_rgmii_a>; | 153 | regulator-max-microvolt = <2275000>; |
189 | phy = <&phy1>; | 154 | regulator-always-on; |
190 | phy-mode = "rgmii"; | 155 | }; |
191 | status = "okay"; | ||
192 | 156 | ||
193 | phy1: ethernet-phy@1 { | 157 | vdd_int: dcdc3 { |
194 | reg = <1>; | 158 | regulator-min-microvolt = <700000>; |
159 | regulator-max-microvolt = <3500000>; | ||
160 | regulator-always-on; | ||
195 | }; | 161 | }; |
196 | }; | 162 | }; |
197 | }; | 163 | }; |
164 | }; | ||
198 | 165 | ||
199 | leds { | 166 | &i2c1 { |
200 | compatible = "gpio-leds"; | 167 | pinctrl-names = "default"; |
201 | pinctrl-names = "default"; | 168 | pinctrl-0 = <&i2c1_pins_a>; |
202 | pinctrl-0 = <&led_pins_olinuxinolime>; | 169 | status = "okay"; |
170 | }; | ||
203 | 171 | ||
204 | green { | 172 | &mmc0 { |
205 | label = "a20-olinuxino-lime2:green:usr"; | 173 | pinctrl-names = "default"; |
206 | gpios = <&pio 7 2 GPIO_ACTIVE_HIGH>; | 174 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin_reference_design>; |
207 | default-state = "on"; | 175 | vmmc-supply = <®_vcc3v3>; |
208 | }; | 176 | bus-width = <4>; |
209 | }; | 177 | cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */ |
178 | cd-inverted; | ||
179 | status = "okay"; | ||
180 | }; | ||
210 | 181 | ||
211 | reg_ahci_5v: ahci-5v { | 182 | &ohci0 { |
212 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; | 183 | status = "okay"; |
213 | gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; | 184 | }; |
214 | status = "okay"; | ||
215 | }; | ||
216 | 185 | ||
217 | reg_usb1_vbus: usb1-vbus { | 186 | &ohci1 { |
218 | status = "okay"; | 187 | status = "okay"; |
219 | }; | 188 | }; |
220 | 189 | ||
221 | reg_usb2_vbus: usb2-vbus { | 190 | &pio { |
222 | status = "okay"; | 191 | ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 { |
192 | allwinner,pins = "PC3"; | ||
193 | allwinner,function = "gpio_out"; | ||
194 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; | ||
195 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; | ||
223 | }; | 196 | }; |
224 | 197 | ||
225 | reg_axp_ipsout: axp_ipsout { | 198 | led_pins_olinuxinolime: led_pins@0 { |
226 | compatible = "regulator-fixed"; | 199 | allwinner,pins = "PH2"; |
227 | regulator-name = "axp-ipsout"; | 200 | allwinner,function = "gpio_out"; |
228 | regulator-min-microvolt = <5000000>; | 201 | allwinner,drive = <SUN4I_PINCTRL_20_MA>; |
229 | regulator-max-microvolt = <5000000>; | 202 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
230 | regulator-always-on; | ||
231 | }; | 203 | }; |
232 | }; | 204 | }; |
205 | |||
206 | ®_ahci_5v { | ||
207 | pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>; | ||
208 | gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; | ||
209 | status = "okay"; | ||
210 | }; | ||
211 | |||
212 | ®_usb1_vbus { | ||
213 | status = "okay"; | ||
214 | }; | ||
215 | |||
216 | ®_usb2_vbus { | ||
217 | status = "okay"; | ||
218 | }; | ||
219 | |||
220 | &uart0 { | ||
221 | pinctrl-names = "default"; | ||
222 | pinctrl-0 = <&uart0_pins_a>; | ||
223 | status = "okay"; | ||
224 | }; | ||
225 | |||
226 | &usbphy { | ||
227 | usb1_vbus-supply = <®_usb1_vbus>; | ||
228 | usb2_vbus-supply = <®_usb2_vbus>; | ||
229 | status = "okay"; | ||
230 | }; | ||