From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Fri, 10 Jun 2016 13:00:51 +0000 (+0200)
Subject: ARM: dts: marzen: Name serial port pfc subnodes after device names
X-Git-Tag: Ubuntu-4.8.0-22.24~785^2~14^2~36
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=46344361f5cdffac3c42b9651595f6e0bd609885;p=mirror_ubuntu-zesty-kernel.git

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>
---

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";
 	};