Skip to content

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

ARM: dts: sun5i: 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 79badc74
Hide whitespace changes
Inline Side-by-side
Showing with 127 additions and 119 deletions
arch/arm/boot/dts/sun5i-a10s-auxtek-t003.dts
View file @ 6a9951a1
......@@ -76,7 +76,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -90,7 +90,7 @@ axp152: pmic@30 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
......@@ -125,7 +125,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s-auxtek-t004.dts
View file @ 6a9951a1
......@@ -85,7 +85,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -99,7 +99,7 @@ axp152: pmic@30 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
......@@ -108,7 +108,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vmmc1>;
bus-width = <4>;
non-removable;
......@@ -145,7 +145,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s-mk802.dts
View file @ 6a9951a1
......@@ -73,7 +73,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -87,7 +87,7 @@ axp152: pmic@30 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
......@@ -96,7 +96,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
non-removable;
......@@ -118,7 +118,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
View file @ 6a9951a1
......@@ -97,7 +97,7 @@ &ehci0 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_b>;
pinctrl-0 = <&emac_pa_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -118,7 +118,7 @@ hdmi_out_con: endpoint {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp152: pmic@30 {
......@@ -131,7 +131,7 @@ axp152: pmic@30 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
at24@50 {
......@@ -144,7 +144,7 @@ at24@50 {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -198,7 +198,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 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
......@@ -207,7 +207,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 13 GPIO_ACTIVE_LOW>; /* PG13 */
......@@ -248,8 +248,8 @@ &reg_usb1_vbus {
&spi2 {
pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_b>,
<&spi2_cs0_pins_b>;
pinctrl-0 = <&spi2_pb_pins>,
<&spi2_cs0_pb_pin>;
status = "okay";
};
......@@ -259,19 +259,19 @@ &tcon0 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_b>;
pinctrl-0 = <&uart2_pc_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>;
pinctrl-0 = <&uart3_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s-r7-tv-dongle.dts
View file @ 6a9951a1
......@@ -77,7 +77,7 @@ &ehci0 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 1 GPIO_ACTIVE_LOW>; /* PG1 */
......@@ -86,7 +86,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
non-removable;
......@@ -112,7 +112,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s-wobo-i5.dts
View file @ 6a9951a1
......@@ -90,7 +90,7 @@ &ehci0 {
&emac {
pinctrl-names = "default";
pinctrl-0 = <&emac_pins_a>;
pinctrl-0 = <&emac_pd_pins>;
phy = <&phy1>;
status = "okay";
};
......@@ -101,7 +101,7 @@ &emac_sram {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -123,7 +123,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 1 3 GPIO_ACTIVE_LOW>; /* PB3 */
......@@ -184,7 +184,7 @@ &reg_usb1_vbus {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a10s.dtsi
View file @ 6a9951a1
......@@ -124,17 +124,17 @@ &ccu {
&pio {
compatible = "allwinner,sun5i-a10s-pinctrl";
uart0_pins_a: uart0@0 {
uart0_pb_pins: uart0-pb-pins {
pins = "PB19", "PB20";
function = "uart0";
};
uart2_pins_b: uart2@1 {
uart2_pc_pins: uart2-pc-pins {
pins = "PC18", "PC19";
function = "uart2";
};
emac_pins_b: emac0@1 {
emac_pa_pins: emac-pa-pins {
pins = "PA0", "PA1", "PA2",
"PA3", "PA4", "PA5", "PA6",
"PA7", "PA8", "PA9", "PA10",
......@@ -143,19 +143,19 @@ emac_pins_b: emac0@1 {
function = "emac";
};
mmc1_pins_a: mmc1@0 {
mmc1_pins: mmc1-pins {
pins = "PG3", "PG4", "PG5",
"PG6", "PG7", "PG8";
function = "mmc1";
drive-strength = <30>;
};
spi2_pins_b: spi2@1 {
spi2_pb_pins: spi2-pb-pins {
pins = "PB12", "PB13", "PB14";
function = "spi2";
};
spi2_cs0_pins_b: spi2_cs0@1 {
spi2_cs0_pb_pin: spi2-cs0-pb-pin {
pins = "PB11";
function = "spi2";
};
......
arch/arm/boot/dts/sun5i-a13-empire-electronix-d709.dts
View file @ 6a9951a1
......@@ -79,7 +79,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -92,7 +92,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc@51 {
......@@ -122,7 +122,7 @@ button-400 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -149,7 +149,7 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>;
pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
......@@ -191,7 +191,7 @@ &reg_usb0_vbus {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a13-hsg-h702.dts
View file @ 6a9951a1
......@@ -70,7 +70,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -81,7 +81,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
pcf8563: rtc@51 {
......@@ -92,7 +92,7 @@ pcf8563: rtc@51 {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
......@@ -117,7 +117,7 @@ button-400 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -180,7 +180,7 @@ &reg_usb0_vbus {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a13-licheepi-one.dts
View file @ 6a9951a1
......@@ -95,7 +95,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -110,13 +110,13 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
......@@ -134,7 +134,7 @@ button-984 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
broken-cd;
......@@ -143,7 +143,7 @@ &mmc0 {
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_4bit_pins_a>;
pinctrl-0 = <&mmc2_4bit_pc_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
broken-cd;
......@@ -204,7 +204,7 @@ &reg_usb0_vbus {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a13-olinuxino-micro.dts
View file @ 6a9951a1
......@@ -78,25 +78,25 @@ &ehci0 {
&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";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -143,7 +143,7 @@ &reg_usb1_vbus {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a13-olinuxino.dts
View file @ 6a9951a1
......@@ -124,7 +124,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -139,13 +139,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";
};
......@@ -191,7 +191,7 @@ button-987 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -251,7 +251,7 @@ tcon0_out_vga: endpoint@0 {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-a13-utoo-p66.dts
View file @ 6a9951a1
......@@ -81,7 +81,7 @@ &codec {
&mmc2 {
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins_a>;
pinctrl-0 = <&mmc2_8bit_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <8>;
non-removable;
......
arch/arm/boot/dts/sun5i-gr8-chip-pro.dts
View file @ 6a9951a1
......@@ -93,7 +93,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -113,19 +113,19 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2s0 {
pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "disabled";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
......@@ -135,7 +135,7 @@ &mmc0 {
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
status = "okay";
nand@0 {
......@@ -157,7 +157,7 @@ &otg_sram {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>, <&pwm1_pins>;
pinctrl-0 = <&pwm0_pin>, <&pwm1_pins>;
status = "disabled";
};
......@@ -206,19 +206,19 @@ &reg_ldo4 {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay";
};
&uart2 {
pinctrl-names = "default";
pinctrl-0 = <&uart2_pins_a>, <&uart2_cts_rts_pins_a>;
pinctrl-0 = <&uart2_pd_pins>, <&uart2_cts_rts_pd_pins>;
status = "disabled";
};
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>, <&uart3_cts_rts_pins_a>;
pinctrl-0 = <&uart3_pg_pins>, <&uart3_cts_rts_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-gr8-evb.dts
View file @ 6a9951a1
......@@ -124,7 +124,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -144,7 +144,7 @@ axp209: pmic@34 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
wm8978: codec@1a {
......@@ -161,19 +161,19 @@ pcf8563: rtc@51 {
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
};
&i2s0 {
pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk_pins_a>, <&i2s0_data_pins_a>;
pinctrl-0 = <&i2s0_mclk_pin>, <&i2s0_data_pins>;
status = "okay";
};
&ir0 {
pinctrl-names = "default";
pinctrl-0 = <&ir0_rx_pins_a>;
pinctrl-0 = <&ir0_rx_pin>;
status = "okay";
};
......@@ -233,7 +233,7 @@ button-1400 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -242,7 +242,7 @@ &mmc0 {
&nfc {
pinctrl-names = "default";
pinctrl-0 = <&nand_pins_a &nand_cs0_pins_a &nand_rb0_pins_a>;
pinctrl-0 = <&nand_pins &nand_cs0_pin &nand_rb0_pin>;
/* MLC Support sucks for now */
status = "disabled";
......@@ -258,7 +258,7 @@ &otg_sram {
&pwm {
pinctrl-names = "default";
pinctrl-0 = <&pwm0_pins>;
pinctrl-0 = <&pwm0_pin>;
status = "okay";
};
......@@ -298,7 +298,7 @@ &rtp {
&spdif {
pinctrl-names = "default";
pinctrl-0 = <&spdif_tx_pins_a>;
pinctrl-0 = <&spdif_tx_pin>;
status = "okay";
};
......@@ -308,7 +308,7 @@ &tve0 {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>, <&uart1_cts_rts_pins_a>;
pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-gr8.dtsi
View file @ 6a9951a1
......@@ -98,28 +98,28 @@ &ccu {
&pio {
compatible = "nextthing,gr8-pinctrl";
i2s0_data_pins_a: i2s0-data@0 {
i2s0_data_pins: i2s0-data-pins {
pins = "PB6", "PB7", "PB8", "PB9";
function = "i2s0";
};
i2s0_mclk_pins_a: i2s0-mclk@0 {
i2s0_mclk_pin: i2s0-mclk-pin {
pins = "PB5";
function = "i2s0";
};
pwm1_pins: pwm1 {
pwm1_pins: pwm1-pin {
pins = "PG13";
function = "pwm1";
};
spdif_tx_pins_a: spdif@0 {
spdif_tx_pin: spdif-tx-pin {
pins = "PB10";
function = "spdif";
bias-pull-up;
};
uart1_cts_rts_pins_a: uart1-cts-rts@0 {
uart1_cts_rts_pins: uart1-cts-rts-pins {
pins = "PG5", "PG6";
function = "uart1";
};
......
arch/arm/boot/dts/sun5i-r8-chip.dts
View file @ 6a9951a1
......@@ -108,7 +108,7 @@ &ehci0 {
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
......@@ -136,13 +136,13 @@ &battery_power_supply {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "okay";
xio: gpio@38 {
......@@ -159,13 +159,13 @@ xio: gpio@38 {
};
};
&mmc0_pins_a {
&mmc0_pins {
bias-pull-up;
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v3>;
mmc-pwrseq = <&mmc0_pwrseq>;
bus-width = <4>;
......@@ -251,7 +251,7 @@ &reg_usb0_vbus {
&spi2 {
pinctrl-names = "default";
pinctrl-0 = <&spi2_pins_a>;
pinctrl-0 = <&spi2_pe_pins>;
status = "disabled";
};
......@@ -265,14 +265,14 @@ &tve0 {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
&uart3 {
pinctrl-names = "default";
pinctrl-0 = <&uart3_pins_a>,
<&uart3_cts_rts_pins_a>;
pinctrl-0 = <&uart3_pg_pins>,
<&uart3_cts_rts_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i-reference-design-tablet.dtsi
View file @ 6a9951a1
......@@ -76,6 +76,8 @@ &ehci0 {
};
&i2c0 {
pinctrl-0 = <&i2c0_pins>;
axp209: pmic@34 {
reg = <0x34>;
interrupts = <0>;
......@@ -83,6 +85,8 @@ axp209: pmic@34 {
};
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
......@@ -121,7 +125,7 @@ &lradc {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 6 0 GPIO_ACTIVE_LOW>; /* PG0 */
......@@ -146,6 +150,10 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
};
};
&pwm {
pinctrl-0 = <&pwm0_pin>;
};
&reg_dcdc2 {
regulator-always-on;
regulator-min-microvolt = <1000000>;
......@@ -184,7 +192,7 @@ &reg_usb0_vbus {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_b>;
pinctrl-0 = <&uart1_pg_pins>;
status = "okay";
};
......
arch/arm/boot/dts/sun5i.dtsi
View file @ 6a9951a1
......@@ -446,7 +446,7 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>;
#gpio-cells = <3>;
emac_pins_a: emac0@0 {
emac_pd_pins: emac-pd-pins {
pins = "PD6", "PD7", "PD10",
"PD11", "PD12", "PD13", "PD14",
"PD15", "PD18", "PD19", "PD20",
......@@ -455,27 +455,27 @@ 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 = "PB15", "PB16";
function = "i2c1";
};
i2c2_pins_a: i2c2@0 {
i2c2_pins: i2c2-pins {
pins = "PB17", "PB18";
function = "i2c2";
};
ir0_rx_pins_a: ir0@0 {
ir0_rx_pin: ir0-rx-pin {
pins = "PB4";
function = "ir0";
};
lcd_rgb565_pins: lcd_rgb565@0 {
lcd_rgb565_pins: lcd-rgb565-pins {
pins = "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD19", "PD20", "PD21", "PD22", "PD23",
......@@ -483,7 +483,7 @@ lcd_rgb565_pins: lcd_rgb565@0 {
function = "lcd0";
};
lcd_rgb666_pins: lcd_rgb666@0 {
lcd_rgb666_pins: lcd-rgb666-pins {
pins = "PD2", "PD3", "PD4", "PD5", "PD6", "PD7",
"PD10", "PD11", "PD12", "PD13", "PD14", "PD15",
"PD18", "PD19", "PD20", "PD21", "PD22", "PD23",
......@@ -491,7 +491,7 @@ lcd_rgb666_pins: lcd_rgb666@0 {
function = "lcd0";
};
mmc0_pins_a: mmc0@0 {
mmc0_pins: mmc0-pins {
pins = "PF0", "PF1", "PF2", "PF3",
"PF4", "PF5";
function = "mmc0";
......@@ -499,7 +499,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up;
};
mmc2_pins_a: mmc2@0 {
mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11", "PC12", "PC13",
"PC14", "PC15";
......@@ -508,7 +508,7 @@ mmc2_pins_a: mmc2@0 {
bias-pull-up;
};
mmc2_4bit_pins_a: mmc2-4bit@0 {
mmc2_4bit_pc_pins: mmc2-4bit-pc-pins {
pins = "PC6", "PC7", "PC8", "PC9",
"PC10", "PC11";
function = "mmc2";
......@@ -516,7 +516,7 @@ mmc2_4bit_pins_a: mmc2-4bit@0 {
bias-pull-up;
};
nand_pins_a: nand-base0@0 {
nand_pins: nand-pins {
pins = "PC0", "PC1", "PC2",
"PC5", "PC8", "PC9", "PC10",
"PC11", "PC12", "PC13", "PC14",
......@@ -524,57 +524,57 @@ nand_pins_a: nand-base0@0 {
function = "nand0";
};
nand_cs0_pins_a: nand-cs@0 {
nand_cs0_pin: nand-cs0-pin {
pins = "PC4";
function = "nand0";
};
nand_rb0_pins_a: nand-rb@0 {
nand_rb0_pin: nand-rb0-pin {
pins = "PC6";
function = "nand0";
};
spi2_pins_a: spi2@0 {
spi2_pe_pins: spi2-pe-pins {
pins = "PE1", "PE2", "PE3";
function = "spi2";
};
spi2_cs0_pins_a: spi2-cs0@0 {
spi2_cs0_pe_pin: spi2-cs0-pe-pin {
pins = "PE0";
function = "spi2";
};
uart1_pins_a: uart1@0 {
uart1_pe_pins: uart1-pe-pins {
pins = "PE10", "PE11";
function = "uart1";
};
uart1_pins_b: uart1@1 {
uart1_pg_pins: uart1-pg-pins {
pins = "PG3", "PG4";
function = "uart1";
};
uart2_pins_a: uart2@0 {
uart2_pd_pins: uart2-pd-pins {
pins = "PD2", "PD3";
function = "uart2";
};
uart2_cts_rts_pins_a: uart2-cts-rts@0 {
uart2_cts_rts_pd_pins: uart2-cts-rts-pd-pins {
pins = "PD4", "PD5";
function = "uart2";
};
uart3_pins_a: uart3@0 {
uart3_pg_pins: uart3-pg-pins {
pins = "PG9", "PG10";
function = "uart3";
};
uart3_cts_rts_pins_a: uart3-cts-rts@0 {
uart3_cts_rts_pg_pins: uart3-cts-rts-pg-pins {
pins = "PG11", "PG12";
function = "uart3";
};
pwm0_pins: pwm0 {
pwm0_pin: pwm0-pin {
pins = "PB2";
function = "pwm";
};
......
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