summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/sun4i-a10-a1000.dts
diff options
context:
space:
mode:
authorMaxime Ripard2017-10-04 18:02:14 +0200
committerMaxime Ripard2017-10-13 09:21:52 +0200
commite53bd7618dcacf1eca3ebd1522d0e1164aa8bc4a (patch)
treef1684afaa3dffeaaa8ee490faa5be71b2030facd /arch/arm/boot/dts/sun4i-a10-a1000.dts
parentARM: dts: sun6i: Enable HDMI support on some A31/A31s devices (diff)
downloadkernel-qcow2-linux-e53bd7618dcacf1eca3ebd1522d0e1164aa8bc4a.tar.gz
kernel-qcow2-linux-e53bd7618dcacf1eca3ebd1522d0e1164aa8bc4a.tar.xz
kernel-qcow2-linux-e53bd7618dcacf1eca3ebd1522d0e1164aa8bc4a.zip
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: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun4i-a10-a1000.dts')
-rw-r--r--arch/arm/boot/dts/sun4i-a10-a1000.dts12
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
index 16e65aae99e3..769ae7f4dfbb 100644
--- a/arch/arm/boot/dts/sun4i-a10-a1000.dts
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -126,7 +126,7 @@
&emac {
pinctrl-names = "default";
- pinctrl-0 = <&emac_pins_a>;
+ pinctrl-0 = <&emac_pins>;
phy = <&phy1>;
status = "okay";
};
@@ -137,7 +137,7 @@
&i2c0 {
pinctrl-names = "default";
- pinctrl-0 = <&i2c0_pins_a>;
+ pinctrl-0 = <&i2c0_pins>;
status = "okay";
axp209: pmic@34 {
@@ -152,7 +152,7 @@
&ir0 {
pinctrl-names = "default";
- pinctrl-0 = <&ir0_rx_pins_a>;
+ pinctrl-0 = <&ir0_rx_pins>;
status = "okay";
};
@@ -167,7 +167,7 @@
&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 @@
&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";
};