Skip to content

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

ARM: dts: sun4i: 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@free-electrons.com>
parent 8b1447ae
Hide whitespace changes
Inline Side-by-side
Showing with 139 additions and 132 deletions
arch/arm/boot/dts/sun4i-a10-a1000.dts
View file @ e53bd761
......@@ -126,7 +126,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -137,7 +137,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -152,7 +152,7 @@ axp209: pmic@34 {
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -167,7 +167,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -220,13 +220,13 @@ &reg_usb2_vbus {
&spdif {
pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>;
pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-ba10-tvbox.dts
View file @ e53bd761
......@@ -69,7 +69,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -80,7 +80,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -95,7 +95,7 @@ axp209: pmic@34 {
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -109,7 +109,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -141,7 +141,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-chuwi-v7-cw0825.dts
View file @ e53bd761
......@@ -66,7 +66,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -81,13 +81,13 @@ axp209: pmic@34 {
&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";
ft5306de4: touchscreen@38 {
......@@ -128,7 +128,7 @@ button-1200 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -164,7 +164,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-cubieboard.dts
View file @ e53bd761
......@@ -100,7 +100,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -111,7 +111,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -122,13 +122,13 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -142,7 +142,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -221,14 +221,14 @@ &reg_usb2_vbus {
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>,
<&spi0_cs0_pins_a>;
pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-dserve-dsrv9703c.dts
View file @ e53bd761
......@@ -100,7 +100,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -113,14 +113,14 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
/* pull-ups and devices require AXP209 LDO3 */
status = "failed";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5406ee8: touchscreen@38 {
......@@ -155,7 +155,7 @@ button-800 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -183,7 +183,7 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>;
pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
......@@ -222,7 +222,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-gemei-g9.dts
View file @ e53bd761
......@@ -90,7 +90,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -103,7 +103,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
......@@ -144,7 +144,7 @@ button-1142 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH01 */
......@@ -188,7 +188,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-hackberry.dts
View file @ e53bd761
......@@ -81,7 +81,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy0>;
status = "okay";
};
......@@ -92,7 +92,7 @@ &emac_sram {
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -107,7 +107,7 @@ phy0: ethernet-phy@0 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -140,6 +140,6 @@ &usbphy {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
arch/arm/boot/dts/sun4i-a10-hyundai-a7hd.dts
View file @ e53bd761
......@@ -64,7 +64,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -79,7 +79,7 @@ axp209: pmic@34 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -116,7 +116,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-inet1.dts
View file @ e53bd761
......@@ -87,7 +87,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -100,7 +100,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
......@@ -114,7 +114,7 @@ bma250@18 {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5x: touchscreen@38 {
......@@ -157,7 +157,7 @@ button-1200 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -189,7 +189,7 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>;
pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
......@@ -232,7 +232,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-inet97fv2.dts
View file @ e53bd761
......@@ -73,7 +73,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -86,13 +86,13 @@ axp209: pmic@34 {
&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";
ft5406ee8: touchscreen@38 {
......@@ -147,7 +147,7 @@ button-1200 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -208,7 +208,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-inet9f-rev03.dts
View file @ e53bd761
......@@ -223,7 +223,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -236,7 +236,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/* Accelerometer */
......@@ -250,7 +250,7 @@ bma250@18 {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
ft5406ee8: touchscreen@38 {
......@@ -305,7 +305,7 @@ button-1200 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -376,7 +376,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-itead-iteaduino-plus.dts
View file @ e53bd761
......@@ -57,7 +57,7 @@ &ahci {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -67,6 +67,9 @@ &emac_sram {
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins>;
axp209: pmic@34 {
interrupts = <0>;
};
......@@ -74,19 +77,19 @@ axp209: pmic@34 {
&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";
};
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -100,7 +103,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -114,7 +117,11 @@ &reg_ahci_5v {
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>,
<&spi0_cs0_pins_a>;
pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-0 = <&uart0_pb_pins>;
};
arch/arm/boot/dts/sun4i-a10-jesurun-q5.dts
View file @ e53bd761
......@@ -95,7 +95,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -106,7 +106,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -121,7 +121,7 @@ axp209: pmic@34 {
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
......@@ -136,7 +136,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -171,7 +171,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-marsboard.dts
View file @ e53bd761
......@@ -106,26 +106,26 @@ &emac_sram {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
};
&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";
};
......@@ -139,7 +139,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -177,14 +177,14 @@ &reg_usb2_vbus {
&spi0 {
pinctrl-names = "default";
pinctrl-0 = <&spi0_pins_a>,
<&spi0_cs0_pins_a>;
pinctrl-0 = <&spi0_pi_pins>,
<&spi0_cs0_pi_pin>;
status = "okay";
};
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
View file @ e53bd761
......@@ -71,7 +71,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -86,18 +86,18 @@ axp209: pmic@34 {
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
&ir0_rx_pins_a {
&ir0_rx_pins {
/* The ir receiver is not always populated */
bias-pull-up;
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -132,7 +132,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-mk802.dts
View file @ e53bd761
......@@ -72,7 +72,7 @@ &ehci1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -103,7 +103,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-mk802ii.dts
View file @ e53bd761
......@@ -68,7 +68,7 @@ &ehci1 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -83,7 +83,7 @@ axp209: pmic@34 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -105,7 +105,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-olinuxino-lime.dts
View file @ e53bd761
......@@ -99,7 +99,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -110,7 +110,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -125,7 +125,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
eeprom: eeprom@50 {
......@@ -145,7 +145,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -204,7 +204,7 @@ &reg_usb2_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-pcduino.dts
View file @ e53bd761
......@@ -113,7 +113,7 @@ &ehci1 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -124,7 +124,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -143,7 +143,7 @@ phy1: ethernet-phy@1 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -200,7 +200,7 @@ &reg_ldo2 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10-pov-protab2-ips9.dts
View file @ e53bd761
......@@ -84,7 +84,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -97,14 +97,14 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
/* pull-ups and devices require AXP209 LDO3 */
status = "failed";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
pixcir_ts@5c {
......@@ -143,7 +143,7 @@ button-800 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 7 1 GPIO_ACTIVE_HIGH>; /* PH1 */
......@@ -171,7 +171,7 @@ usb0_vbus_detect_pin: usb0_vbus_detect_pin@0 {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins_a>;
pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
......@@ -210,7 +210,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun4i-a10.dtsi
View file @ e53bd761
......@@ -470,12 +470,12 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>;
#gpio-cells = <3>;
can0_pins_a: can0@0 {
can0_ph_pins: can0-ph-pins {
pins = "PH20", "PH21";
function = "can";
};
emac_pins_a: emac0@0 {
emac_pins: emac0-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
......@@ -484,42 +484,42 @@ emac_pins_a: emac0@0 {
function = "emac";
};
i2c0_pins_a: i2c0@0 {
i2c0_pins: i2c0-pins {
pins = "PB0", "PB1";
function = "i2c0";
};
i2c1_pins_a: i2c1@0 {
i2c1_pins: i2c1-pins {
pins = "PB18", "PB19";
function = "i2c1";
};
i2c2_pins_a: i2c2@0 {
i2c2_pins: i2c2-pins {
pins = "PB20", "PB21";
function = "i2c2";
};
ir0_rx_pins_a: ir0@0 {
ir0_rx_pins: ir0-rx-pin {
pins = "PB4";
function = "ir0";
};
ir0_tx_pins_a: ir0@1 {
ir0_tx_pins: ir0-tx-pin {
pins = "PB3";
function = "ir0";
};
ir1_rx_pins_a: ir1@0 {
ir1_rx_pins: ir1-rx-pin {
pins = "PB23";
function = "ir1";
};
ir1_tx_pins_a: ir1@1 {
ir1_tx_pins: ir1-tx-pin {
pins = "PB22";
function = "ir1";
};
mmc0_pins_a: mmc0@0 {
mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2",
"PF3", "PF4", "PF5";
function = "mmc0";
......@@ -527,83 +527,83 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up;
};
ps20_pins_a: ps20@0 {
ps2_ch0_pins: ps2-ch0-pins {
pins = "PI20", "PI21";
function = "ps2";
};
ps21_pins_a: ps21@0 {
ps2_ch1_ph_pins: ps2-ch1-ph-pins {
pins = "PH12", "PH13";
function = "ps2";
};
pwm0_pins_a: pwm0@0 {
pwm0_pin: pwm0-pin {
pins = "PB2";
function = "pwm";
};
pwm1_pins_a: pwm1@0 {
pwm1_pin: pwm1-pin {
pins = "PI3";
function = "pwm";
};
spdif_tx_pins_a: spdif@0 {
spdif_tx_pin: spdif-tx-pin {
pins = "PB13";
function = "spdif";
bias-pull-up;
};
spi0_pins_a: spi0@0 {
spi0_pi_pins: spi0-pi-pins {
pins = "PI11", "PI12", "PI13";
function = "spi0";
};
spi0_cs0_pins_a: spi0_cs0@0 {
spi0_cs0_pi_pin: spi0-cs0-pi-pin {
pins = "PI10";
function = "spi0";
};
spi1_pins_a: spi1@0 {
spi1_pins: spi1-pins {
pins = "PI17", "PI18", "PI19";
function = "spi1";
};
spi1_cs0_pins_a: spi1_cs0@0 {
spi1_cs0_pin: spi1-cs0-pin {
pins = "PI16";
function = "spi1";
};
spi2_pins_a: spi2@0 {
pins = "PC20", "PC21", "PC22";
spi2_pb_pins: spi2-pb-pins {
pins = "PB15", "PB16", "PB17";
function = "spi2";
};
spi2_pins_b: spi2@1 {
pins = "PB15", "PB16", "PB17";
spi2_pc_pins: spi2-pc-pins {
pins = "PC20", "PC21", "PC22";
function = "spi2";
};
spi2_cs0_pins_a: spi2_cs0@0 {
pins = "PC19";
spi2_cs0_pb_pin: spi2-cs0-pb-pin {
pins = "PB14";
function = "spi2";
};
spi2_cs0_pins_b: spi2_cs0@1 {
pins = "PB14";
spi2_cs0_pc_pins: spi2-cs0-pc-pin {
pins = "PC19";
function = "spi2";
};
uart0_pins_a: uart0@0 {
uart0_pb_pins: uart0-pb-pins {
pins = "PB22", "PB23";
function = "uart0";
};
uart0_pins_b: uart0@1 {
uart0_pf_pins: uart0-pf-pins {
pins = "PF2", "PF4";
function = "uart0";
};
uart1_pins_a: uart1@0 {
uart1_pins: uart1-pins {
pins = "PA10", "PA11";
function = "uart1";
};
......
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