openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: sun8i: a83t: Rename pinmux setting names 

The pinmux setting nodes all have an address element in their node
names, however the pinctrl node does not have #address-cells.

Rename the existing pinmux setting nodes and labels in sun8i-a83t.dtsi,
dropping identifiers for functions that only have one possible setting,
and using the pingroup name if the function is identically available on
different pingroups.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
Chen-Yu Tsai 2017-04-18 12:22:05 +08:00 committed by Maxime Ripard
parent 802139d009
commit e53bfb022f
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/sun8i-a83t-allwinner-h8homlet-v2.dts
View File

@ -59,6 +59,6 @@ chosen {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };

2
arch/arm/boot/dts/sun8i-a83t-cubietruck-plus.dts
View File

@ -60,6 +60,6 @@ chosen {
&uart0 { &uart0 {
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0_pins_b>; pinctrl-0 = <&uart0_pb_pins>;
status = "okay"; status = "okay";
}; };

10
arch/arm/boot/dts/sun8i-a83t.dtsi
View File

@ -174,7 +174,7 @@ pio: pinctrl@01c20800 {
#interrupt-cells = <3>; #interrupt-cells = <3>;
#gpio-cells = <3>; #gpio-cells = <3>;
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";
@ -182,13 +182,13 @@ mmc0_pins_a: mmc0@0 {
bias-pull-up; bias-pull-up;
}; };
uart0_pins_a: uart0@0 { uart0_pb_pins: uart0_pb_pins {
pins = "PF2", "PF4"; pins = "PB9", "PB10";
function = "uart0"; function = "uart0";
}; };
uart0_pins_b: uart0@1 { uart0_pf_pins: uart0_pf_pins {
pins = "PB9", "PB10"; pins = "PF2", "PF4";
function = "uart0"; function = "uart0";
}; };
}; };