Merge tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/dt

Pull "Second Round of Renesas ARM Based SoC DT Cleanups for v3.19" from Simon Horman:

* Drop console= bootargs parameter on alt
* Correct scifb* naming on r8a73a4
* Drop 0x unit-address prefixes
* Remove unnecessary MMC options

* tag 'renesas-dt-cleanups2-for-v3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  ARM: shmobile: alt dts: Drop console= bootargs parameter
  ARM: shmobile: r8a73a4: fix scifb* naming
  ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix
  ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options
  ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

7 files changed, 8 insertions, 26 deletions

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index b5ead845c6c3..7f57dc7f392a 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -274,14 +274,14 @@
                 status = "disabled";
         };
 
-        scifb2: serial@e6c20000 {
+        scifb0: serial@e6c20000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6c20000 0 0x100>;
                 interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
 
-        scifb3: serial@e6c30000 {
+        scifb1: serial@e6c30000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6c30000 0 0x100>;
                 interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
@@ -302,14 +302,14 @@
                 status = "disabled";
         };
 
-        scifb4: serial@e6ce0000 {
+        scifb2: serial@e6ce0000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6ce0000 0 0x100>;
                 interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
                 status = "disabled";
         };
 
-        scifb5: serial@e6cf0000 {
+        scifb3: serial@e6cf0000 {
                 compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
                 reg = <0 0xe6cf0000 0 0x100>;
                 interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 96297f67fda8..ef8533910029 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -251,8 +251,6 @@
                 compatible = "renesas,sdhi-r8a7778";
                 reg = <0xffe4c000 0x100>;
                 interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
@@ -260,8 +258,6 @@
                 compatible = "renesas,sdhi-r8a7778";
                 reg = <0xffe4d000 0x100>;
                 interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
@@ -269,8 +265,6 @@
                 compatible = "renesas,sdhi-r8a7778";
                 reg = <0xffe4f000 0x100>;
                 interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index a8845328827a..ede9a29e4bc6 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -314,8 +314,6 @@
                 reg = <0xffe4c000 0x100>;
                 interrupts = <0 104 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7779_CLK_SDHI0>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
@@ -324,8 +322,6 @@
                 reg = <0xffe4d000 0x100>;
                 interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7779_CLK_SDHI1>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
@@ -334,8 +330,6 @@
                 reg = <0xffe4e000 0x100>;
                 interrupts = <0 107 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7779_CLK_SDHI2>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
@@ -344,8 +338,6 @@
                 reg = <0xffe4f000 0x100>;
                 interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7779_CLK_SDHI3>;
-                cap-sd-highspeed;
-                cap-sdio-irq;
                 status = "disabled";
         };
 
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 52c21569e352..69b7cd0e7fb3 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -424,7 +424,6 @@
                 reg = <0 0xee100000 0 0x200>;
                 interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7790_CLK_SDHI0>;
-                cap-sd-highspeed;
                 status = "disabled";
         };
 
@@ -433,7 +432,6 @@
                 reg = <0 0xee120000 0 0x200>;
                 interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7790_CLK_SDHI1>;
-                cap-sd-highspeed;
                 status = "disabled";
         };
 
@@ -442,7 +440,6 @@
                 reg = <0 0xee140000 0 0x100>;
                 interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7790_CLK_SDHI2>;
-                cap-sd-highspeed;
                 status = "disabled";
         };
 
@@ -451,7 +448,6 @@
                 reg = <0 0xee160000 0 0x100>;
                 interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
                 clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
-                cap-sd-highspeed;
                 status = "disabled";
         };
 
@@ -1324,7 +1320,7 @@
                 status = "disabled";
         };
 
-        rcar_sound: rcar_sound@0xec500000 {
+        rcar_sound: rcar_sound@ec500000 {
                 #sound-dai-cells = <1>;
                 compatible =  "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
                 reg =   <0 0xec500000 0 0x1000>, /* SCU */
diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi
index a862243f0436..9a57215f54f7 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1307,7 +1307,7 @@
                 status = "disabled";
         };
 
-        rcar_sound: rcar_sound@0xec500000 {
+        rcar_sound: rcar_sound@ec500000 {
                 #sound-dai-cells = <1>;
                 compatible =  "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
                 reg =   <0 0xec500000 0 0x1000>, /* SCU */
diff --git a/arch/arm/boot/dts/r8a7794-alt.dts b/arch/arm/boot/dts/r8a7794-alt.dts
index 8aec51268b7d..f2cf7576bf3f 100644
--- a/arch/arm/boot/dts/r8a7794-alt.dts
+++ b/arch/arm/boot/dts/r8a7794-alt.dts
@@ -20,7 +20,7 @@
         };
 
         chosen {
-                bootargs = "console=ttySC0,38400 ignore_loglevel rw root=/dev/nfs ip=dhcp";
+                bootargs = "ignore_loglevel rw root=/dev/nfs ip=dhcp";
                 stdout-path = &scif2;
         };
 
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index 0dac0e66ccad..8c913d9b1824 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -251,7 +251,7 @@
                 };
         };
 
-        ak4648: ak4648@0x12 {
+        ak4648: ak4648@12 {
                 #sound-dai-cells = <0>;
                 compatible = "asahi-kasei,ak4648";
                 reg = <0x12>;