* [PATCH 1/8] ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 2/8] ARM: shmobile: r8a7779 " Simon Horman
` (7 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
[geert: Rebased, reworded, added reference]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 315ec62..99eeec2 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -215,8 +215,6 @@
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 @@
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 @@
compatible = "renesas,sdhi-r8a7778";
reg = <0xffe4f000 0x100>;
interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>;
- cap-sd-highspeed;
- cap-sdio-irq;
status = "disabled";
};
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 2/8] ARM: shmobile: r8a7779 dtsi: Remove unnecessary MMC options
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
2014-11-10 1:32 ` [PATCH 1/8] ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 3/8] ARM: shmobile: r8a7790 " Simon Horman
` (6 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
[geert: Rebased, reworded, added reference]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 7cfba9a..ad83e47 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";
};
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 3/8] ARM: shmobile: r8a7790 dtsi: Remove unnecessary MMC options
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
2014-11-10 1:32 ` [PATCH 1/8] ARM: shmobile: r8a7778 dtsi: Remove unnecessary MMC options Simon Horman
2014-11-10 1:32 ` [PATCH 2/8] ARM: shmobile: r8a7779 " Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 4/8] ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix Simon Horman
` (5 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
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 <kuninori.morimoto.gx@renesas.com>
[geert: Rebased, reworded, added reference]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
[simon: Rebased]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 d0e1773..2be9122 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -420,7 +420,6 @@
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 @@
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 @@
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 @@
reg = <0 0xee160000 0 0x100>;
interrupts = <0 168 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7790_CLK_SDHI3>;
- cap-sd-highspeed;
status = "disabled";
};
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 4/8] ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (2 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 3/8] ARM: shmobile: r8a7790 " Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 5/8] ARM: shmobile: r8a7791 " Simon Horman
` (4 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 2be9122..77b7f76 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -1151,7 +1151,7 @@
status = "disabled";
};
- rcar_sound: rcar_sound at 0xec500000 {
+ rcar_sound: rcar_sound at ec500000 {
#sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
reg = <0 0xec500000 0 0x1000>, /* SCU */
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 5/8] ARM: shmobile: r8a7791 dtsi: Drop bogus 0x unit-address prefix
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (3 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 4/8] ARM: shmobile: r8a7790 dtsi: Drop bogus 0x unit-address prefix Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 6/8] ARM: shmobile: kzm9g-reference dts: " Simon Horman
` (3 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 e06c11f..35b8a75 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -1153,7 +1153,7 @@
status = "disabled";
};
- rcar_sound: rcar_sound at 0xec500000 {
+ rcar_sound: rcar_sound at ec500000 {
#sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7791", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
reg = <0 0xec500000 0 0x1000>, /* SCU */
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 6/8] ARM: shmobile: kzm9g-reference dts: Drop bogus 0x unit-address prefix
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (4 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 5/8] ARM: shmobile: r8a7791 " Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 7/8] ARM: shmobile: r8a73a4: fix scifb* naming Simon Horman
` (2 subsequent siblings)
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 0dac0e6..8c913d9 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 at 0x12 {
+ ak4648: ak4648 at 12 {
#sound-dai-cells = <0>;
compatible = "asahi-kasei,ak4648";
reg = <0x12>;
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 7/8] ARM: shmobile: r8a73a4: fix scifb* naming
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (5 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 6/8] ARM: shmobile: kzm9g-reference dts: " Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-10 1:32 ` [PATCH 8/8] ARM: shmobile: alt dts: Drop console= bootargs parameter Simon Horman
2014-11-19 21:48 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Arnd Bergmann
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
From: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Ports are named scifb0-3, not scifb2-5.
Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
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 c17afef..5c75c91 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -263,14 +263,14 @@
status = "disabled";
};
- scifb2: serial at e6c20000 {
+ scifb0: serial at e6c20000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6c20000 0 0x100>;
interrupts = <0 148 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
- scifb3: serial at e6c30000 {
+ scifb1: serial at e6c30000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6c30000 0 0x100>;
interrupts = <0 149 IRQ_TYPE_LEVEL_HIGH>;
@@ -291,14 +291,14 @@
status = "disabled";
};
- scifb4: serial at e6ce0000 {
+ scifb2: serial at e6ce0000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6ce0000 0 0x100>;
interrupts = <0 150 IRQ_TYPE_LEVEL_HIGH>;
status = "disabled";
};
- scifb5: serial at e6cf0000 {
+ scifb3: serial at e6cf0000 {
compatible = "renesas,scifb-r8a73a4", "renesas,scifb";
reg = <0 0xe6cf0000 0 0x100>;
interrupts = <0 151 IRQ_TYPE_LEVEL_HIGH>;
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH 8/8] ARM: shmobile: alt dts: Drop console= bootargs parameter
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (6 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 7/8] ARM: shmobile: r8a73a4: fix scifb* naming Simon Horman
@ 2014-11-10 1:32 ` Simon Horman
2014-11-19 21:48 ` [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Arnd Bergmann
8 siblings, 0 replies; 10+ messages in thread
From: Simon Horman @ 2014-11-10 1:32 UTC (permalink / raw)
To: linux-arm-kernel
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 <horms+renesas@verge.net.au>
---
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 8aec512..f2cf757 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;
};
--
2.1.1
^ permalink raw reply related [flat|nested] 10+ messages in thread* [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19
2014-11-10 1:32 [GIT PULL] Second Round of Renesas ARM Based SoC DT Cleanups for v3.19 Simon Horman
` (7 preceding siblings ...)
2014-11-10 1:32 ` [PATCH 8/8] ARM: shmobile: alt dts: Drop console= bootargs parameter Simon Horman
@ 2014-11-19 21:48 ` Arnd Bergmann
8 siblings, 0 replies; 10+ messages in thread
From: Arnd Bergmann @ 2014-11-19 21:48 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 10 November 2014, Simon Horman wrote:
> Hi Olof, Hi Kevin, Hi Arnd,
>
> Please consider these second round of Renesas ARM based SoC DT cleanups for v3.19.
>
> This pull request is based on the previous round of
> such requests, tagged as renesas-dt-cleanups-for-v3.19,
> which I have already sent a pull-request for.
>
Pulled into next/dt, thanks!
Arnd
^ permalink raw reply [flat|nested] 10+ messages in thread