[PATCH 0/5] ARM: shmobile: R-Mobile APE6 / R-Car Gen2: Use "arm,gic-400"

[PATCH 0/5] ARM: shmobile: R-Mobile APE6 / R-Car Gen2: Use "arm,gic-400"

[Geert Uytterhoeven]

	Hi Simon, Magnus,

This patch series replaces the "arm,cortex-a15-gic" compatible value for
the GIC device node by "arm,gic-400" in the R-Mobile APE6 and R-Car Gen2
device trees:
  - The R-Mobile APE6 documentation states it has a GIC-400,
  - The R-Car Gen2 is assumed to have a GIC-400, too.

The presence of a GIC-400 has been confirmed on APE6 and R-Car M2 by
reading the GICD_IIDR register[1], which reports 0x0200043b (GIC-400 0x02, ARM = 0x43b).

This change has no effect on runtime behavior, as currently[2] the GIC
driver treats both compatible values the same.

This has been tested on r8a73a4/ape6evm and r8a7791/koelsch.

Thanks for applying!

[1] Using Mark Rutland's patch in https://lkml.org/lkml/2015/4/29/259,
    or from U-Boot using "md 0xf1001008 1",
[2] Backporter's note: since commit 144cb08864ed44be ("irqchip: gic: Add
    binding probe for ARM GIC400").

Geert Uytterhoeven (5):
  ARM: shmobile: r8a73a4 dtsi: Use "arm,gic-400" for GIC
  ARM: shmobile: r8a7790 dtsi: Use "arm,gic-400" for GIC
  ARM: shmobile: r8a7791 dtsi: Use "arm,gic-400" for GIC
  ARM: shmobile: r8a7793 dtsi: Use "arm,gic-400" for GIC
  ARM: shmobile: r8a7794 dtsi: Use "arm,gic-400" for GIC

 arch/arm/boot/dts/r8a73a4.dtsi | 2 +-
 arch/arm/boot/dts/r8a7790.dtsi | 2 +-
 arch/arm/boot/dts/r8a7791.dtsi | 2 +-
 arch/arm/boot/dts/r8a7793.dtsi | 2 +-
 arch/arm/boot/dts/r8a7794.dtsi | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/5] ARM: shmobile: r8a73a4 dtsi: Use "arm,gic-400" for GIC

[Geert Uytterhoeven]

Replace the "arm,cortex-a15-gic" compatible value for the GIC by
"arm,gic-400", as the documentation states it's a GIC-400.
This has been confirmed by reading the GICD_IIDR register, which reports
0x0200043b (GIC-400 = 0x02, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
You can read the GICD_IIDR register from U-Boot using

    md 0xf1001008 1
---
 arch/arm/boot/dts/r8a73a4.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 7ee22a41c6c97488..5090d1a8f652e8be 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -434,7 +434,7 @@
 	};
 
 	gic: interrupt-controller@f1001000 {
-		compatible = "arm,cortex-a15-gic";
+		compatible = "arm,gic-400";
 		#interrupt-cells = <3>;
 		#address-cells = <0>;
 		interrupt-controller;
-- 
1.9.1

[PATCH 2/5] ARM: shmobile: r8a7790 dtsi: Use "arm,gic-400" for GIC

[Geert Uytterhoeven]

Replace the "arm,cortex-a15-gic" compatible value for the GIC by
"arm,gic-400", as the R-Car Gen2 GIC is assumed to be a GIC-400.
This has been confirmed by reading the GICD_IIDR register (on r8a7791),
which reports 0x0200043b (GIC-400 = 0x02, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
You can read the GICD_IIDR register from U-Boot using

    md 0xf1001008 1
---
 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 51ab8865ea37dc89..d24dcf231fff65ed 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -113,7 +113,7 @@
 	};
 
 	gic: interrupt-controller@f1001000 {
-		compatible = "arm,cortex-a15-gic";
+		compatible = "arm,gic-400";
 		#interrupt-cells = <3>;
 		#address-cells = <0>;
 		interrupt-controller;
-- 
1.9.1

[PATCH 3/5] ARM: shmobile: r8a7791 dtsi: Use "arm,gic-400" for GIC

[Geert Uytterhoeven]

Replace the "arm,cortex-a15-gic" compatible value for the GIC by
"arm,gic-400", as the R-Car Gen2 GIC is assumed to be a GIC-400.
This has been confirmed by reading the GICD_IIDR register, which reports
0x0200043b (GIC-400 = 0x02, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
You can read the GICD_IIDR register from U-Boot using

    md 0xf1001008 1
---
 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 dc1cd3f166060712..07ea2bebe4966da0 100644
--- a/arch/arm/boot/dts/r8a7791.dtsi
+++ b/arch/arm/boot/dts/r8a7791.dtsi
@@ -70,7 +70,7 @@
 	};
 
 	gic: interrupt-controller@f1001000 {
-		compatible = "arm,cortex-a15-gic";
+		compatible = "arm,gic-400";
 		#interrupt-cells = <3>;
 		#address-cells = <0>;
 		interrupt-controller;
-- 
1.9.1

[PATCH 4/5] ARM: shmobile: r8a7793 dtsi: Use "arm,gic-400" for GIC

[Geert Uytterhoeven]

Replace the "arm,cortex-a15-gic" compatible value for the GIC by
"arm,gic-400", as the R-Car Gen2 GIC is assumed to be a GIC-400.
This has been confirmed by reading the GICD_IIDR register (on r8a7791),
which reports 0x0200043b (GIC-400 = 0x02, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
You can read the GICD_IIDR register from U-Boot using

    md 0xf1001008 1
---
 arch/arm/boot/dts/r8a7793.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7793.dtsi b/arch/arm/boot/dts/r8a7793.dtsi
index c50c5f65388af2d0..3355c487d108360f 100644
--- a/arch/arm/boot/dts/r8a7793.dtsi
+++ b/arch/arm/boot/dts/r8a7793.dtsi
@@ -42,7 +42,7 @@
 	};
 
 	gic: interrupt-controller@f1001000 {
-		compatible = "arm,cortex-a15-gic";
+		compatible = "arm,gic-400";
 		#interrupt-cells = <3>;
 		#address-cells = <0>;
 		interrupt-controller;
-- 
1.9.1

[PATCH 5/5] ARM: shmobile: r8a7794 dtsi: Use "arm,gic-400" for GIC

[Geert Uytterhoeven]

Replace the "arm,cortex-a15-gic" compatible value for the GIC by
"arm,gic-400", as the R-Car Gen2 GIC is assumed to be a GIC-400.
This has been confirmed by reading the GICD_IIDR register (on r8a7791),
which reports 0x0200043b (GIC-400 = 0x02, ARM = 0x43b).

This has no effect on runtime behavior, as currently the GIC driver
treats both compatible values the same.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
You can read the GICD_IIDR register from U-Boot using

    md 0xf1001008 1
---
 arch/arm/boot/dts/r8a7794.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7794.dtsi b/arch/arm/boot/dts/r8a7794.dtsi
index b738194233113402..8824dbd5dbb4a5c2 100644
--- a/arch/arm/boot/dts/r8a7794.dtsi
+++ b/arch/arm/boot/dts/r8a7794.dtsi
@@ -39,7 +39,7 @@
 	};
 
 	gic: interrupt-controller@f1001000 {
-		compatible = "arm,cortex-a7-gic";
+		compatible = "arm,gic-400";
 		#interrupt-cells = <3>;
 		#address-cells = <0>;
 		interrupt-controller;
-- 
1.9.1

Re: [PATCH 0/5] ARM: shmobile: R-Mobile APE6 / R-Car Gen2: Use "arm,gic-400"

[Simon Horman]

On Wed, Jun 17, 2015 at 03:03:31PM +0200, Geert Uytterhoeven wrote:
> 	Hi Simon, Magnus,
> 
> This patch series replaces the "arm,cortex-a15-gic" compatible value for
> the GIC device node by "arm,gic-400" in the R-Mobile APE6 and R-Car Gen2
> device trees:
>   - The R-Mobile APE6 documentation states it has a GIC-400,
>   - The R-Car Gen2 is assumed to have a GIC-400, too.
> 
> The presence of a GIC-400 has been confirmed on APE6 and R-Car M2 by
> reading the GICD_IIDR register[1], which reports 0x0200043b (GIC-400 > 0x02, ARM = 0x43b).
> 
> This change has no effect on runtime behavior, as currently[2] the GIC
> driver treats both compatible values the same.
> 
> This has been tested on r8a73a4/ape6evm and r8a7791/koelsch.
> 
> Thanks for applying!
> 
> [1] Using Mark Rutland's patch in https://lkml.org/lkml/2015/4/29/259,
>     or from U-Boot using "md 0xf1001008 1",
> [2] Backporter's note: since commit 144cb08864ed44be ("irqchip: gic: Add
>     binding probe for ARM GIC400").

Thanks, I have queued these up after testing that the following still boot.

r8a73a4/ape6evm, r8a7790/lager r8a7791/koelsch, r8a7794/alt

I am unable to test the r8a7794/gose at this time.