Skip to content

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

ARM: dts: sun6i: Change pinctrl nodes to avoid warning 

All our pinctrl nodes were using a node name convention with a unit-address
to differentiate the different muxing options. However, since those nodes
didn't have a reg property, they were generating warnings in DTC.

In order to accomodate for this, convert the old nodes to the syntax we've
been using for the new SoCs, including removing the letter suffix of the
node labels to the bank of those pins to make things more readable.
Signed-off-by: default avatarMaxime Ripard <maxime.ripard@bootlin.com>
Acked-by: default avatarChen-Yu Tsai <wens@csie.org>
parent dea296bc
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 68 deletions
arch/arm/boot/dts/sun6i-a31-app4-evb1.dts
View file @ 9b60a3bf
......@@ -72,7 +72,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31-colombus.dts
View file @ 9b60a3bf
......@@ -77,7 +77,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>;
pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
status = "okay";
......@@ -89,19 +89,19 @@ phy1: ethernet-phy@1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "fail";
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
mma8452: mma8452@1d {
......@@ -114,7 +114,7 @@ mma8452: mma8452@1d {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......@@ -136,7 +136,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31-hummingbird.dts
View file @ 9b60a3bf
......@@ -160,7 +160,7 @@ &ehci0 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>;
pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
snps,reset-gpio = <&pio 0 21 GPIO_ACTIVE_HIGH>;
......@@ -185,20 +185,20 @@ hdmi_out_con: endpoint {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
/* pull-ups and devices require AXP221 DLDO3 */
status = "failed";
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
pcf8563: rtc@51 {
......@@ -209,13 +209,13 @@ pcf8563: rtc@51 {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......@@ -224,7 +224,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
......@@ -331,7 +331,7 @@ tcon0_out_vga: endpoint@0 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31-i7.dts
View file @ 9b60a3bf
......@@ -116,7 +116,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>;
pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
......@@ -138,13 +138,13 @@ hdmi_out_con: endpoint {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
......@@ -158,7 +158,7 @@ &reg_usb1_vbus {
&spdif {
pinctrl-names = "default";
pinctrl-0 = <&spdif_pins_a>;
pinctrl-0 = <&spdif_tx_pin>;
spdif-out = "okay";
status = "okay";
};
......@@ -169,7 +169,7 @@ &tcon0 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31-m9.dts
View file @ 9b60a3bf
......@@ -83,7 +83,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>;
pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
......@@ -96,13 +96,13 @@ phy1: ethernet-phy@1 {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
......@@ -201,7 +201,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31-mele-a1000g-quad.dts
View file @ 9b60a3bf
......@@ -83,7 +83,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>;
pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
......@@ -96,13 +96,13 @@ phy1: ethernet-phy@1 {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 7 22 GPIO_ACTIVE_LOW>; /* PH22 */
......@@ -201,7 +201,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31.dtsi
View file @ 9b60a3bf
......@@ -606,7 +606,7 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>;
#gpio-cells = <3>;
gmac_pins_gmii_a: gmac_gmii@0 {
gmac_gmii_pins: gmac-gmii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA4", "PA5", "PA6", "PA7",
"PA8", "PA9", "PA10", "PA11",
......@@ -622,7 +622,7 @@ gmac_pins_gmii_a: gmac_gmii@0 {
drive-strength = <30>;
};
gmac_pins_mii_a: gmac_mii@0 {
gmac_mii_pins: gmac-mii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA8", "PA9", "PA11",
"PA12", "PA13", "PA14", "PA19",
......@@ -631,7 +631,7 @@ gmac_pins_mii_a: gmac_mii@0 {
function = "gmac";
};
gmac_pins_rgmii_a: gmac_rgmii@0 {
gmac_rgmii_pins: gmac-rgmii-pins {
pins = "PA0", "PA1", "PA2", "PA3",
"PA9", "PA10", "PA11",
"PA12", "PA13", "PA14", "PA19",
......@@ -644,22 +644,22 @@ gmac_pins_rgmii_a: gmac_rgmii@0 {
drive-strength = <40>;
};
i2c0_pins_a: i2c0@0 {
i2c0_pins: i2c0-pins {
pins = "PH14", "PH15";
function = "i2c0";
};
i2c1_pins_a: i2c1@0 {
i2c1_pins: i2c1-pins {
pins = "PH16", "PH17";
function = "i2c1";
};
i2c2_pins_a: i2c2@0 {
i2c2_pins: i2c2-pins {
pins = "PH18", "PH19";
function = "i2c2";
};
lcd0_rgb888_pins: lcd0_rgb888 {
lcd0_rgb888_pins: lcd0-rgb888-pins {
pins = "PD0", "PD1", "PD2", "PD3",
"PD4", "PD5", "PD6", "PD7",
"PD8", "PD9", "PD10", "PD11",
......@@ -670,7 +670,7 @@ lcd0_rgb888_pins: lcd0_rgb888 {
function = "lcd0";
};
mmc0_pins_a: mmc0@0 {
mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
......@@ -678,7 +678,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up;
};
mmc1_pins_a: mmc1@0 {
mmc1_pins: mmc1-pins {
pins = "PG0", "PG1", "PG2", "PG3",
"PG4", "PG5";
function = "mmc1";
......@@ -686,7 +686,7 @@ mmc1_pins_a: mmc1@0 {
bias-pull-up;
};
mmc2_pins_a: mmc2@0 {
mmc2_4bit_pins: mmc2-4bit-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11";
function = "mmc2";
......@@ -694,7 +694,7 @@ mmc2_pins_a: mmc2@0 {
bias-pull-up;
};
mmc2_8bit_emmc_pins: mmc2@1 {
mmc2_8bit_emmc_pins: mmc2-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12",
"PC13", "PC14", "PC15",
......@@ -704,7 +704,7 @@ mmc2_8bit_emmc_pins: mmc2@1 {
bias-pull-up;
};
mmc3_8bit_emmc_pins: mmc3@1 {
mmc3_8bit_emmc_pins: mmc3-8bit-emmc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12",
"PC13", "PC14", "PC15",
......@@ -714,12 +714,12 @@ mmc3_8bit_emmc_pins: mmc3@1 {
bias-pull-up;
};
spdif_pins_a: spdif@0 {
spdif_tx_pin: spdif-tx-pin {
pins = "PH28";
function = "spdif";
};
uart0_pins_a: uart0@0 {
uart0_ph_pins: uart0-ph-pins {
pins = "PH20", "PH21";
function = "uart0";
};
......@@ -1372,12 +1372,12 @@ r_pio: pinctrl@1f02c00 {
#size-cells = <0>;
#gpio-cells = <3>;
ir_pins_a: ir@0 {
s_ir_rx_pin: s-ir-rx-pin {
pins = "PL4";
function = "s_ir";
};
p2wi_pins: p2wi {
s_p2wi_pins: s-p2wi-pins {
pins = "PL0", "PL1";
function = "s_p2wi";
};
......@@ -1391,7 +1391,7 @@ p2wi: i2c@1f03400 {
clock-frequency = <100000>;
resets = <&apb0_rst 3>;
pinctrl-names = "default";
pinctrl-0 = <&p2wi_pins>;
pinctrl-0 = <&s_p2wi_pins>;
status = "disabled";
#address-cells = <1>;
#size-cells = <0>;
......
arch/arm/boot/dts/sun6i-a31s-cs908.dts
View file @ 9b60a3bf
......@@ -66,7 +66,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>;
pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
status = "okay";
......@@ -77,7 +77,7 @@ phy1: ethernet-phy@1 {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
......@@ -87,7 +87,7 @@ &ohci1 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31s-inet-q972.dts
View file @ 9b60a3bf
......@@ -55,7 +55,7 @@ &ehci1 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
ft5406ee8: touchscreen@38 {
......
arch/arm/boot/dts/sun6i-a31s-primo81.dts
View file @ 9b60a3bf
......@@ -91,13 +91,13 @@ hdmi_out_con: endpoint {
&i2c0 {
/* pull-ups and device VDDIO use AXP221 DLDO3 */
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "failed";
};
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
ctp@5d {
......@@ -111,7 +111,7 @@ ctp@5d {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
accelerometer@1c {
......@@ -146,7 +146,7 @@ button-349 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......
arch/arm/boot/dts/sun6i-a31s-sina31s-core.dtsi
View file @ 9b60a3bf
......@@ -135,7 +135,7 @@ &reg_dcdc5 {
/* UART0 pads available on core board */
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
arch/arm/boot/dts/sun6i-a31s-sina31s.dts
View file @ 9b60a3bf
......@@ -114,7 +114,7 @@ &ehci1 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>;
pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>;
phy-mode = "mii";
phy-supply = <&reg_dldo1>;
......@@ -137,7 +137,7 @@ hdmi_out_con: endpoint {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
......@@ -162,7 +162,7 @@ button-349 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
......@@ -181,7 +181,7 @@ &reg_dldo1 {
&spdif {
pinctrl-names = "default";
pinctrl-0 = <&spdif_pins_a>;
pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31s-sinovoip-bpi-m2.dts
View file @ 9b60a3bf
......@@ -91,7 +91,7 @@ &ehci0 {
&gmac {
pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>;
pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>;
phy-mode = "rgmii";
phy-supply = <&reg_dldo1>;
......@@ -107,13 +107,13 @@ phy1: ethernet-phy@1 {
&ir {
pinctrl-names = "default";
pinctrl-0 = <&ir_pins_a>;
pinctrl-0 = <&s_ir_rx_pin>;
status = "okay";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 4 GPIO_ACTIVE_LOW>; /* PA4 */
......@@ -122,7 +122,7 @@ &mmc0 {
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
pinctrl-0 = <&mmc2_4bit_pins>;
vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>;
......@@ -254,7 +254,7 @@ &reg_ldo_io1 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-a31s-yones-toptech-bs1078-v2.dts
View file @ 9b60a3bf
......@@ -63,13 +63,13 @@ chosen {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -91,7 +91,7 @@ &ohci1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......@@ -177,7 +177,7 @@ &reg_dldo3 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_ph_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun6i-reference-design-tablet.dtsi
View file @ 9b60a3bf
......@@ -66,7 +66,7 @@ &ehci0 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 0 8 GPIO_ACTIVE_LOW>; /* PA8 */
......
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