summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2016-06-10 15:00:51 +0200
committerSimon Horman <horms+renesas@verge.net.au>2016-06-14 02:06:14 +0200
commit46344361f5cdffac3c42b9651595f6e0bd609885 (patch)
treeb044c8bc989fc30ed4cbf42d9c2716091945f533
parentARM: dts: bockw: Name serial port pfc subnode after device name (diff)
downloadlinux-46344361f5cdffac3c42b9651595f6e0bd609885.tar.xz
linux-46344361f5cdffac3c42b9651595f6e0bd609885.zip
ARM: dts: marzen: Name serial port pfc subnodes after device names
Name the Pin Function Controller subnodes for SCIF2 and SCIF4 after their device names, instead of using some arbitrary names that look like serial port aliases, but differ from the actual aliases. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r--arch/arm/boot/dts/r8a7779-marzen.dts4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index cec79a6347c0..013e6f510b0f 100644
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -195,12 +195,12 @@
};
};
- scif2_pins: serial2 {
+ scif2_pins: scif2 {
groups = "scif2_data_c";
function = "scif2";
};
- scif4_pins: serial4 {
+ scif4_pins: scif4 {
groups = "scif4_data";
function = "scif4";
};