Commit 1848f3f4 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun9i: Remove GPIO pinctrl nodes to avoid warnings

The A80 boards still define some GPIO pinctrl nodes that are not really
useful, and redundant with the muxing already happening on gpio_request.

Let's remove those nodes. This will also remove DTC warnings.
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 98dc89db
...@@ -62,8 +62,6 @@ chosen { ...@@ -62,8 +62,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_cubieboard4>;
green { green {
label = "cubieboard4:green:usr"; label = "cubieboard4:green:usr";
...@@ -97,7 +95,7 @@ &mmc0 { ...@@ -97,7 +95,7 @@ &mmc0 {
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_cubieboard4>; pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_dldo1>; vmmc-supply = <&reg_dldo1>;
vqmmc-supply = <&reg_cldo3>; vqmmc-supply = <&reg_cldo3>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
...@@ -131,11 +129,6 @@ &osc32k { ...@@ -131,11 +129,6 @@ &osc32k {
}; };
&pio { &pio {
led_pins_cubieboard4: led-pins@0 {
pins = "PH6", "PH17";
function = "gpio_out";
};
mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 { mmc0_cd_pin_cubieboard4: mmc0_cd_pin@0 {
pins = "PH18"; pins = "PH18";
function = "gpio_in"; function = "gpio_in";
...@@ -147,13 +140,6 @@ &r_ir { ...@@ -147,13 +140,6 @@ &r_ir {
status = "okay"; status = "okay";
}; };
&r_pio {
wifi_en_pin_cubieboard4: wifi_en_pin@0 {
pins = "PL2";
function = "gpio_out";
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
......
...@@ -62,11 +62,8 @@ chosen { ...@@ -62,11 +62,8 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_optimus>, <&led_r_pins_optimus>;
/* The LED names match those found on the board */ /* The LED names match those found on the board */
led2 { led2 {
label = "optimus:led2:usr"; label = "optimus:led2:usr";
gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>;
...@@ -86,8 +83,6 @@ led4 { ...@@ -86,8 +83,6 @@ led4 {
reg_usb1_vbus: usb1-vbus { reg_usb1_vbus: usb1-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb1_vbus_pin_optimus>;
regulator-name = "usb1-vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
...@@ -97,8 +92,6 @@ reg_usb1_vbus: usb1-vbus { ...@@ -97,8 +92,6 @@ reg_usb1_vbus: usb1-vbus {
reg_usb3_vbus: usb3-vbus { reg_usb3_vbus: usb3-vbus {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&usb3_vbus_pin_optimus>;
regulator-name = "usb3-vbus";
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
enable-active-high; enable-active-high;
...@@ -139,7 +132,7 @@ &mmc0 { ...@@ -139,7 +132,7 @@ &mmc0 {
&mmc1 { &mmc1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins>, <&wifi_en_pin_optimus>; pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_dldo1>; vmmc-supply = <&reg_dldo1>;
vqmmc-supply = <&reg_cldo3>; vqmmc-supply = <&reg_cldo3>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
...@@ -181,44 +174,17 @@ &osc32k { ...@@ -181,44 +174,17 @@ &osc32k {
}; };
&pio { &pio {
led_pins_optimus: led-pins@0 {
pins = "PH0", "PH1";
function = "gpio_out";
};
mmc0_cd_pin_optimus: mmc0_cd_pin@0 { mmc0_cd_pin_optimus: mmc0_cd_pin@0 {
pins = "PH18"; pins = "PH18";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb1_vbus_pin_optimus: usb1_vbus_pin@1 {
pins = "PH4";
function = "gpio_out";
};
usb3_vbus_pin_optimus: usb3_vbus_pin@1 {
pins = "PH5";
function = "gpio_out";
};
}; };
&r_ir { &r_ir {
status = "okay"; status = "okay";
}; };
&r_pio {
led_r_pins_optimus: led-pins@1 {
pins = "PM15";
function = "gpio_out";
};
wifi_en_pin_optimus: wifi_en_pin@0 {
pins = "PL2";
function = "gpio_out";
};
};
&r_rsb { &r_rsb {
status = "okay"; status = "okay";
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment