diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 23:54:04 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 23:54:04 +0300 |
| commit | 0ef917f4fb8342fe2fd0b195f2d65223faf273a2 (patch) | |
| tree | 4667459a0b7a0010f67bb5c67d008549c586913f /arch/arm | |
| parent | d7e4859100e351a31aec13490d5f1d77aa8ca92e (diff) | |
| parent | 1474136ce6a457a10a797b3de04adbb035e90901 (diff) | |
| download | linux-0ef917f4fb8342fe2fd0b195f2d65223faf273a2.tar.xz | |
Merge tag 'renesas-gic-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup
Renesas ARM Based SoC GIC Cleanup for v4.5
On several Renesas ARM SoCs, the GIC is described in DT as being a
Cortex A9 GIC, while it's actually a PL390. This is not only stated in
the documentation, but has been verified by reading the GICD_IIDR
register.
To correct this:
1. Update the DT compatible value to match reality,
2. Update the board staging drivers to match the above.
* tag 'renesas-gic-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
staging: board: armadillo800eva: Use "arm,pl390"
staging: board: kzm9d: Use "arm,pl390"
ARM: shmobile: r8a7778 dtsi: Use "arm,pl390" for GIC
ARM: shmobile: emev2 dtsi: Use "arm,pl390" for GIC
ARM: shmobile: r8a7740 dtsi: Use "arm,pl390" for GIC
ARM: shmobile: r7s72100 dtsi: Use "arm,pl390" for GIC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/emev2.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r7s72100.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7740.dtsi | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/r8a7778.dtsi | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi index edad0c4eea35..57795da616cb 100644 --- a/arch/arm/boot/dts/emev2.dtsi +++ b/arch/arm/boot/dts/emev2.dtsi @@ -44,7 +44,7 @@ }; gic: interrupt-controller@e0020000 { - compatible = "arm,cortex-a9-gic"; + compatible = "arm,pl390"; interrupt-controller; #interrupt-cells = <3>; reg = <0xe0028000 0x1000>, diff --git a/arch/arm/boot/dts/r7s72100.dtsi b/arch/arm/boot/dts/r7s72100.dtsi index 060c32cbd669..4657d7fb5bce 100644 --- a/arch/arm/boot/dts/r7s72100.dtsi +++ b/arch/arm/boot/dts/r7s72100.dtsi @@ -329,7 +329,7 @@ }; gic: interrupt-controller@e8201000 { - compatible = "arm,cortex-a9-gic"; + compatible = "arm,pl390"; #interrupt-cells = <3>; #address-cells = <0>; interrupt-controller; diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi index e14cb1438216..20d20f67620b 100644 --- a/arch/arm/boot/dts/r8a7740.dtsi +++ b/arch/arm/boot/dts/r8a7740.dtsi @@ -30,7 +30,7 @@ }; gic: interrupt-controller@c2800000 { - compatible = "arm,cortex-a9-gic"; + compatible = "arm,pl390"; #interrupt-cells = <3>; interrupt-controller; reg = <0xc2800000 0x1000>, diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi index 4f8e07811746..757c6ff319df 100644 --- a/arch/arm/boot/dts/r8a7778.dtsi +++ b/arch/arm/boot/dts/r8a7778.dtsi @@ -61,7 +61,7 @@ }; gic: interrupt-controller@fe438000 { - compatible = "arm,cortex-a9-gic"; + compatible = "arm,pl390"; #interrupt-cells = <3>; interrupt-controller; reg = <0xfe438000 0x1000>, |