tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'renesas-gic-cleanup-for-v4.5' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/cleanup

Browse Source 
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>
This commit is contained in:
Olof Johansson
2015-12-22 12:54:04 -08:00
parent d7e4859100 1474136ce6
commit 0ef917f4fb
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
arch/arm/boot/dts/emev2.dtsi
+1 -1
View File
@@ -44,7 +44,7 @@
};
gic: interrupt-controller@e0020000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
interrupt-controller;
#interrupt-cells = <3>;
reg = <0xe0028000 0x1000>,
arch/arm/boot/dts/r7s72100.dtsi
+1 -1
View File
@@ -329,7 +329,7 @@
};
gic: interrupt-controller@e8201000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
#address-cells = <0>;
interrupt-controller;
arch/arm/boot/dts/r8a7740.dtsi
+1 -1
View File
@@ -30,7 +30,7 @@
};
gic: interrupt-controller@c2800000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0xc2800000 0x1000>,
arch/arm/boot/dts/r8a7778.dtsi
+1 -1
View File
@@ -61,7 +61,7 @@
};
gic: interrupt-controller@fe438000 {
compatible = "arm,cortex-a9-gic";
compatible = "arm,pl390";
#interrupt-cells = <3>;
interrupt-controller;
reg = <0xfe438000 0x1000>,
drivers/staging/board/armadillo800eva.c
+1 -1
View File
@@ -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));
}
drivers/staging/board/kzm9d.c
+1 -1
View File
@@ -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))) {