Commit 1edcd36f authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 119c366a
......@@ -186,13 +186,13 @@
&pio {
emac_power_pin_a1000: emac_power_pin@0 {
allwinner,pins = "PH15";
allwinner,function = "gpio_out";
pins = "PH15";
function = "gpio_out";
};
led_pins_a1000: led_pins@0 {
allwinner,pins = "PH10", "PH20";
allwinner,function = "gpio_out";
pins = "PH10", "PH20";
function = "gpio_out";
};
};
......
......@@ -127,7 +127,7 @@
&pio {
usb2_vbus_pin_a: usb2_vbus_pin@0 {
allwinner,pins = "PH12";
pins = "PH12";
};
};
......
......@@ -142,15 +142,15 @@
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -165,15 +165,15 @@
&pio {
led_pins_cubieboard: led_pins@0 {
allwinner,pins = "PH20", "PH21";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_20_MA>;
pins = "PH20", "PH21";
function = "gpio_out";
drive-strength = <20>;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
......
......@@ -178,35 +178,35 @@
&pio {
bl_en_pin_dsrv9703c: bl_en_pin@0 {
allwinner,pins = "PH7";
allwinner,function = "gpio_out";
pins = "PH7";
function = "gpio_out";
};
codec_pa_pin: codec_pa_pin@0 {
allwinner,pins = "PH15";
allwinner,function = "gpio_out";
pins = "PH15";
function = "gpio_out";
};
motor_pins: motor_pins@0 {
allwinner,pins = "PB3";
allwinner,function = "gpio_out";
pins = "PB3";
function = "gpio_out";
};
touchscreen_pins: touchscreen_pins@0 {
allwinner,pins = "PB13";
allwinner,function = "gpio_out";
pins = "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -156,8 +156,8 @@
&pio {
codec_pa_pin: codec_pa_pin@0 {
allwinner,pins = "PH15";
allwinner,function = "gpio_out";
pins = "PH15";
function = "gpio_out";
};
};
......
......@@ -129,13 +129,13 @@
pinctrl-0 = <&hackberry_hogs>;
hackberry_hogs: hogs@0 {
allwinner,pins = "PH19";
allwinner,function = "gpio_out";
pins = "PH19";
function = "gpio_out";
};
usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
allwinner,pins = "PH12";
allwinner,function = "gpio_out";
pins = "PH12";
function = "gpio_out";
};
};
......
......@@ -93,15 +93,15 @@
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......@@ -121,7 +121,7 @@
};
&usb2_vbus_pin_a {
allwinner,pins = "PH6";
pins = "PH6";
};
&usb_otg {
......
......@@ -180,25 +180,25 @@
&pio {
bl_en_pin_inet: bl_en_pin@0 {
allwinner,pins = "PH7";
allwinner,function = "gpio_out";
pins = "PH7";
function = "gpio_out";
};
touchscreen_wake_pin: touchscreen_wake_pin@0 {
allwinner,pins = "PB13";
allwinner,function = "gpio_out";
pins = "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -161,15 +161,15 @@
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -320,25 +320,25 @@
&pio {
key_pins_inet9f: key_pins@0 {
allwinner,pins = "PA0", "PA1", "PA3", "PA4",
"PA5", "PA6", "PA8", "PA9",
"PA11", "PA12", "PA13",
"PA14", "PA15", "PA16", "PA17",
"PH22", "PH23", "PH24", "PH25", "PH26";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PA0", "PA1", "PA3", "PA4",
"PA5", "PA6", "PA8", "PA9",
"PA11", "PA12", "PA13",
"PA14", "PA15", "PA16", "PA17",
"PH22", "PH23", "PH24", "PH25", "PH26";
function = "gpio_in";
bias-pull-up;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -163,13 +163,13 @@
&pio {
emac_power_pin_q5: emac_power_pin@0 {
allwinner,pins = "PH19";
allwinner,function = "gpio_out";
pins = "PH19";
function = "gpio_out";
};
led_pins_q5: led_pins@0 {
allwinner,pins = "PH20";
allwinner,function = "gpio_out";
pins = "PH20";
function = "gpio_out";
};
};
......
......@@ -164,14 +164,14 @@
&pio {
led_pins_marsboard: led_pins@0 {
allwinner,pins = "PB5", "PB6", "PB7", "PB8";
allwinner,function = "gpio_out";
pins = "PB5", "PB6", "PB7", "PB8";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
......
......@@ -93,7 +93,7 @@
&ir0_rx_pins_a {
/* The ir receiver is not always populated */
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
bias-pull-up;
};
&mmc0 {
......
......@@ -91,18 +91,18 @@
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
pins = "PH4";
function = "gpio_in";
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
pins = "PH5";
function = "gpio_in";
};
usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
allwinner,pins = "PH12";
allwinner,function = "gpio_out";
pins = "PH12";
function = "gpio_out";
};
};
......
......@@ -168,26 +168,26 @@
&pio {
ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
allwinner,pins = "PC3";
allwinner,function = "gpio_out";
pins = "PC3";
function = "gpio_out";
};
led_pins_olinuxinolime: led_pins@0 {
allwinner,pins = "PH2";
allwinner,function = "gpio_out";
allwinner,drive = <SUN4I_PINCTRL_20_MA>;
pins = "PH2";
function = "gpio_out";
drive-strength = <20>;
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -170,19 +170,19 @@
&pio {
led_pins_pcduino: led_pins@0 {
allwinner,pins = "PH15", "PH16";
allwinner,function = "gpio_out";
pins = "PH15", "PH16";
function = "gpio_out";
};
key_pins_pcduino: key_pins@0 {
allwinner,pins = "PH17", "PH18", "PH19";
allwinner,function = "gpio_in";
pins = "PH17", "PH18", "PH19";
function = "gpio_in";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
};
......
......@@ -57,8 +57,8 @@
&pio {
usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {
allwinner,pins = "PD2";
allwinner,function = "gpio_out";
pins = "PD2";
function = "gpio_out";
};
};
......
......@@ -164,30 +164,30 @@
&pio {
bl_en_pin_protab: bl_en_pin@0 {
allwinner,pins = "PH7";
allwinner,function = "gpio_out";
pins = "PH7";
function = "gpio_out";
};
codec_pa_pin: codec_pa_pin@0 {
allwinner,pins = "PH15";
allwinner,function = "gpio_out";
pins = "PH15";
function = "gpio_out";
};
touchscreen_pins: touchscreen_pins@0 {
allwinner,pins = "PA5", "PB13";
allwinner,function = "gpio_out";
pins = "PA5", "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 {
allwinner,pins = "PH4";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH4";
function = "gpio_in";
bias-pull-up;
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
allwinner,pins = "PH5";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_DOWN>;
pins = "PH5";
function = "gpio_in";
bias-pull-down;
};
};
......
......@@ -975,141 +975,141 @@
#gpio-cells = <3>;
emac_pins_a: emac0@0 {
allwinner,pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
"PA11", "PA12", "PA13", "PA14",
"PA15", "PA16";
allwinner,function = "emac";
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
"PA11", "PA12", "PA13", "PA14",
"PA15", "PA16";
function = "emac";
};
i2c0_pins_a: i2c0@0 {
allwinner,pins = "PB0", "PB1";
allwinner,function = "i2c0";
pins = "PB0", "PB1";
function = "i2c0";
};
i2c1_pins_a: i2c1@0 {
allwinner,pins = "PB18", "PB19";
allwinner,function = "i2c1";
pins = "PB18", "PB19";
function = "i2c1";
};
i2c2_pins_a: i2c2@0 {
allwinner,pins = "PB20", "PB21";
allwinner,function = "i2c2";
pins = "PB20", "PB21";
function = "i2c2";
};
ir0_rx_pins_a: ir0@0 {
allwinner,pins = "PB4";
allwinner,function = "ir0";
pins = "PB4";
function = "ir0";
};
ir0_tx_pins_a: ir0@1 {
allwinner,pins = "PB3";
allwinner,function = "ir0";
pins = "PB3";
function = "ir0";
};
ir1_rx_pins_a: ir1@0 {
allwinner,pins = "PB23";
allwinner,function = "ir1";
pins = "PB23";
function = "ir1";
};
ir1_tx_pins_a: ir1@1 {
allwinner,pins = "PB22";
allwinner,function = "ir1";
pins = "PB22";
function = "ir1";
};
mmc0_pins_a: mmc0@0 {
allwinner,pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
allwinner,function = "mmc0";
allwinner,drive = <SUN4I_PINCTRL_30_MA>;
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
drive-strength = <30>;
};
mmc0_cd_pin_reference_design: mmc0_cd_pin@0 {
allwinner,pins = "PH1";
allwinner,function = "gpio_in";
allwinner,pull = <SUN4I_PINCTRL_PULL_UP>;
pins = "PH1";
function = "gpio_in";
bias-pull-up;
};
ps20_pins_a: ps20@0 {
allwinner,pins = "PI20", "PI21";
allwinner,function = "ps2";
pins = "PI20", "PI21";
function = "ps2";
};
ps21_pins_a: ps21@0 {
allwinner,pins = "PH12", "PH13";
allwinner,function = "ps2";
pins = "PH12", "PH13";
function = "ps2";
};
pwm0_pins_a: pwm0@0 {
allwinner,pins = "PB2";
allwinner,function = "pwm";
pins = "PB2";
function = "pwm";
};
pwm1_pins_a: pwm1@0 {
allwinner,pins = "PI3";