From a9ad9a47485a979397a2546d0ad5b9cf455e8857 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 29 Oct 2014 15:09:37 +0100 Subject: [PATCH 1/8] ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options As of commit b3a5d4ce65162d27 ("mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7778), the driver takes care of r8a7778 specific MMC options. Hence they can be removed from the dtsi. Signed-off-by: Kuninori Morimoto [geert: Rebased, reworded, added reference] Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7778.dtsi | 6 ------ 1 file changed, 6 deletions(-) diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 315ec62cb96b..99eeec2fa8a8 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -215,8 +215,6 @@ sdhi0: sd@ffe4c000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4c000 0x100>; interrupts = <0 87 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -224,8 +222,6 @@ sdhi1: sd@ffe4d000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4d000 0x100>; interrupts = <0 88 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; @@ -233,8 +229,6 @@ sdhi2: sd@ffe4f000 { compatible = "renesas,sdhi-r8a7778"; reg = <0xffe4f000 0x100>; interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; From 92e044aed5aede573ffa1ba2c99212024356e851 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 29 Oct 2014 15:09:38 +0100 Subject: [PATCH 2/8] ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options As of commit 81bbbc7278fa109f ("mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7779"), the driver takes care of r8a7779 specific MMC options. Hence they can be removed from the dtsi. Signed-off-by: Kuninori Morimoto [geert: Rebased, reworded, added reference] Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7779.dtsi | 8 -------- 1 file changed, 8 deletions(-) diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi index 7cfba9aa1b41..ad83e47ae199 100644 --- a/arch/arm/boot/dts/r8a7779.dtsi +++ b/arch/arm/boot/dts/r8a7779.dtsi @@ -314,8 +314,6 @@ sdhi0: sd@ffe4c000 { 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 @@ sdhi1: sd@ffe4d000 { 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 @@ sdhi2: sd@ffe4e000 { 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 @@ sdhi3: sd@ffe4f000 { reg = <0xffe4f000 0x100>; interrupts = <0 106 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7779_CLK_SDHI3>; - cap-sd-highspeed; - cap-sdio-irq; status = "disabled"; }; From a6190fd042c19e1abd0b7225e75929e5005587c9 Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 29 Oct 2014 15:09:39 +0100 Subject: [PATCH 3/8] ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options As of commit 423f6c2e977de73b ("mmc: sdhi: update sh_mobile_sdhi_of_data for r8a7790"), the driver takes care of r8a7790 specific MMC options. Hence they can be removed from the dtsi. Signed-off-by: Kuninori Morimoto [geert: Rebased, reworded, added reference] Signed-off-by: Geert Uytterhoeven [simon: Rebased] Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7790.dtsi | 4 ---- 1 file changed, 4 deletions(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index d0e17733dc1a..2be91222d402 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -420,7 +420,6 @@ sdhi0: sd@ee100000 { reg = <0 0xee100000 0 0x200>; interrupts = <0 165 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI0>; - cap-sd-highspeed; status = "disabled"; }; @@ -429,7 +428,6 @@ sdhi1: sd@ee120000 { reg = <0 0xee120000 0 0x200>; interrupts = <0 166 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI1>; - cap-sd-highspeed; status = "disabled"; }; @@ -438,7 +436,6 @@ sdhi2: sd@ee140000 { reg = <0 0xee140000 0 0x100>; interrupts = <0 167 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI2>; - cap-sd-highspeed; status = "disabled"; }; @@ -447,7 +444,6 @@ sdhi3: sd@ee160000 { reg = <0 0xee160000 0 0x100>; interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>; clocks = <&mstp3_clks R8A7790_CLK_SDHI3>; - cap-sd-highspeed; status = "disabled"; }; From 83b4fb6d9034b989075b4887d86b80bd41884d85 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 29 Oct 2014 15:30:51 +0100 Subject: [PATCH 4/8] ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7790.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 2be91222d402..77b7f767d16c 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -1151,7 +1151,7 @@ pciec: pcie@fe000000 { 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 */ From 6b83dc1d03348ec1b1c6879515de1216e060005c Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 29 Oct 2014 15:30:52 +0100 Subject: [PATCH 5/8] ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7791.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/r8a7791.dtsi b/arch/arm/boot/dts/r8a7791.dtsi index e06c11fa8698..35b8a7505a3b 100644 --- a/arch/arm/boot/dts/r8a7791.dtsi +++ b/arch/arm/boot/dts/r8a7791.dtsi @@ -1153,7 +1153,7 @@ pciec: pcie@fe000000 { 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 */ From 76ddbdc3010fbb6d5974545a9e91a8ac7460a243 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Wed, 29 Oct 2014 15:30:53 +0100 Subject: [PATCH 6/8] ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman --- arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ ldo8 { }; }; - ak4648: ak4648@0x12 { + ak4648: ak4648@12 { #sound-dai-cells = <0>; compatible = "asahi-kasei,ak4648"; reg = <0x12>; From 0b3a0ef613538cae4b8b8f41315ef1fd3c957b12 Mon Sep 17 00:00:00 2001 From: Ulrich Hecht Date: Tue, 4 Nov 2014 17:21:24 +0100 Subject: [PATCH 7/8] ARM: shmobile: r8a73a4: fix scifb* naming Ports are named scifb0-3, not scifb2-5. Signed-off-by: Ulrich Hecht Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a73a4.dtsi | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi index c17afef92e8d..5c75c918e9f5 100644 --- a/arch/arm/boot/dts/r8a73a4.dtsi +++ b/arch/arm/boot/dts/r8a73a4.dtsi @@ -263,14 +263,14 @@ i2c8: i2c@e6570000 { 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>; @@ -291,14 +291,14 @@ scifa1: serial@e6c50000 { 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>; From 89aeff9989e87bb2d9d652994010bc18c68675d9 Mon Sep 17 00:00:00 2001 From: Simon Horman Date: Tue, 4 Nov 2014 13:23:38 +0900 Subject: [PATCH 8/8] ARM: shmobile: alt dts: Drop console= bootargs parameter Alt is booted from DT, so chosen/stdout-path is always used, and we can drop the "console=" parameter from chosen/bootargs. This change has a side-effect of changing the console speed from 38400 to 115200. This is intentional as 115200 is consistently used on all other shmobile boards. Signed-off-by: Simon Horman --- arch/arm/boot/dts/r8a7794-alt.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ aliases { }; 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; };