Commit 75539f68 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun4i: Remove all useless pinctrl nodes

The gpio pinctrl nodes are redundant and as such useless most of the times.
Since they will also generate warnings in DTC, we can simply remove most of
them.
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent 124d19dc
...@@ -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_a1000>;
red { red {
label = "a1000:red:usr"; label = "a1000:red:usr";
...@@ -79,8 +77,6 @@ blue { ...@@ -79,8 +77,6 @@ blue {
reg_emac_3v3: emac-3v3 { reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&emac_power_pin_a1000>;
regulator-name = "emac-3v3"; regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -187,18 +183,6 @@ &ohci1 { ...@@ -187,18 +183,6 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
emac_power_pin_a1000: emac_power_pin@0 {
pins = "PH15";
function = "gpio_out";
};
led_pins_a1000: led_pins@0 {
pins = "PH10", "PH20";
function = "gpio_out";
};
};
#include "axp209.dtsi" #include "axp209.dtsi"
&reg_dcdc2 { &reg_dcdc2 {
......
...@@ -125,12 +125,6 @@ &otg_sram { ...@@ -125,12 +125,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb2_vbus_pin_a: usb2_vbus_pin@0 {
pins = "PH12";
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
regulator-boot-on; regulator-boot-on;
status = "okay"; status = "okay";
......
...@@ -58,8 +58,6 @@ aliases { ...@@ -58,8 +58,6 @@ aliases {
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&bl_en_pin_dsrv9703c>;
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <8>; default-brightness-level = <8>;
...@@ -79,8 +77,6 @@ haptics { ...@@ -79,8 +77,6 @@ haptics {
reg_motor: reg_motor { reg_motor: reg_motor {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&motor_pins>;
regulator-name = "vcc-motor"; regulator-name = "vcc-motor";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
regulator-max-microvolt = <3000000>; regulator-max-microvolt = <3000000>;
...@@ -90,8 +86,6 @@ reg_motor: reg_motor { ...@@ -90,8 +86,6 @@ reg_motor: reg_motor {
}; };
&codec { &codec {
pinctrl-names = "default";
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
status = "okay"; status = "okay";
}; };
...@@ -134,8 +128,6 @@ ft5406ee8: touchscreen@38 { ...@@ -134,8 +128,6 @@ ft5406ee8: touchscreen@38 {
reg = <0x38>; reg = <0x38>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_pins>;
reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>; reset-gpios = <&pio 1 13 GPIO_ACTIVE_LOW>;
touchscreen-size-x = <1024>; touchscreen-size-x = <1024>;
touchscreen-size-y = <768>; touchscreen-size-y = <768>;
...@@ -176,26 +168,6 @@ &otg_sram { ...@@ -176,26 +168,6 @@ &otg_sram {
}; };
&pio { &pio {
bl_en_pin_dsrv9703c: bl_en_pin@0 {
pins = "PH7";
function = "gpio_out";
};
codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";
function = "gpio_out";
};
motor_pins: motor_pins@0 {
pins = "PB3";
function = "gpio_out";
};
touchscreen_pins: touchscreen_pins@0 {
pins = "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
......
...@@ -72,8 +72,6 @@ chosen { ...@@ -72,8 +72,6 @@ chosen {
*/ */
&codec { &codec {
/* PH15 controls power to external amplifier (ft2012q) */ /* PH15 controls power to external amplifier (ft2012q) */
pinctrl-names = "default";
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
...@@ -154,13 +152,6 @@ &mmc0 { ...@@ -154,13 +152,6 @@ &mmc0 {
status = "okay"; status = "okay";
}; };
&pio {
codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";
function = "gpio_out";
};
};
&reg_dcdc2 { &reg_dcdc2 {
regulator-always-on; regulator-always-on;
regulator-min-microvolt = <1000000>; regulator-min-microvolt = <1000000>;
......
...@@ -123,27 +123,11 @@ &ohci1 { ...@@ -123,27 +123,11 @@ &ohci1 {
status = "okay"; status = "okay";
}; };
&pio {
pinctrl-names = "default";
pinctrl-0 = <&hackberry_hogs>;
hackberry_hogs: hogs@0 {
pins = "PH19";
function = "gpio_out";
};
usb2_vbus_pin_hackberry: usb2_vbus_pin@0 {
pins = "PH12";
function = "gpio_out";
};
};
&reg_usb1_vbus { &reg_usb1_vbus {
status = "okay"; status = "okay";
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-0 = <&usb2_vbus_pin_hackberry>;
gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -58,8 +58,6 @@ aliases { ...@@ -58,8 +58,6 @@ aliases {
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&bl_en_pin_inet>;
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <8>; default-brightness-level = <8>;
...@@ -124,8 +122,6 @@ ft5x: touchscreen@38 { ...@@ -124,8 +122,6 @@ ft5x: touchscreen@38 {
reg = <0x38>; reg = <0x38>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>; interrupts = <7 21 IRQ_TYPE_EDGE_FALLING>;
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_wake_pin>;
wake-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* PB13 */ wake-gpios = <&pio 1 13 GPIO_ACTIVE_HIGH>; /* PB13 */
touchscreen-size-x = <600>; touchscreen-size-x = <600>;
touchscreen-size-y = <1024>; touchscreen-size-y = <1024>;
...@@ -178,16 +174,6 @@ &otg_sram { ...@@ -178,16 +174,6 @@ &otg_sram {
}; };
&pio { &pio {
bl_en_pin_inet: bl_en_pin@0 {
pins = "PH7";
function = "gpio_out";
};
touchscreen_wake_pin: touchscreen_wake_pin@0 {
pins = "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
......
...@@ -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_q5>;
green { green {
label = "q5:green:usr"; label = "q5:green:usr";
...@@ -74,8 +72,6 @@ green { ...@@ -74,8 +72,6 @@ green {
reg_emac_3v3: emac-3v3 { reg_emac_3v3: emac-3v3 {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
pinctrl-names = "default";
pinctrl-0 = <&emac_power_pin_q5>;
regulator-name = "emac-3v3"; regulator-name = "emac-3v3";
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
...@@ -160,18 +156,6 @@ &otg_sram { ...@@ -160,18 +156,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
emac_power_pin_q5: emac_power_pin@0 {
pins = "PH19";
function = "gpio_out";
};
led_pins_q5: led_pins@0 {
pins = "PH20";
function = "gpio_out";
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
regulator-boot-on; regulator-boot-on;
status = "okay"; status = "okay";
......
...@@ -61,8 +61,6 @@ chosen { ...@@ -61,8 +61,6 @@ chosen {
leds { leds {
compatible = "gpio-leds"; compatible = "gpio-leds";
pinctrl-names = "default";
pinctrl-0 = <&led_pins_marsboard>;
red1 { red1 {
label = "marsboard:red1:usr"; label = "marsboard:red1:usr";
...@@ -162,11 +160,6 @@ &otg_sram { ...@@ -162,11 +160,6 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_marsboard: led_pins@0 {
pins = "PB5", "PB6", "PB7", "PB8";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
......
...@@ -88,23 +88,6 @@ &otg_sram { ...@@ -88,23 +88,6 @@ &otg_sram {
status = "okay"; status = "okay";
}; };
&pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4";
function = "gpio_in";
};
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
pins = "PH5";
function = "gpio_in";
};
usb2_vbus_pin_mk802: usb2_vbus_pin@0 {
pins = "PH12";
function = "gpio_out";
};
};
&reg_usb0_vbus { &reg_usb0_vbus {
status = "okay"; status = "okay";
}; };
...@@ -114,7 +97,6 @@ &reg_usb1_vbus { ...@@ -114,7 +97,6 @@ &reg_usb1_vbus {
}; };
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-0 = <&usb2_vbus_pin_mk802>;
gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */ gpio = <&pio 7 12 GPIO_ACTIVE_HIGH>; /* PH12 */
status = "okay"; status = "okay";
}; };
...@@ -131,8 +113,6 @@ &usb_otg { ...@@ -131,8 +113,6 @@ &usb_otg {
}; };
&usbphy { &usbphy {
pinctrl-names = "default";
pinctrl-0 = <&usb0_id_detect_pin>, <&usb0_vbus_detect_pin>;
usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */ usb0_id_det-gpios = <&pio 7 4 GPIO_ACTIVE_HIGH>; /* PH4 */
usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */ usb0_vbus_det-gpios = <&pio 7 5 GPIO_ACTIVE_HIGH>; /* PH5 */
usb0_vbus-supply = <&reg_usb0_vbus>; usb0_vbus-supply = <&reg_usb0_vbus>;
......
...@@ -166,11 +166,6 @@ &otg_sram { ...@@ -166,11 +166,6 @@ &otg_sram {
}; };
&pio { &pio {
ahci_pwr_pin_olinuxinolime: ahci_pwr_pin@1 {
pins = "PC3";
function = "gpio_out";
};
led_pins_olinuxinolime: led_pins@0 { led_pins_olinuxinolime: led_pins@0 {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
...@@ -191,7 +186,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { ...@@ -191,7 +186,6 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
}; };
&reg_ahci_5v { &reg_ahci_5v {
pinctrl-0 = <&ahci_pwr_pin_olinuxinolime>;
gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>; gpio = <&pio 2 3 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -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_pcduino>;
tx { tx {
label = "pcduino:green:tx"; label = "pcduino:green:tx";
...@@ -78,8 +76,6 @@ rx { ...@@ -78,8 +76,6 @@ rx {
gpio_keys { gpio_keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
pinctrl-names = "default";
pinctrl-0 = <&key_pins_pcduino>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -168,16 +164,6 @@ &otg_sram { ...@@ -168,16 +164,6 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_pcduino: led_pins@0 {
pins = "PH15", "PH16";
function = "gpio_out";
};
key_pins_pcduino: key_pins@0 {
pins = "PH17", "PH18", "PH19";
function = "gpio_in";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
......
...@@ -55,16 +55,7 @@ / { ...@@ -55,16 +55,7 @@ / {
compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10"; compatible = "linksprite,a10-pcduino2", "allwinner,sun4i-a10";
}; };
&pio {
usb2_vbus_pin_pcduino2: usb2_vbus_pin@0 {
pins = "PD2";
function = "gpio_out";
};
};
&reg_usb2_vbus { &reg_usb2_vbus {
pinctrl-names = "default";
pinctrl-0 = <&usb2_vbus_pin_pcduino2>;
gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>; gpio = <&pio 3 2 GPIO_ACTIVE_HIGH>;
status = "okay"; status = "okay";
}; };
......
...@@ -58,8 +58,6 @@ aliases { ...@@ -58,8 +58,6 @@ aliases {
backlight: backlight { backlight: backlight {
compatible = "pwm-backlight"; compatible = "pwm-backlight";
pinctrl-names = "default";
pinctrl-0 = <&bl_en_pin_protab>;
pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>; pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>; brightness-levels = <0 10 20 30 40 50 60 70 80 90 100>;
default-brightness-level = <8>; default-brightness-level = <8>;
...@@ -72,8 +70,6 @@ chosen { ...@@ -72,8 +70,6 @@ chosen {
}; };
&codec { &codec {
pinctrl-names = "default";
pinctrl-0 = <&codec_pa_pin>;
allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */ allwinner,pa-gpios = <&pio 7 15 GPIO_ACTIVE_HIGH>; /* PH15 */
status = "okay"; status = "okay";
}; };
...@@ -112,8 +108,6 @@ &i2c2 { ...@@ -112,8 +108,6 @@ &i2c2 {
status = "okay"; status = "okay";
pixcir_ts@5c { pixcir_ts@5c {
pinctrl-names = "default";
pinctrl-0 = <&touchscreen_pins>;
compatible = "pixcir,pixcir_tangoc"; compatible = "pixcir,pixcir_tangoc";
reg = <0x5c>; reg = <0x5c>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
...@@ -162,21 +156,6 @@ &otg_sram { ...@@ -162,21 +156,6 @@ &otg_sram {
}; };
&pio { &pio {
bl_en_pin_protab: bl_en_pin@0 {
pins = "PH7";
function = "gpio_out";
};
codec_pa_pin: codec_pa_pin@0 {
pins = "PH15";
function = "gpio_out";
};
touchscreen_pins: touchscreen_pins@0 {
pins = "PA5", "PB13";
function = "gpio_out";
};
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0_id_detect_pin@0 {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
......
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