Commit 012d5f38 authored by Maxime Ripard's avatar Maxime Ripard

ARM: dts: sun4i: Remove underscores from nodes names

Some GPIO pinctrl nodes cannot be easily removed, because they would also
change the pin configuration, for example to add a pull resistor or change
the current delivered by the pin.

Those nodes still have underscores and unit-addresses in their node names
in our DTs, so adjust their name to remove the warnings. Use that occasion
to also fix some poorly chosen node-names.
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@free-electrons.com>
parent bca0d7d9
...@@ -133,13 +133,13 @@ &otg_sram { ...@@ -133,13 +133,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -155,13 +155,13 @@ &otg_sram { ...@@ -155,13 +155,13 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_cubieboard: led_pins@0 { led_pins_cubieboard: led-pins {
pins = "PH20", "PH21"; pins = "PH20", "PH21";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
......
...@@ -75,7 +75,7 @@ haptics { ...@@ -75,7 +75,7 @@ haptics {
max-microvolt = <3000000>; max-microvolt = <3000000>;
}; };
reg_motor: reg_motor { reg_motor: reg-motor {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "vcc-motor"; regulator-name = "vcc-motor";
regulator-min-microvolt = <3000000>; regulator-min-microvolt = <3000000>;
...@@ -160,13 +160,13 @@ &otg_sram { ...@@ -160,13 +160,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -88,13 +88,13 @@ &otg_sram { ...@@ -88,13 +88,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -166,13 +166,13 @@ &otg_sram { ...@@ -166,13 +166,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -152,13 +152,13 @@ &otg_sram { ...@@ -152,13 +152,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -59,7 +59,7 @@ chosen { ...@@ -59,7 +59,7 @@ chosen {
stdout-path = "serial0:115200n8"; stdout-path = "serial0:115200n8";
}; };
gpio_keys { gpio-keys {
compatible = "gpio-keys-polled"; compatible = "gpio-keys-polled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&key_pins_inet9f>; pinctrl-0 = <&key_pins_inet9f>;
...@@ -310,7 +310,7 @@ &otg_sram { ...@@ -310,7 +310,7 @@ &otg_sram {
}; };
&pio { &pio {
key_pins_inet9f: key_pins@0 { key_pins_inet9f: key-pins {
pins = "PA0", "PA1", "PA3", "PA4", pins = "PA0", "PA1", "PA3", "PA4",
"PA5", "PA6", "PA8", "PA9", "PA5", "PA6", "PA8", "PA9",
"PA11", "PA12", "PA13", "PA11", "PA12", "PA13",
...@@ -320,13 +320,13 @@ key_pins_inet9f: key_pins@0 { ...@@ -320,13 +320,13 @@ key_pins_inet9f: key_pins@0 {
bias-pull-up; bias-pull-up;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -150,7 +150,7 @@ &otg_sram { ...@@ -150,7 +150,7 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
......
...@@ -158,19 +158,19 @@ &otg_sram { ...@@ -158,19 +158,19 @@ &otg_sram {
}; };
&pio { &pio {
led_pins_olinuxinolime: led_pins@0 { led_pins_olinuxinolime: led-pin {
pins = "PH2"; pins = "PH2";
function = "gpio_out"; function = "gpio_out";
drive-strength = <20>; drive-strength = <20>;
}; };
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
...@@ -74,7 +74,7 @@ rx { ...@@ -74,7 +74,7 @@ rx {
}; };
}; };
gpio_keys { gpio-keys {
compatible = "gpio-keys"; compatible = "gpio-keys";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
...@@ -158,7 +158,7 @@ &otg_sram { ...@@ -158,7 +158,7 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
......
...@@ -101,7 +101,7 @@ &i2c1 { ...@@ -101,7 +101,7 @@ &i2c1 {
&i2c2 { &i2c2 {
status = "okay"; status = "okay";
pixcir_ts@5c { touchscreen@5c {
compatible = "pixcir,pixcir_tangoc"; compatible = "pixcir,pixcir_tangoc";
reg = <0x5c>; reg = <0x5c>;
interrupt-parent = <&pio>; interrupt-parent = <&pio>;
...@@ -148,13 +148,13 @@ &otg_sram { ...@@ -148,13 +148,13 @@ &otg_sram {
}; };
&pio { &pio {
usb0_id_detect_pin: usb0_id_detect_pin@0 { usb0_id_detect_pin: usb0-id-detect-pin {
pins = "PH4"; pins = "PH4";
function = "gpio_in"; function = "gpio_in";
bias-pull-up; bias-pull-up;
}; };
usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 { usb0_vbus_detect_pin: usb0-vbus-detect-pin {
pins = "PH5"; pins = "PH5";
function = "gpio_in"; function = "gpio_in";
bias-pull-down; bias-pull-down;
......
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