From: Geert Uytterhoeven Date: Fri, 10 Jun 2016 13:00:49 +0000 (+0200) Subject: ARM: dts: armadillo800eva: Name serial port pfc subnode after device name X-Git-Tag: v4.8-rc1~66^2~14^2~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=94667b193c67b3510e644a61243155c234b9f87d;p=thirdparty%2Flinux.git ARM: dts: armadillo800eva: Name serial port pfc subnode after device name Name the Pin Function Controller subnode for SCIFA1 after its device name, instead of after the serial port alias. This avoids conflicts when enabling support for more serial ports later, either here or in a DT overlay. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts index 1620495166851..6866f61a350c7 100644 --- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts +++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts @@ -232,7 +232,7 @@ function = "gether"; }; - scifa1_pins: serial1 { + scifa1_pins: scifa1 { groups = "scifa1_data"; function = "scifa1"; };