Skip to content

L
linux
Commit a4dc7919 authored by Maxime Ripard's avatar Maxime Ripard
Browse files
Options

ARM: dts: sun8i: h3: Refactor the pinctrl node names 

The H3 and H5 have never been converted to the new convention we want to
have for the pinctrl nodes.

Convert them.
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
parent 75f9a058
Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 52 deletions
arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts
View file @ a4dc7919
...@@ -112,7 +112,7 @@ &ohci0 { ...@@ -112,7 +112,7 @@ &ohci0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts
View file @ a4dc7919
...@@ -178,7 +178,7 @@ flash@0 { ...@@ -178,7 +178,7 @@ flash@0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-beelink-x2.dts
View file @ a4dc7919
...@@ -142,7 +142,7 @@ hdmi_out_con: endpoint { ...@@ -142,7 +142,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -193,13 +193,13 @@ &reg_usb0_vbus { ...@@ -193,13 +193,13 @@ &reg_usb0_vbus {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-mapleboard-mp130.dts
View file @ a4dc7919
...@@ -84,7 +84,7 @@ &emac { ...@@ -84,7 +84,7 @@ &emac {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -120,7 +120,7 @@ &ohci3 { ...@@ -120,7 +120,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts
View file @ a4dc7919
...@@ -120,7 +120,7 @@ hdmi_out_con: endpoint { ...@@ -120,7 +120,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-nanopi-m1.dts
View file @ a4dc7919
...@@ -93,7 +93,7 @@ hdmi_out_con: endpoint { ...@@ -93,7 +93,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts
View file @ a4dc7919
...@@ -105,7 +105,7 @@ brcmf: bcrmf@1 { ...@@ -105,7 +105,7 @@ brcmf: bcrmf@1 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-nanopi.dtsi
View file @ a4dc7919
...@@ -125,7 +125,7 @@ sw_r_npi: key_pins { ...@@ -125,7 +125,7 @@ sw_r_npi: key_pins {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-orangepi-2.dts
View file @ a4dc7919
...@@ -152,7 +152,7 @@ hdmi_out_con: endpoint { ...@@ -152,7 +152,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -210,7 +210,7 @@ &reg_usb1_vbus { ...@@ -210,7 +210,7 @@ &reg_usb1_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-orangepi-lite.dts
View file @ a4dc7919
...@@ -126,7 +126,7 @@ hdmi_out_con: endpoint { ...@@ -126,7 +126,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -181,7 +181,7 @@ sw_r_opc: key_pins { ...@@ -181,7 +181,7 @@ sw_r_opc: key_pins {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-orangepi-one.dts
View file @ a4dc7919
...@@ -192,7 +192,7 @@ &reg_usb0_vbus { ...@@ -192,7 +192,7 @@ &reg_usb0_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts
View file @ a4dc7919
...@@ -152,7 +152,7 @@ hdmi_out_con: endpoint { ...@@ -152,7 +152,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -229,7 +229,7 @@ &reg_usb0_vbus { ...@@ -229,7 +229,7 @@ &reg_usb0_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun8i-h3-orangepi-zero-plus2.dts
View file @ a4dc7919
...@@ -134,6 +134,6 @@ &mmc2 { ...@@ -134,6 +134,6 @@ &mmc2 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/sun8i-h3-rervision-dvk.dts
View file @ a4dc7919
...@@ -100,7 +100,7 @@ &ohci3 { ...@@ -100,7 +100,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sunxi-bananapi-m2-plus.dtsi
View file @ a4dc7919
...@@ -150,7 +150,7 @@ hdmi_out_con: endpoint { ...@@ -150,7 +150,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -207,7 +207,7 @@ &reg_usb0_vbus { ...@@ -207,7 +207,7 @@ &reg_usb0_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sunxi-h3-h5.dtsi
View file @ a4dc7919
...@@ -386,14 +386,14 @@ pio: pinctrl@1c20800 { ...@@ -386,14 +386,14 @@ pio: pinctrl@1c20800 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
csi_pins: csi { csi_pins: csi-pins {
pins = "PE0", "PE2", "PE3", "PE4", "PE5", pins = "PE0", "PE2", "PE3", "PE4", "PE5",
"PE6", "PE7", "PE8", "PE9", "PE10", "PE6", "PE7", "PE8", "PE9", "PE10",
"PE11"; "PE11";
function = "csi"; function = "csi";
}; };
emac_rgmii_pins: emac0 { emac_rgmii_pins: emac-rgmii-pins {
pins = "PD0", "PD1", "PD2", "PD3", "PD4", pins = "PD0", "PD1", "PD2", "PD3", "PD4",
"PD5", "PD7", "PD8", "PD9", "PD10", "PD5", "PD7", "PD8", "PD9", "PD10",
"PD12", "PD13", "PD15", "PD16", "PD17"; "PD12", "PD13", "PD15", "PD16", "PD17";
...@@ -401,22 +401,22 @@ emac_rgmii_pins: emac0 { ...@@ -401,22 +401,22 @@ emac_rgmii_pins: emac0 {
drive-strength = <40>; drive-strength = <40>;
}; };
i2c0_pins: i2c0 { i2c0_pins: i2c0-pins {
pins = "PA11", "PA12"; pins = "PA11", "PA12";
function = "i2c0"; function = "i2c0";
}; };
i2c1_pins: i2c1 { i2c1_pins: i2c1-pins {
pins = "PA18", "PA19"; pins = "PA18", "PA19";
function = "i2c1"; function = "i2c1";
}; };
i2c2_pins: i2c2 { i2c2_pins: i2c2-pins {
pins = "PE12", "PE13"; pins = "PE12", "PE13";
function = "i2c2"; function = "i2c2";
}; };
mmc0_pins: mmc0 { mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", "PF3", pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5"; "PF4", "PF5";
function = "mmc0"; function = "mmc0";
...@@ -424,7 +424,7 @@ mmc0_pins: mmc0 { ...@@ -424,7 +424,7 @@ mmc0_pins: mmc0 {
bias-pull-up; bias-pull-up;
}; };
mmc1_pins: mmc1 { mmc1_pins: mmc1-pins {
pins = "PG0", "PG1", "PG2", "PG3", pins = "PG0", "PG1", "PG2", "PG3",
"PG4", "PG5"; "PG4", "PG5";
function = "mmc1"; function = "mmc1";
...@@ -432,7 +432,7 @@ mmc1_pins: mmc1 { ...@@ -432,7 +432,7 @@ mmc1_pins: mmc1 {
bias-pull-up; bias-pull-up;
}; };
mmc2_8bit_pins: mmc2_8bit { mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC5", "PC6", "PC8", pins = "PC5", "PC6", "PC8",
"PC9", "PC10", "PC11", "PC9", "PC10", "PC11",
"PC12", "PC13", "PC14", "PC12", "PC13", "PC14",
...@@ -442,47 +442,47 @@ mmc2_8bit_pins: mmc2_8bit { ...@@ -442,47 +442,47 @@ mmc2_8bit_pins: mmc2_8bit {
bias-pull-up; bias-pull-up;
}; };
spdif_tx_pins_a: spdif { spdif_tx_pin: spdif-tx-pin {
pins = "PA17"; pins = "PA17";
function = "spdif"; function = "spdif";
}; };
spi0_pins: spi0 { spi0_pins: spi0-pins {
pins = "PC0", "PC1", "PC2", "PC3"; pins = "PC0", "PC1", "PC2", "PC3";
function = "spi0"; function = "spi0";
}; };
spi1_pins: spi1 { spi1_pins: spi1-pins {
pins = "PA15", "PA16", "PA14", "PA13"; pins = "PA15", "PA16", "PA14", "PA13";
function = "spi1"; function = "spi1";
}; };
uart0_pins_a: uart0 { uart0_pa_pins: uart0-pa-pins {
pins = "PA4", "PA5"; pins = "PA4", "PA5";
function = "uart0"; function = "uart0";
}; };
uart1_pins: uart1 { uart1_pins: uart1-pins {
pins = "PG6", "PG7"; pins = "PG6", "PG7";
function = "uart1"; function = "uart1";
}; };
uart1_rts_cts_pins: uart1_rts_cts { uart1_rts_cts_pins: uart1-rts-cts-pins {
pins = "PG8", "PG9"; pins = "PG8", "PG9";
function = "uart1"; function = "uart1";
}; };
uart2_pins: uart2 { uart2_pins: uart2-pins {
pins = "PA0", "PA1"; pins = "PA0", "PA1";
function = "uart2"; function = "uart2";
}; };
uart3_pins: uart3 { uart3_pins: uart3-pins {
pins = "PA13", "PA14"; pins = "PA13", "PA14";
function = "uart3"; function = "uart3";
}; };
uart3_rts_cts_pins: uart3_rts_cts { uart3_rts_cts_pins: uart3-rts-cts-pins {
pins = "PA15", "PA16"; pins = "PA15", "PA16";
function = "uart3"; function = "uart3";
}; };
...@@ -860,12 +860,12 @@ r_pio: pinctrl@1f02c00 { ...@@ -860,12 +860,12 @@ r_pio: pinctrl@1f02c00 {
interrupt-controller; interrupt-controller;
#interrupt-cells = <3>; #interrupt-cells = <3>;
ir_pins_a: ir { r_ir_rx_pin: r-ir-rx-pin {
pins = "PL11"; pins = "PL11";
function = "s_cir_rx"; function = "s_cir_rx";
}; };
r_i2c_pins: r-i2c { r_i2c_pins: r-i2c-pins {
pins = "PL0", "PL1"; pins = "PL0", "PL1";
function = "s_i2c"; function = "s_i2c";
}; };
......
arch/arm/boot/dts/sunxi-libretech-all-h3-cc.dtsi
View file @ a4dc7919
...@@ -167,7 +167,7 @@ hdmi_out_con: endpoint { ...@@ -167,7 +167,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -205,7 +205,7 @@ &ohci3 { ...@@ -205,7 +205,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-emlid-neutis-n5-devboard.dts
View file @ a4dc7919
...@@ -132,7 +132,7 @@ &ohci3 { ...@@ -132,7 +132,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts
View file @ a4dc7919
...@@ -188,7 +188,7 @@ &ohci3 { ...@@ -188,7 +188,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts
View file @ a4dc7919
...@@ -142,7 +142,7 @@ &ohci3 { ...@@ -142,7 +142,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts
View file @ a4dc7919
...@@ -180,7 +180,7 @@ hdmi_out_con: endpoint { ...@@ -180,7 +180,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -221,7 +221,7 @@ flash@0 { ...@@ -221,7 +221,7 @@ flash@0 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts
View file @ a4dc7919
...@@ -187,7 +187,7 @@ hdmi_out_con: endpoint { ...@@ -187,7 +187,7 @@ hdmi_out_con: endpoint {
&ir { &ir {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>; pinctrl-0 = <&r_ir_rx_pin>;
status = "okay"; status = "okay";
}; };
...@@ -224,7 +224,7 @@ &ohci3 { ...@@ -224,7 +224,7 @@ &ohci3 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus.dts
View file @ a4dc7919
...@@ -127,7 +127,7 @@ &ohci1 { ...@@ -127,7 +127,7 @@ &ohci1 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts
View file @ a4dc7919
...@@ -133,7 +133,7 @@ &mmc2 { ...@@ -133,7 +133,7 @@ &mmc2 {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pa_pins>;
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7