diff options
| author | Olof Johansson <olof@lixom.net> | 2015-12-22 12:54:04 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-12-22 12:54:04 -0800 |
| commit | 0ef917f4fb8342fe2fd0b195f2d65223faf273a2 (patch) | |
| tree | 4667459a0b7a0010f67bb5c67d008549c586913f /drivers | |
| parent | d7e4859100e351a31aec13490d5f1d77aa8ca92e (diff) | |
| parent | 1474136ce6a457a10a797b3de04adbb035e90901 (diff) | |
| download | op-kernel-dev-0ef917f4fb8342fe2fd0b195f2d65223faf273a2.zip op-kernel-dev-0ef917f4fb8342fe2fd0b195f2d65223faf273a2.tar.gz | |
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 'drivers')
| -rw-r--r-- | drivers/staging/board/armadillo800eva.c | 2 | ||||
| -rw-r--r-- | drivers/staging/board/kzm9d.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/board/armadillo800eva.c b/drivers/staging/board/armadillo800eva.c index 9c41652..912c96b 100644 --- a/drivers/staging/board/armadillo800eva.c +++ b/drivers/staging/board/armadillo800eva.c @@ -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)); } diff --git a/drivers/staging/board/kzm9d.c b/drivers/staging/board/kzm9d.c index 8d1eb09..05a6d43 100644 --- a/drivers/staging/board/kzm9d.c +++ b/drivers/staging/board/kzm9d.c @@ -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))) { |
