Skip to content

Commit 1edcd36

Browse files
mripardmripard
committed
ARM: sunxi: Convert pinctrl nodes to generic bindings
Now that we can handle the generic pinctrl bindings, convert our DT to it. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Chen-Yu Tsai <wens@csie.org> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
1 parent 119c366 commit 1edcd36

File tree

99 files changed

+1081
-1081
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+1081
-1081
lines changed

‎arch/arm/boot/dts/sun4i-a10-a1000.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@
186186

187187
&pio {
188188
emac_power_pin_a1000: emac_power_pin@0 {
189-
allwinner,pins = "PH15";
190-
allwinner,function = "gpio_out";
189+
pins = "PH15";
190+
function = "gpio_out";
191191
};
192192

193193
led_pins_a1000: led_pins@0 {
194-
allwinner,pins = "PH10", "PH20";
195-
allwinner,function = "gpio_out";
194+
pins = "PH10", "PH20";
195+
function = "gpio_out";
196196
};
197197
};
198198

‎arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@
127127

128128
&pio {
129129
usb2_vbus_pin_a: usb2_vbus_pin@0 {
130-
allwinner,pins = "PH12";
130+
pins = "PH12";
131131
};
132132
};
133133

‎arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@
142142

143143
&pio {
144144
usb0_id_detect_pin: usb0_id_detect_pin@0 {
145-
allwinner,pins = "PH4";
146-
allwinner,function = "gpio_in";
147-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
145+
pins = "PH4";
146+
function = "gpio_in";
147+
bias-pull-up;
148148
};
149149

150150
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
151-
allwinner,pins = "PH5";
152-
allwinner,function = "gpio_in";
153-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
151+
pins = "PH5";
152+
function = "gpio_in";
153+
bias-pull-down;
154154
};
155155
};
156156

‎arch/arm/boot/dts/sun4i-a10-cubieboard.dts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -165,15 +165,15 @@
165165

166166
&pio {
167167
led_pins_cubieboard: led_pins@0 {
168-
allwinner,pins = "PH20", "PH21";
169-
allwinner,function = "gpio_out";
170-
allwinner,drive = <SUN4I_PINCTRL_20_MA>;
168+
pins = "PH20", "PH21";
169+
function = "gpio_out";
170+
drive-strength = <20>;
171171
};
172172

173173
usb0_id_detect_pin: usb0_id_detect_pin@0 {
174-
allwinner,pins = "PH4";
175-
allwinner,function = "gpio_in";
176-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
174+
pins = "PH4";
175+
function = "gpio_in";
176+
bias-pull-up;
177177
};
178178
};
179179

‎arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -178,35 +178,35 @@
178178

179179
&pio {
180180
bl_en_pin_dsrv9703c: bl_en_pin@0 {
181-
allwinner,pins = "PH7";
182-
allwinner,function = "gpio_out";
181+
pins = "PH7";
182+
function = "gpio_out";
183183
};
184184

185185
codec_pa_pin: codec_pa_pin@0 {
186-
allwinner,pins = "PH15";
187-
allwinner,function = "gpio_out";
186+
pins = "PH15";
187+
function = "gpio_out";
188188
};
189189

190190
motor_pins: motor_pins@0 {
191-
allwinner,pins = "PB3";
192-
allwinner,function = "gpio_out";
191+
pins = "PB3";
192+
function = "gpio_out";
193193
};
194194

195195
touchscreen_pins: touchscreen_pins@0 {
196-
allwinner,pins = "PB13";
197-
allwinner,function = "gpio_out";
196+
pins = "PB13";
197+
function = "gpio_out";
198198
};
199199

200200
usb0_id_detect_pin: usb0_id_detect_pin@0 {
201-
allwinner,pins = "PH4";
202-
allwinner,function = "gpio_in";
203-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
201+
pins = "PH4";
202+
function = "gpio_in";
203+
bias-pull-up;
204204
};
205205

206206
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
207-
allwinner,pins = "PH5";
208-
allwinner,function = "gpio_in";
209-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
207+
pins = "PH5";
208+
function = "gpio_in";
209+
bias-pull-down;
210210
};
211211
};
212212

‎arch/arm/boot/dts/sun4i-a10-gemei-g9.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@
156156

157157
&pio {
158158
codec_pa_pin: codec_pa_pin@0 {
159-
allwinner,pins = "PH15";
160-
allwinner,function = "gpio_out";
159+
pins = "PH15";
160+
function = "gpio_out";
161161
};
162162
};
163163

‎arch/arm/boot/dts/sun4i-a10-hackberry.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,13 +129,13 @@
129129
pinctrl-0 = <&hackberry_hogs>;
130130

131131
hackberry_hogs: hogs@0 {
132-
allwinner,pins = "PH19";
133-
allwinner,function = "gpio_out";
132+
pins = "PH19";
133+
function = "gpio_out";
134134
};
135135

136136
usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
137-
allwinner,pins = "PH12";
138-
allwinner,function = "gpio_out";
137+
pins = "PH12";
138+
function = "gpio_out";
139139
};
140140
};
141141

‎arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,15 +93,15 @@
9393

9494
&pio {
9595
usb0_id_detect_pin: usb0_id_detect_pin@0 {
96-
allwinner,pins = "PH4";
97-
allwinner,function = "gpio_in";
98-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
96+
pins = "PH4";
97+
function = "gpio_in";
98+
bias-pull-up;
9999
};
100100

101101
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
102-
allwinner,pins = "PH5";
103-
allwinner,function = "gpio_in";
104-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
102+
pins = "PH5";
103+
function = "gpio_in";
104+
bias-pull-down;
105105
};
106106
};
107107

@@ -121,7 +121,7 @@
121121
};
122122

123123
&usb2_vbus_pin_a {
124-
allwinner,pins = "PH6";
124+
pins = "PH6";
125125
};
126126

127127
&usb_otg {

‎arch/arm/boot/dts/sun4i-a10-inet1.dts

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -180,25 +180,25 @@
180180

181181
&pio {
182182
bl_en_pin_inet: bl_en_pin@0 {
183-
allwinner,pins = "PH7";
184-
allwinner,function = "gpio_out";
183+
pins = "PH7";
184+
function = "gpio_out";
185185
};
186186

187187
touchscreen_wake_pin: touchscreen_wake_pin@0 {
188-
allwinner,pins = "PB13";
189-
allwinner,function = "gpio_out";
188+
pins = "PB13";
189+
function = "gpio_out";
190190
};
191191

192192
usb0_id_detect_pin: usb0_id_detect_pin@0 {
193-
allwinner,pins = "PH4";
194-
allwinner,function = "gpio_in";
195-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
193+
pins = "PH4";
194+
function = "gpio_in";
195+
bias-pull-up;
196196
};
197197

198198
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
199-
allwinner,pins = "PH5";
200-
allwinner,function = "gpio_in";
201-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
199+
pins = "PH5";
200+
function = "gpio_in";
201+
bias-pull-down;
202202
};
203203
};
204204

‎arch/arm/boot/dts/sun4i-a10-inet97fv2.dts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,15 +161,15 @@
161161

162162
&pio {
163163
usb0_id_detect_pin: usb0_id_detect_pin@0 {
164-
allwinner,pins = "PH4";
165-
allwinner,function = "gpio_in";
166-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
164+
pins = "PH4";
165+
function = "gpio_in";
166+
bias-pull-up;
167167
};
168168

169169
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
170-
allwinner,pins = "PH5";
171-
allwinner,function = "gpio_in";
172-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
170+
pins = "PH5";
171+
function = "gpio_in";
172+
bias-pull-down;
173173
};
174174
};
175175

‎arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -320,25 +320,25 @@
320320

321321
&pio {
322322
key_pins_inet9f: key_pins@0 {
323-
allwinner,pins = "PA0", "PA1", "PA3", "PA4",
324-
"PA5", "PA6", "PA8", "PA9",
325-
"PA11", "PA12", "PA13",
326-
"PA14", "PA15", "PA16", "PA17",
327-
"PH22", "PH23", "PH24", "PH25", "PH26";
328-
allwinner,function = "gpio_in";
329-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
323+
pins = "PA0", "PA1", "PA3", "PA4",
324+
"PA5", "PA6", "PA8", "PA9",
325+
"PA11", "PA12", "PA13",
326+
"PA14", "PA15", "PA16", "PA17",
327+
"PH22", "PH23", "PH24", "PH25", "PH26";
328+
function = "gpio_in";
329+
bias-pull-up;
330330
};
331331

332332
usb0_id_detect_pin: usb0_id_detect_pin@0 {
333-
allwinner,pins = "PH4";
334-
allwinner,function = "gpio_in";
335-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
333+
pins = "PH4";
334+
function = "gpio_in";
335+
bias-pull-up;
336336
};
337337

338338
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
339-
allwinner,pins = "PH5";
340-
allwinner,function = "gpio_in";
341-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
339+
pins = "PH5";
340+
function = "gpio_in";
341+
bias-pull-down;
342342
};
343343
};
344344

‎arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -163,13 +163,13 @@
163163

164164
&pio {
165165
emac_power_pin_q5: emac_power_pin@0 {
166-
allwinner,pins = "PH19";
167-
allwinner,function = "gpio_out";
166+
pins = "PH19";
167+
function = "gpio_out";
168168
};
169169

170170
led_pins_q5: led_pins@0 {
171-
allwinner,pins = "PH20";
172-
allwinner,function = "gpio_out";
171+
pins = "PH20";
172+
function = "gpio_out";
173173
};
174174
};
175175

‎arch/arm/boot/dts/sun4i-a10-marsboard.dts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -164,14 +164,14 @@
164164

165165
&pio {
166166
led_pins_marsboard: led_pins@0 {
167-
allwinner,pins = "PB5", "PB6", "PB7", "PB8";
168-
allwinner,function = "gpio_out";
167+
pins = "PB5", "PB6", "PB7", "PB8";
168+
function = "gpio_out";
169169
};
170170

171171
usb0_id_detect_pin: usb0_id_detect_pin@0 {
172-
allwinner,pins = "PH4";
173-
allwinner,function = "gpio_in";
174-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
172+
pins = "PH4";
173+
function = "gpio_in";
174+
bias-pull-up;
175175
};
176176
};
177177

‎arch/arm/boot/dts/sun4i-a10-mini-xplus.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393

9494
&ir0_rx_pins_a {
9595
/* The ir receiver is not always populated */
96-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
96+
bias-pull-up;
9797
};
9898

9999
&mmc0 {

‎arch/arm/boot/dts/sun4i-a10-mk802.dts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,18 +91,18 @@
9191

9292
&pio {
9393
usb0_id_detect_pin: usb0_id_detect_pin@0 {
94-
allwinner,pins = "PH4";
95-
allwinner,function = "gpio_in";
94+
pins = "PH4";
95+
function = "gpio_in";
9696
};
9797

9898
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
99-
allwinner,pins = "PH5";
100-
allwinner,function = "gpio_in";
99+
pins = "PH5";
100+
function = "gpio_in";
101101
};
102102

103103
usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
104-
allwinner,pins = "PH12";
105-
allwinner,function = "gpio_out";
104+
pins = "PH12";
105+
function = "gpio_out";
106106
};
107107
};
108108

‎arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -168,26 +168,26 @@
168168

169169
&pio {
170170
ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
171-
allwinner,pins = "PC3";
172-
allwinner,function = "gpio_out";
171+
pins = "PC3";
172+
function = "gpio_out";
173173
};
174174

175175
led_pins_olinuxinolime: led_pins@0 {
176-
allwinner,pins = "PH2";
177-
allwinner,function = "gpio_out";
178-
allwinner,drive = <SUN4I_PINCTRL_20_MA>;
176+
pins = "PH2";
177+
function = "gpio_out";
178+
drive-strength = <20>;
179179
};
180180

181181
usb0_id_detect_pin: usb0_id_detect_pin@0 {
182-
allwinner,pins = "PH4";
183-
allwinner,function = "gpio_in";
184-
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
182+
pins = "PH4";
183+
function = "gpio_in";
184+
bias-pull-up;
185185
};
186186

187187
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
188-
allwinner,pins = "PH5";
189-
allwinner,function = "gpio_in";
190-
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
188+
pins = "PH5";
189+
function = "gpio_in";
190+
bias-pull-down;
191191
};
192192
};
193193

0 commit comments

Comments
 (0)