Skip to content

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

ARM: dts: sun7i: 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 c8fd1584
Show whitespace changes
Inline Side-by-side
Showing with 236 additions and 236 deletions
arch/arm/boot/dts/sun7i-a20-bananapi-m1-plus.dts
View file @ 85a8c520
...@@ -128,7 +128,7 @@ &ehci1 { ...@@ -128,7 +128,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -151,7 +151,7 @@ hdmi_out_con: endpoint { ...@@ -151,7 +151,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -169,13 +169,13 @@ &ac_power_supply { ...@@ -169,13 +169,13 @@ &ac_power_supply {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -186,7 +186,7 @@ &mmc3 { ...@@ -186,7 +186,7 @@ &mmc3 {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -203,7 +203,7 @@ brcmf: wifi@1 { ...@@ -203,7 +203,7 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a { &mmc3_pins {
/* AP6210 requires pull-up */ /* AP6210 requires pull-up */
bias-pull-up; bias-pull-up;
}; };
...@@ -251,7 +251,7 @@ &reg_usb0_vbus { ...@@ -251,7 +251,7 @@ &reg_usb0_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-bananapi.dts
View file @ 85a8c520
...@@ -130,7 +130,7 @@ &ehci1 { ...@@ -130,7 +130,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -153,7 +153,7 @@ hdmi_out_con: endpoint { ...@@ -153,7 +153,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -165,19 +165,19 @@ axp209: pmic@34 { ...@@ -165,19 +165,19 @@ axp209: pmic@34 {
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -296,27 +296,27 @@ &reg_usb2_vbus { ...@@ -296,27 +296,27 @@ &reg_usb2_vbus {
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_b>; pinctrl-0 = <&uart3_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-bananapro.dts
View file @ 85a8c520
...@@ -108,7 +108,7 @@ &ehci1 { ...@@ -108,7 +108,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -121,7 +121,7 @@ phy1: ethernet-phy@1 { ...@@ -121,7 +121,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -137,19 +137,19 @@ axp209: pmic@34 { ...@@ -137,19 +137,19 @@ axp209: pmic@34 {
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -158,7 +158,7 @@ &mmc0 { ...@@ -158,7 +158,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&wifi_pwrseq>; mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -194,27 +194,27 @@ &reg_usb2_vbus { ...@@ -194,27 +194,27 @@ &reg_usb2_vbus {
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_b>; pinctrl-0 = <&uart4_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
View file @ 85a8c520
...@@ -114,7 +114,7 @@ &ehci1 { ...@@ -114,7 +114,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -136,7 +136,7 @@ hdmi_out_con: endpoint { ...@@ -136,7 +136,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -148,19 +148,19 @@ axp209: pmic@34 { ...@@ -148,19 +148,19 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -232,7 +232,7 @@ &reg_usb2_vbus { ...@@ -232,7 +232,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-cubietruck.dts
View file @ 85a8c520
...@@ -147,7 +147,7 @@ &ehci1 { ...@@ -147,7 +147,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -169,7 +169,7 @@ hdmi_out_con: endpoint { ...@@ -169,7 +169,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -181,25 +181,25 @@ axp209: pmic@34 { ...@@ -181,25 +181,25 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -208,7 +208,7 @@ &mmc0 { ...@@ -208,7 +208,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -224,7 +224,7 @@ brcmf: wifi@1 { ...@@ -224,7 +224,7 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a { &mmc3_pins {
/* AP6210 requires pull-up */ /* AP6210 requires pull-up */
bias-pull-up; bias-pull-up;
}; };
...@@ -243,7 +243,7 @@ &otg_sram { ...@@ -243,7 +243,7 @@ &otg_sram {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>, <&pwm1_pins_a>; pinctrl-0 = <&pwm0_pin>, <&pwm1_pin>;
status = "okay"; status = "okay";
}; };
...@@ -302,13 +302,13 @@ &reg_usb2_vbus { ...@@ -302,13 +302,13 @@ &reg_usb2_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_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-hummingbird.dts
View file @ 85a8c520
...@@ -99,7 +99,7 @@ &ehci1 { ...@@ -99,7 +99,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_vdd>; phy-supply = <&reg_gmac_vdd>;
...@@ -117,7 +117,7 @@ phy1: ethernet-phy@1 { ...@@ -117,7 +117,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -132,31 +132,31 @@ axp209: pmic@34 { ...@@ -132,31 +132,31 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&i2c3 { &i2c3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c3_pins_a>; pinctrl-0 = <&i2c3_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -165,7 +165,7 @@ &mmc0 { ...@@ -165,7 +165,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_mmc3_vdd>; vmmc-supply = <&reg_mmc3_vdd>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -182,7 +182,7 @@ &ohci1 { ...@@ -182,7 +182,7 @@ &ohci1 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
...@@ -202,38 +202,38 @@ &reg_usb2_vbus { ...@@ -202,38 +202,38 @@ &reg_usb2_vbus {
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_b>, pinctrl-0 = <&spi2_pb_pins>,
<&spi2_cs0_pins_b>; <&spi2_cs0_pb_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>; pinctrl-0 = <&uart2_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>; pinctrl-0 = <&uart3_pg_pins>;
status = "okay"; status = "okay";
}; };
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pg_pins>;
status = "okay"; status = "okay";
}; };
&uart5 { &uart5 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart5_pins_a>; pinctrl-0 = <&uart5_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-i12-tvbox.dts
View file @ 85a8c520
...@@ -114,7 +114,7 @@ &ehci1 { ...@@ -114,7 +114,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -127,7 +127,7 @@ phy1: ethernet-phy@1 { ...@@ -127,7 +127,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,13 +143,13 @@ axp209: pmic@34 { ...@@ -143,13 +143,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -158,7 +158,7 @@ &mmc0 { ...@@ -158,7 +158,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vmmc3>; vmmc-supply = <&reg_vmmc3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -173,7 +173,7 @@ brcmf: wifi@1 { ...@@ -173,7 +173,7 @@ brcmf: wifi@1 {
}; };
}; };
&mmc3_pins_a { &mmc3_pins {
/* AP6210 / AP6330 requires pull-up */ /* AP6210 / AP6330 requires pull-up */
bias-pull-up; bias-pull-up;
}; };
...@@ -196,7 +196,7 @@ &reg_usb2_vbus { ...@@ -196,7 +196,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-icnova-swac.dts
View file @ 85a8c520
...@@ -74,7 +74,7 @@ &ehci1 { ...@@ -74,7 +74,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -86,7 +86,7 @@ phy1: ethernet-phy@1 { ...@@ -86,7 +86,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -98,13 +98,13 @@ axp209: pmic@34 { ...@@ -98,13 +98,13 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */ cd-gpios = <&pio 8 5 GPIO_ACTIVE_LOW>; /* PI5 */
...@@ -156,7 +156,7 @@ &reg_usb2_vbus { ...@@ -156,7 +156,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-itead-ibox.dts
View file @ 85a8c520
...@@ -96,7 +96,7 @@ &codec { ...@@ -96,7 +96,7 @@ &codec {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -115,13 +115,13 @@ axp209: pmic@34 { ...@@ -115,13 +115,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -142,6 +142,6 @@ &reg_ahci_5v { ...@@ -142,6 +142,6 @@ &reg_ahci_5v {
&spdif { &spdif {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>; pinctrl-0 = <&spdif_tx_pin>;
status = "okay"; status = "okay";
}; };
arch/arm/boot/dts/sun7i-a20-lamobo-r1.dts
View file @ 85a8c520
...@@ -119,7 +119,7 @@ &ehci1 { ...@@ -119,7 +119,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
status = "okay"; status = "okay";
...@@ -196,7 +196,7 @@ hdmi_out_con: endpoint { ...@@ -196,7 +196,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -208,19 +208,19 @@ axp209: pmic@34 { ...@@ -208,19 +208,19 @@ axp209: pmic@34 {
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -294,27 +294,27 @@ &reg_usb2_vbus { ...@@ -294,27 +294,27 @@ &reg_usb2_vbus {
&spi0 { &spi0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>, pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pins_a>, <&spi0_cs0_pi_pin>,
<&spi0_cs1_pins_a>; <&spi0_cs1_pi_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart3 { &uart3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_b>; pinctrl-0 = <&uart3_ph_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-m3.dts
View file @ 85a8c520
...@@ -81,7 +81,7 @@ &ehci1 { ...@@ -81,7 +81,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -93,7 +93,7 @@ phy1: ethernet-phy@1 { ...@@ -93,7 +93,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -109,13 +109,13 @@ axp209: pmic@34 { ...@@ -109,13 +109,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -124,7 +124,7 @@ &mmc0 { ...@@ -124,7 +124,7 @@ &mmc0 {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
...@@ -149,7 +149,7 @@ &reg_usb2_vbus { ...@@ -149,7 +149,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-mk808c.dts
View file @ 85a8c520
...@@ -107,7 +107,7 @@ hdmi_out_con: endpoint { ...@@ -107,7 +107,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -122,19 +122,19 @@ axp209: pmic@34 { ...@@ -122,19 +122,19 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>; vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -167,13 +167,13 @@ &reg_usb2_vbus { ...@@ -167,13 +167,13 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart2 { &uart2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>; pinctrl-0 = <&uart2_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb-emmc.dts
View file @ 85a8c520
...@@ -22,7 +22,7 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -22,7 +22,7 @@ mmc2_pwrseq: mmc2_pwrseq {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som-evb.dts
View file @ 85a8c520
...@@ -110,7 +110,7 @@ &codec { ...@@ -110,7 +110,7 @@ &codec {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -132,7 +132,7 @@ hdmi_out_con: endpoint { ...@@ -132,7 +132,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -144,13 +144,13 @@ axp209: pmic@34 { ...@@ -144,13 +144,13 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -210,7 +210,7 @@ button-1400 { ...@@ -210,7 +210,7 @@ button-1400 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -219,7 +219,7 @@ &mmc0 { ...@@ -219,7 +219,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */ cd-gpios = <&pio 7 0 GPIO_ACTIVE_LOW>; /* PH0 */
...@@ -292,33 +292,33 @@ &reg_usb2_vbus { ...@@ -292,33 +292,33 @@ &reg_usb2_vbus {
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart6 { &uart6 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart6_pins_a>; pinctrl-0 = <&uart6_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb-emmc.dts
View file @ 85a8c520
...@@ -21,7 +21,7 @@ mmc2_pwrseq: mmc2_pwrseq { ...@@ -21,7 +21,7 @@ mmc2_pwrseq: mmc2_pwrseq {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc2_pwrseq>; mmc-pwrseq = <&mmc2_pwrseq>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olimex-som204-evb.dts
View file @ 85a8c520
...@@ -78,7 +78,7 @@ &ahci { ...@@ -78,7 +78,7 @@ &ahci {
&can0 { &can0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&can0_pins_a>; pinctrl-0 = <&can_ph_pins>;
status = "okay"; status = "okay";
}; };
...@@ -104,7 +104,7 @@ &ehci1 { ...@@ -104,7 +104,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy3>; phy = <&phy3>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_vcc3v3>; phy-supply = <&reg_vcc3v3>;
...@@ -131,7 +131,7 @@ hdmi_out_con: endpoint { ...@@ -131,7 +131,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -144,7 +144,7 @@ axp209: pmic@34 { ...@@ -144,7 +144,7 @@ axp209: pmic@34 {
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -157,19 +157,19 @@ eeprom: eeprom@50 { ...@@ -157,19 +157,19 @@ eeprom: eeprom@50 {
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>;
...@@ -178,7 +178,7 @@ &mmc0 { ...@@ -178,7 +178,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&rtl_pwrseq>; mmc-pwrseq = <&rtl_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -274,22 +274,22 @@ &reg_usb2_vbus { ...@@ -274,22 +274,22 @@ &reg_usb2_vbus {
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
...@@ -303,14 +303,14 @@ &uart3 { ...@@ -303,14 +303,14 @@ &uart3 {
/* Exposed to UEXT1 */ /* Exposed to UEXT1 */
&uart4 { &uart4 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4_pins_a>; pinctrl-0 = <&uart4_pg_pins>;
status = "okay"; status = "okay";
}; };
/* Exposed to UEXT2 */ /* Exposed to UEXT2 */
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime.dts
View file @ 85a8c520
...@@ -105,7 +105,7 @@ &ehci1 { ...@@ -105,7 +105,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -127,7 +127,7 @@ hdmi_out_con: endpoint { ...@@ -127,7 +127,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -143,7 +143,7 @@ axp209: pmic@34 { ...@@ -143,7 +143,7 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -155,7 +155,7 @@ eeprom: eeprom@50 { ...@@ -155,7 +155,7 @@ eeprom: eeprom@50 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -213,7 +213,7 @@ &reg_usb2_vbus { ...@@ -213,7 +213,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2-emmc.dts
View file @ 85a8c520
...@@ -55,7 +55,7 @@ mmc2_pwrseq: pwrseq { ...@@ -55,7 +55,7 @@ mmc2_pwrseq: pwrseq {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
vqmmc-supply = <&reg_vcc3v3>; vqmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts
View file @ 85a8c520
...@@ -110,7 +110,7 @@ &ehci1 { ...@@ -110,7 +110,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -132,7 +132,7 @@ hdmi_out_con: endpoint { ...@@ -132,7 +132,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -144,7 +144,7 @@ axp209: pmic@34 { ...@@ -144,7 +144,7 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -160,7 +160,7 @@ &lradc { ...@@ -160,7 +160,7 @@ &lradc {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -261,7 +261,7 @@ &reg_usb2_vbus { ...@@ -261,7 +261,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro-emmc.dts
View file @ 85a8c520
...@@ -55,7 +55,7 @@ mmc2_pwrseq: pwrseq { ...@@ -55,7 +55,7 @@ mmc2_pwrseq: pwrseq {
&mmc2 { &mmc2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>; pinctrl-0 = <&mmc2_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
non-removable; non-removable;
......
arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
View file @ 85a8c520
...@@ -117,7 +117,7 @@ &ehci1 { ...@@ -117,7 +117,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>, <&gmac_txerr>; pinctrl-0 = <&gmac_mii_pins>, <&gmac_txerr>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -139,7 +139,7 @@ hdmi_out_con: endpoint { ...@@ -139,7 +139,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -151,7 +151,7 @@ axp209: pmic@34 { ...@@ -151,7 +151,7 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
eeprom: eeprom@50 { eeprom: eeprom@50 {
...@@ -163,7 +163,7 @@ eeprom: eeprom@50 { ...@@ -163,7 +163,7 @@ eeprom: eeprom@50 {
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -223,7 +223,7 @@ button-1398 { ...@@ -223,7 +223,7 @@ button-1398 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -232,7 +232,7 @@ &mmc0 { ...@@ -232,7 +232,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -325,33 +325,33 @@ &reg_usb2_vbus { ...@@ -325,33 +325,33 @@ &reg_usb2_vbus {
&spi1 { &spi1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi1_pins_a>, pinctrl-0 = <&spi1_pi_pins>,
<&spi1_cs0_pins_a>; <&spi1_cs0_pi_pin>;
status = "okay"; status = "okay";
}; };
&spi2 { &spi2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>, pinctrl-0 = <&spi2_pc_pins>,
<&spi2_cs0_pins_a>; <&spi2_cs0_pc_pin>;
status = "okay"; status = "okay";
}; };
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
&uart6 { &uart6 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart6_pins_a>; pinctrl-0 = <&uart6_pi_pins>;
status = "okay"; status = "okay";
}; };
&uart7 { &uart7 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7_pins_a>; pinctrl-0 = <&uart7_pi_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi-mini.dts
View file @ 85a8c520
...@@ -119,7 +119,7 @@ &ehci1 { ...@@ -119,7 +119,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -142,7 +142,7 @@ hdmi_out_con: endpoint { ...@@ -142,7 +142,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -156,13 +156,13 @@ axp209: pmic@34 { ...@@ -156,13 +156,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -171,7 +171,7 @@ &mmc0 { ...@@ -171,7 +171,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */ cd-gpios = <&pio 7 11 GPIO_ACTIVE_LOW>; /* PH11 */
...@@ -231,7 +231,7 @@ &reg_usb2_vbus { ...@@ -231,7 +231,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-orangepi.dts
View file @ 85a8c520
...@@ -95,7 +95,7 @@ &ehci1 { ...@@ -95,7 +95,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
phy-supply = <&reg_gmac_3v3>; phy-supply = <&reg_gmac_3v3>;
...@@ -108,7 +108,7 @@ phy1: ethernet-phy@1 { ...@@ -108,7 +108,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -122,13 +122,13 @@ axp209: pmic@34 { ...@@ -122,13 +122,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */ cd-gpios = <&pio 7 10 GPIO_ACTIVE_LOW>; /* PH10 */
...@@ -188,7 +188,7 @@ &reg_usb2_vbus { ...@@ -188,7 +188,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-pcduino3-nano.dts
View file @ 85a8c520
...@@ -113,7 +113,7 @@ &ehci1 { ...@@ -113,7 +113,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -135,7 +135,7 @@ hdmi_out_con: endpoint { ...@@ -135,7 +135,7 @@ hdmi_out_con: endpoint {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -147,13 +147,13 @@ axp209: pmic@34 { ...@@ -147,13 +147,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -220,7 +220,7 @@ &reg_usb1_vbus { ...@@ -220,7 +220,7 @@ &reg_usb1_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-pcduino3.dts
View file @ 85a8c520
...@@ -121,7 +121,7 @@ &ehci1 { ...@@ -121,7 +121,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_mii_a>; pinctrl-0 = <&gmac_mii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "mii"; phy-mode = "mii";
status = "okay"; status = "okay";
...@@ -133,7 +133,7 @@ phy1: ethernet-phy@1 { ...@@ -133,7 +133,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -147,13 +147,13 @@ axp209: pmic@34 { ...@@ -147,13 +147,13 @@ axp209: pmic@34 {
&ir0 { &ir0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>; pinctrl-0 = <&ir0_rx_pin>;
status = "okay"; status = "okay";
}; };
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -220,7 +220,7 @@ &reg_usb2_vbus { ...@@ -220,7 +220,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-wexler-tab7200.dts
View file @ 85a8c520
...@@ -90,7 +90,7 @@ &ehci1 { ...@@ -90,7 +90,7 @@ &ehci1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -104,13 +104,13 @@ axp209: pmic@34 { ...@@ -104,13 +104,13 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
gt911: touchscreen@5d { gt911: touchscreen@5d {
...@@ -145,7 +145,7 @@ button-761 { ...@@ -145,7 +145,7 @@ button-761 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -174,7 +174,7 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 { ...@@ -174,7 +174,7 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
&pwm { &pwm {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>; pinctrl-0 = <&pwm0_pin>;
status = "okay"; status = "okay";
}; };
...@@ -217,7 +217,7 @@ &reg_usb2_vbus { ...@@ -217,7 +217,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20-wits-pro-a20-dkt.dts
View file @ 85a8c520
...@@ -80,7 +80,7 @@ &ehci1 { ...@@ -80,7 +80,7 @@ &ehci1 {
&gmac { &gmac {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac_pins_rgmii_a>; pinctrl-0 = <&gmac_rgmii_pins>;
phy = <&phy1>; phy = <&phy1>;
phy-mode = "rgmii"; phy-mode = "rgmii";
status = "okay"; status = "okay";
...@@ -92,7 +92,7 @@ phy1: ethernet-phy@1 { ...@@ -92,7 +92,7 @@ phy1: ethernet-phy@1 {
&i2c0 { &i2c0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>; pinctrl-0 = <&i2c0_pins>;
status = "okay"; status = "okay";
axp209: pmic@34 { axp209: pmic@34 {
...@@ -104,13 +104,13 @@ axp209: pmic@34 { ...@@ -104,13 +104,13 @@ axp209: pmic@34 {
&i2c1 { &i2c1 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>; pinctrl-0 = <&i2c1_pins>;
status = "okay"; status = "okay";
}; };
&i2c2 { &i2c2 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>; pinctrl-0 = <&i2c2_pins>;
status = "okay"; status = "okay";
}; };
...@@ -118,7 +118,7 @@ &i2c2 { ...@@ -118,7 +118,7 @@ &i2c2 {
&mmc0 { &mmc0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>; pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>; bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */ cd-gpios = <&pio 7 1 GPIO_ACTIVE_LOW>; /* PH1 */
...@@ -127,7 +127,7 @@ &mmc0 { ...@@ -127,7 +127,7 @@ &mmc0 {
&mmc3 { &mmc3 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&mmc3_pins_a>; pinctrl-0 = <&mmc3_pins>;
vmmc-supply = <&reg_vcc3v3>; vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc3_pwrseq>; mmc-pwrseq = <&mmc3_pwrseq>;
bus-width = <4>; bus-width = <4>;
...@@ -202,7 +202,7 @@ &reg_usb2_vbus { ...@@ -202,7 +202,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };
......
arch/arm/boot/dts/sun7i-a20.dtsi
View file @ 85a8c520
...@@ -747,22 +747,22 @@ pio: pinctrl@1c20800 { ...@@ -747,22 +747,22 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
can0_pins_a: can0@0 { can_ph_pins: can-ph-pins {
pins = "PH20", "PH21"; pins = "PH20", "PH21";
function = "can"; function = "can";
}; };
clk_out_a_pins_a: clk_out_a@0 { clk_out_a_pin: clk-out-a-pin {
pins = "PI12"; pins = "PI12";
function = "clk_out_a"; function = "clk_out_a";
}; };
clk_out_b_pins_a: clk_out_b@0 { clk_out_b_pin: clk-out-b-pin {
pins = "PI13"; pins = "PI13";
function = "clk_out_b"; function = "clk_out_b";
}; };
emac_pins_a: emac0@0 { emac_pa_pins: emac-pa-pins {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10", "PA7", "PA8", "PA9", "PA10",
...@@ -771,7 +771,7 @@ emac_pins_a: emac0@0 { ...@@ -771,7 +771,7 @@ emac_pins_a: emac0@0 {
function = "emac"; function = "emac";
}; };
gmac_pins_mii_a: gmac_mii@0 { gmac_mii_pins: gmac-mii-pins {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10", "PA7", "PA8", "PA9", "PA10",
...@@ -780,7 +780,7 @@ gmac_pins_mii_a: gmac_mii@0 { ...@@ -780,7 +780,7 @@ gmac_pins_mii_a: gmac_mii@0 {
function = "gmac"; function = "gmac";
}; };
gmac_pins_rgmii_a: gmac_rgmii@0 { gmac_rgmii_pins: gmac-rgmii-pins {
pins = "PA0", "PA1", "PA2", pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6", "PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA10", "PA7", "PA8", "PA10",
...@@ -794,47 +794,47 @@ gmac_pins_rgmii_a: gmac_rgmii@0 { ...@@ -794,47 +794,47 @@ gmac_pins_rgmii_a: gmac_rgmii@0 {
drive-strength = <40>; drive-strength = <40>;
}; };
i2c0_pins_a: i2c0@0 { i2c0_pins: i2c0-pins {
pins = "PB0", "PB1"; pins = "PB0", "PB1";
function = "i2c0"; function = "i2c0";
}; };
i2c1_pins_a: i2c1@0 { i2c1_pins: i2c1-pins {
pins = "PB18", "PB19"; pins = "PB18", "PB19";
function = "i2c1"; function = "i2c1";
}; };
i2c2_pins_a: i2c2@0 { i2c2_pins: i2c2-pins {
pins = "PB20", "PB21"; pins = "PB20", "PB21";
function = "i2c2"; function = "i2c2";
}; };
i2c3_pins_a: i2c3@0 { i2c3_pins: i2c3-pins {
pins = "PI0", "PI1"; pins = "PI0", "PI1";
function = "i2c3"; function = "i2c3";
}; };
ir0_rx_pins_a: ir0@0 { ir0_rx_pin: ir0-rx-pin {
pins = "PB4"; pins = "PB4";
function = "ir0"; function = "ir0";
}; };
ir0_tx_pins_a: ir0@1 { ir0_tx_pin: ir0-tx-pin {
pins = "PB3"; pins = "PB3";
function = "ir0"; function = "ir0";
}; };
ir1_rx_pins_a: ir1@0 { ir1_rx_pin: ir1-rx-pin {
pins = "PB23"; pins = "PB23";
function = "ir1"; function = "ir1";
}; };
ir1_tx_pins_a: ir1@1 { ir1_tx_pin: ir1-tx-pin {
pins = "PB22"; pins = "PB22";
function = "ir1"; function = "ir1";
}; };
mmc0_pins_a: mmc0@0 { mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5"; "PF3", "PF4", "PF5";
function = "mmc0"; function = "mmc0";
...@@ -842,7 +842,7 @@ mmc0_pins_a: mmc0@0 { ...@@ -842,7 +842,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up; bias-pull-up;
}; };
mmc2_pins_a: mmc2@0 { mmc2_pins: mmc2-pins {
pins = "PC6", "PC7", "PC8", pins = "PC6", "PC7", "PC8",
"PC9", "PC10", "PC11"; "PC9", "PC10", "PC11";
function = "mmc2"; function = "mmc2";
...@@ -850,7 +850,7 @@ mmc2_pins_a: mmc2@0 { ...@@ -850,7 +850,7 @@ mmc2_pins_a: mmc2@0 {
bias-pull-up; bias-pull-up;
}; };
mmc3_pins_a: mmc3@0 { mmc3_pins: mmc3-pins {
pins = "PI4", "PI5", "PI6", pins = "PI4", "PI5", "PI6",
"PI7", "PI8", "PI9"; "PI7", "PI8", "PI9";
function = "mmc3"; function = "mmc3";
...@@ -858,118 +858,118 @@ mmc3_pins_a: mmc3@0 { ...@@ -858,118 +858,118 @@ mmc3_pins_a: mmc3@0 {
bias-pull-up; bias-pull-up;
}; };
ps20_pins_a: ps20@0 { ps2_0_pins: ps2-0-pins {
pins = "PI20", "PI21"; pins = "PI20", "PI21";
function = "ps2"; function = "ps2";
}; };
ps21_pins_a: ps21@0 { ps2_1_ph_pins: ps2-1-ph-pins {
pins = "PH12", "PH13"; pins = "PH12", "PH13";
function = "ps2"; function = "ps2";
}; };
pwm0_pins_a: pwm0@0 { pwm0_pin: pwm0-pin {
pins = "PB2"; pins = "PB2";
function = "pwm"; function = "pwm";
}; };
pwm1_pins_a: pwm1@0 { pwm1_pin: pwm1-pin {
pins = "PI3"; pins = "PI3";
function = "pwm"; function = "pwm";
}; };
spdif_tx_pins_a: spdif@0 { spdif_tx_pin: spdif-tx-pin {
pins = "PB13"; pins = "PB13";
function = "spdif"; function = "spdif";
bias-pull-up; bias-pull-up;
}; };
spi0_pins_a: spi0@0 { spi0_pi_pins: spi0-pi-pins {
pins = "PI11", "PI12", "PI13"; pins = "PI11", "PI12", "PI13";
function = "spi0"; function = "spi0";
}; };
spi0_cs0_pins_a: spi0_cs0@0 { spi0_cs0_pi_pin: spi0-cs0-pi-pin {
pins = "PI10"; pins = "PI10";
function = "spi0"; function = "spi0";
}; };
spi0_cs1_pins_a: spi0_cs1@0 { spi0_cs1_pi_pin: spi0-cs1-pi-pin {
pins = "PI14"; pins = "PI14";
function = "spi0"; function = "spi0";
}; };
spi1_pins_a: spi1@0 { spi1_pi_pins: spi1-pi-pins {
pins = "PI17", "PI18", "PI19"; pins = "PI17", "PI18", "PI19";
function = "spi1"; function = "spi1";
}; };
spi1_cs0_pins_a: spi1_cs0@0 { spi1_cs0_pi_pin: spi1-cs0-pi-pin {
pins = "PI16"; pins = "PI16";
function = "spi1"; function = "spi1";
}; };
spi2_pins_a: spi2@0 { spi2_pb_pins: spi2-pb-pins {
pins = "PC20", "PC21", "PC22"; pins = "PB15", "PB16", "PB17";
function = "spi2"; function = "spi2";
}; };
spi2_pins_b: spi2@1 { spi2_cs0_pb_pin: spi2-cs0-pb-pin {
pins = "PB15", "PB16", "PB17"; pins = "PB14";
function = "spi2"; function = "spi2";
}; };
spi2_cs0_pins_a: spi2_cs0@0 { spi2_pc_pins: spi2-pc-pins {
pins = "PC19"; pins = "PC20", "PC21", "PC22";
function = "spi2"; function = "spi2";
}; };
spi2_cs0_pins_b: spi2_cs0@1 { spi2_cs0_pc_pin: spi2-cs0-pc-pin {
pins = "PB14"; pins = "PC19";
function = "spi2"; function = "spi2";
}; };
uart0_pins_a: uart0@0 { uart0_pb_pins: uart0-pb-pins {
pins = "PB22", "PB23"; pins = "PB22", "PB23";
function = "uart0"; function = "uart0";
}; };
uart2_pins_a: uart2@0 { uart2_pi_pins: uart2-pi-pins {
pins = "PI16", "PI17", "PI18", "PI19"; pins = "PI16", "PI17", "PI18", "PI19";
function = "uart2"; function = "uart2";
}; };
uart3_pins_a: uart3@0 { uart3_pg_pins: uart3-pg-pins {
pins = "PG6", "PG7", "PG8", "PG9"; pins = "PG6", "PG7", "PG8", "PG9";
function = "uart3"; function = "uart3";
}; };
uart3_pins_b: uart3@1 { uart3_ph_pins: uart3-ph-pins {
pins = "PH0", "PH1"; pins = "PH0", "PH1";
function = "uart3"; function = "uart3";
}; };
uart4_pins_a: uart4@0 { uart4_pg_pins: uart4-pg-pins {
pins = "PG10", "PG11"; pins = "PG10", "PG11";
function = "uart4"; function = "uart4";
}; };
uart4_pins_b: uart4@1 { uart4_ph_pins: uart4-ph-pins {
pins = "PH4", "PH5"; pins = "PH4", "PH5";
function = "uart4"; function = "uart4";
}; };
uart5_pins_a: uart5@0 { uart5_pi_pins: uart5-pi-pins {
pins = "PI10", "PI11"; pins = "PI10", "PI11";
function = "uart5"; function = "uart5";
}; };
uart6_pins_a: uart6@0 { uart6_pi_pins: uart6-pi-pins {
pins = "PI12", "PI13"; pins = "PI12", "PI13";
function = "uart6"; function = "uart6";
}; };
uart7_pins_a: uart7@0 { uart7_pi_pins: uart7-pi-pins {
pins = "PI20", "PI21"; pins = "PI20", "PI21";
function = "uart7"; function = "uart7";
}; };
......
arch/arm/boot/dts/sunxi-itead-core-common.dtsi
View file @ 85a8c520
...@@ -121,7 +121,7 @@ &reg_usb2_vbus { ...@@ -121,7 +121,7 @@ &reg_usb2_vbus {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>; pinctrl-0 = <&uart0_pb_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