Merge tag 'v3.14.25' into backport/v3.14.24-ltsi-rc1+v3.14.25/snapshot-merge.wip

[platform/adaptation/renesas_rcar/renesas_kernel.git] / arch / arm / boot / dts / r8a7779-marzen.dts

diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
index 3212908..c160404 100644 (file)
--- a/arch/arm/boot/dts/r8a7779-marzen.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -18,6 +18,11 @@
        model = "marzen";
        compatible = "renesas,marzen", "renesas,r8a7779";
 
+       aliases {
+               serial2 = &scif2;
+               serial4 = &scif4;
+       };
+
        chosen {
                bootargs = "console=ttySC2,115200 ignore_loglevel root=/dev/nfs ip=on";
        };
@@ -73,10 +78,11 @@
        clock-frequency = <31250000>;
 };
 
-&pfc {
-       pinctrl-0 = <&scif2_pins &scif4_pins>;
-       pinctrl-names = "default";
+&tmu0 {
+       status = "okay";
+};
 
+&pfc {
        lan0_pins: lan0 {
                intc {
                        renesas,groups = "intc_irq1_b";
@@ -109,6 +115,20 @@
        };
 };
 
+&scif2 {
+       pinctrl-0 = <&scif2_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
+
+&scif4 {
+       pinctrl-0 = <&scif4_pins>;
+       pinctrl-names = "default";
+
+       status = "okay";
+};
+
 &sdhi0 {
        pinctrl-0 = <&sdhi0_pins>;
        pinctrl-names = "default";