system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-08 20:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARM: dts: sun8i: a23/a33: Change pinctrl nodes to avoid warning

Browse source 
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: Maxime Ripard <maxime.ripard@bootlin.com>
Acked-by: Chen-Yu Tsai <wens@csie.org>
This commit is contained in:
Maxime Ripard 2018-11-07 10:58:01 +01:00
parent 4ead0ad7b2
commit 090e563c91
No known key found for this signature in database
GPG key ID: E3EF0D6F671851C5
14 changed files with 50 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
arch/arm/boot/dts/sun8i-a23-a33.dtsi
View file

@ -298,22 +298,22 @@ pio: pinctrl@1c20800 {
#interrupt-cells = <3>;
#gpio-cells = <3>;
i2c0_pins_a: i2c0@0 {
i2c0_pins: i2c0-pins {
pins = "PH2", "PH3";
function = "i2c0";
};
i2c1_pins_a: i2c1@0 {
i2c1_pins: i2c1-pins {
pins = "PH4", "PH5";
function = "i2c1";
};
i2c2_pins_a: i2c2@0 {
i2c2_pins: i2c2-pins {
pins = "PE12", "PE13";
function = "i2c2";
};
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",
@ -321,7 +321,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";
@ -329,7 +329,7 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up;
};
mmc1_pins_a: mmc1@0 {
mmc1_pg_pins: mmc1-pg-pins {
pins = "PG0", "PG1", "PG2",
"PG3", "PG4", "PG5";
function = "mmc1";
@ -337,7 +337,7 @@ mmc1_pins_a: mmc1@0 {
bias-pull-up;
};
mmc2_8bit_pins: mmc2_8bit {
mmc2_8bit_pins: mmc2-8bit-pins {
pins = "PC5", "PC6", "PC8",
"PC9", "PC10", "PC11",
"PC12", "PC13", "PC14",
@ -378,22 +378,22 @@ nand_pins_rb1: nand-pins-rb1 {
bias-pull-up;
};
pwm0_pins: pwm0 {
pwm0_pin: pwm0-pin {
pins = "PH0";
function = "pwm0";
};
uart0_pins_a: uart0@0 {
uart0_pf_pins: uart0-pf-pins {
pins = "PF2", "PF4";
function = "uart0";
};
uart1_pins_a: uart1@0 {
uart1_pg_pins: uart1-pg-pins {
pins = "PG6", "PG7";
function = "uart1";
};
uart1_pins_cts_rts_a: uart1-cts-rts@0 {
uart1_cts_rts_pg_pins: uart1-cts-rts-pg-pins {
pins = "PG8", "PG9";
function = "uart1";
};
@ -658,14 +658,14 @@ r_pio: pinctrl@1f02c00 {
#interrupt-cells = <3>;
#gpio-cells = <3>;
r_rsb_pins: r_rsb {
r_rsb_pins: r-rsb-pins {
pins = "PL0", "PL1";
function = "s_rsb";
drive-strength = <20>;
bias-pull-up;
};
r_uart_pins_a: r_uart@0 {
r_uart_pins_a: r-uart-pins {
pins = "PL2", "PL3";
function = "s_uart";
};

6
arch/arm/boot/dts/sun8i-a23-evb.dts
View file

@ -66,13 +66,13 @@ chosen {
&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";
};
@ -104,7 +104,7 @@ button-600 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_vcc3v0>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */

2
arch/arm/boot/dts/sun8i-a23-polaroid-mid2407pxe03.dts
View file

@ -69,7 +69,7 @@ mma7660: accelerometer@4c {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;

2
arch/arm/boot/dts/sun8i-a23-polaroid-mid2809pxe04.dts
View file

@ -62,7 +62,7 @@ wifi_pwrseq: wifi_pwrseq {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;

2
arch/arm/boot/dts/sun8i-a33-ga10h-v1.1.dts
View file

@ -79,7 +79,7 @@ button-600 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>;
bus-width = <4>;
non-removable;

6
arch/arm/boot/dts/sun8i-a33-inet-d978-rev2.dts
View file

@ -72,7 +72,7 @@ home {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>;
bus-width = <4>;
non-removable;
@ -97,7 +97,7 @@ &r_uart {
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>,
<&uart1_pins_cts_rts_a>;
pinctrl-0 = <&uart1_pg_pins>,
<&uart1_cts_rts_pg_pins>;
status = "okay";
};

4
arch/arm/boot/dts/sun8i-a33-olinuxino.dts
View file

@ -83,7 +83,7 @@ &ehci0 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@ -207,7 +207,7 @@ &sound {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};

4
arch/arm/boot/dts/sun8i-a33-sinlinx-sina33.dts
View file

@ -141,7 +141,7 @@ button-600 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@ -268,7 +268,7 @@ tcon0_out_panel: endpoint@0 {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};

2
arch/arm/boot/dts/sun8i-a33.dtsi
View file

@ -552,7 +552,7 @@ &pio {
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
uart0_pins_b: uart0@1 {
uart0_pb_pins: uart0-pb-pins {
pins = "PB0", "PB1";
function = "uart0";
};

2
arch/arm/boot/dts/sun8i-q8-common.dtsi
View file

@ -70,7 +70,7 @@ &ehci0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_dldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;

14
arch/arm/boot/dts/sun8i-r16-bananapi-m2m.dts
View file

@ -127,27 +127,27 @@ &ehci0 {
/* This is the i2c bus exposed on the DSI connector for the touch panel */
&i2c0 {
pinctrl-names = "default";
pinctrl-0 = <&i2c0_pins_a>;
pinctrl-0 = <&i2c0_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the GPIO header */
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "disabled";
};
/* This is the i2c bus exposed on the CSI connector to control the sensor */
&i2c2 {
pinctrl-names = "default";
pinctrl-0 = <&i2c2_pins_a>;
pinctrl-0 = <&i2c2_pins>;
status = "disabled";
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@ -156,7 +156,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@ -292,13 +292,13 @@ &sound {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1_pins_a>, <&uart1_pins_cts_rts_a>;
pinctrl-0 = <&uart1_pg_pins>, <&uart1_cts_rts_pg_pins>;
status = "okay";
};

2
arch/arm/boot/dts/sun8i-r16-nintendo-nes-classic.dts
View file

@ -25,7 +25,7 @@ &uart0 {
* PF can also be used for the SD card so PB is preferred.
*/
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_a>;
pinctrl-0 = <&uart0_pf_pins>;
status = "okay";
};

8
arch/arm/boot/dts/sun8i-r16-parrot.dts
View file

@ -96,7 +96,7 @@ &ehci0 {
&i2c1 {
pinctrl-names = "default";
pinctrl-0 = <&i2c1_pins_a>;
pinctrl-0 = <&i2c1_pins>;
status = "okay";
/*
@ -127,7 +127,7 @@ button-390 {
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
cd-gpios = <&pio 3 14 GPIO_ACTIVE_LOW>; /* PD14 */
bus-width = <4>;
@ -136,7 +136,7 @@ &mmc0 {
&mmc1 {
pinctrl-names = "default";
pinctrl-0 = <&mmc1_pins_a>;
pinctrl-0 = <&mmc1_pg_pins>;
vmmc-supply = <&reg_aldo1>;
mmc-pwrseq = <&wifi_pwrseq>;
bus-width = <4>;
@ -303,7 +303,7 @@ &sound {
&uart0 {
pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>;
pinctrl-0 = <&uart0_pb_pins>;
status = "okay";
};

11
arch/arm/boot/dts/sun8i-reference-design-tablet.dtsi
View file

@ -62,6 +62,7 @@ chosen {
};
&i2c0 {
pinctrl-0 = <&i2c0_pins>;
/*
* The gsl1680 is rated at 400KHz and it will not work reliable at
* 100KHz, this has been confirmed on multiple different q8 tablets.
@ -79,9 +80,13 @@ touchscreen: touchscreen@40 {
};
};
&i2c1 {
pinctrl-0 = <&i2c1_pins>;
};
&mmc0 {
pinctrl-names = "default";
pinctrl-0 = <&mmc0_pins_a>;
pinctrl-0 = <&mmc0_pins>;
vmmc-supply = <&reg_dcdc1>;
bus-width = <4>;
cd-gpios = <&pio 1 4 GPIO_ACTIVE_LOW>; /* PB4 */
@ -96,6 +101,10 @@ usb0_id_detect_pin: usb0_id_detect_pin@0 {
};
};
&pwm {
pinctrl-0 = <&pwm0_pin>;
};
&r_rsb {
status = "okay";