1 files changed, 20 insertions, 8 deletions

diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 486007d7ffe4..ee9e7d5c97a9 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -19,8 +19,12 @@
         model = "armadillo 800 eva reference";
         compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
 
+        aliases {
+                serial1 = &scifa1;
+        };
+
         chosen {
-                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
+                bootargs = "console=tty0 console=ttySC1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
 
         memory {
@@ -104,17 +108,21 @@
 
         leds {
                 compatible = "gpio-leds";
-                led1 {
+                led3 {
                         gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;
+                        label = "LED3";
                 };
-                led2 {
+                led4 {
                         gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;
+                        label = "LED4";
                 };
-                led3 {
+                led5 {
                         gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;
+                        label = "LED5";
                 };
-                led4 {
+                led6 {
                         gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;
+                        label = "LED6";
                 };
         };
 
@@ -198,9 +206,6 @@
 };
 
 &pfc {
-        pinctrl-0 = <&scifa1_pins>;
-        pinctrl-names = "default";
-
         ether_pins: ether {
                 renesas,groups = "gether_mii", "gether_int";
                 renesas,function = "gether";
@@ -252,6 +257,13 @@
         status = "okay";
 };
 
+&scifa1 {
+        pinctrl-0 = <&scifa1_pins>;
+        pinctrl-names = "default";
+
+        status = "okay";
+};
+
 &sdhi0 {
         pinctrl-0 = <&sdhi0_pins>;
         pinctrl-names = "default";