Commit 0ef917f4 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'renesas-gic-cleanup-for-v4.5' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents d7e48591 1474136c
......@@ -44,7 +44,7 @@ cpu@1 {
};
gic: interrupt-controller@e0020000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
interrupt-controller;
#interrupt-cells = <3>;
reg = <0xe0028000 0x1000>,
......
......@@ -329,7 +329,7 @@ spi4: spi@e800e800 {
};
gic: interrupt-controller@e8201000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
#address-cells = <0>;
interrupt-controller;
......
......@@ -30,7 +30,7 @@ cpu@0 {
};
gic: interrupt-controller@c2800000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0xc2800000 0x1000>,
......
......@@ -61,7 +61,7 @@ ether: ethernet@fde00000 {
};
gic: interrupt-controller@fe438000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0xfe438000 0x1000>,
......
......@@ -97,7 +97,7 @@ static const struct board_staging_dev armadillo800eva_devices[] __initconst = {
static void __init armadillo800eva_init(void)
{
board_staging_gic_setup_xlate("arm,cortex-a9-gic", 32);
board_staging_gic_setup_xlate("arm,pl390", 32);
board_staging_register_devices(armadillo800eva_devices,
ARRAY_SIZE(armadillo800eva_devices));
}
......
......@@ -11,7 +11,7 @@ static struct resource usbs1_res[] __initdata = {
static void __init kzm9d_init(void)
{
board_staging_gic_setup_xlate("arm,cortex-a9-gic", 32);
board_staging_gic_setup_xlate("arm,pl390", 32);
if (!board_staging_dt_node_available(usbs1_res,
ARRAY_SIZE(usbs1_res))) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment