diff options
| author | Chen-Yu Tsai <wens@csie.org> | 2016-06-07 10:54:33 +0800 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2016-06-20 22:44:00 +0200 |
| commit | 3424c3f29970beaa3810acbc6ba3b8062a71ef09 (patch) | |
| tree | a6b861bd07db5b46ba42ed9fd0122750c72eb159 | |
| parent | 7579a3ec8c655b57f072c44c92f281fdc5401450 (diff) | |
| download | u-boot-imx-3424c3f29970beaa3810acbc6ba3b8062a71ef09.zip u-boot-imx-3424c3f29970beaa3810acbc6ba3b8062a71ef09.tar.gz u-boot-imx-3424c3f29970beaa3810acbc6ba3b8062a71ef09.tar.bz2 | |
sunxi: Add base address for GIC
Instead of hardcoding the GIC addresses in the PSCI implementation,
provide a base address in the cpu header.
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/psci_sun6i.S | 4 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/sunxi/psci_sun7i.S | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-sunxi/cpu_sun4i.h | 2 |
3 files changed, 6 insertions, 4 deletions
diff --git a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S b/arch/arm/cpu/armv7/sunxi/psci_sun6i.S index 9752550..95fdb0e 100644 --- a/arch/arm/cpu/armv7/sunxi/psci_sun6i.S +++ b/arch/arm/cpu/armv7/sunxi/psci_sun6i.S @@ -42,8 +42,8 @@ #define ONE_MS (CONFIG_TIMER_CLK_FREQ / 1000) #define TEN_MS (10 * ONE_MS) -#define GICD_BASE 0x1c81000 -#define GICC_BASE 0x1c82000 +#define GICD_BASE (SUNXI_GIC400_BASE + 0x1000) +#define GICC_BASE (SUNXI_GIC400_BASE + 0x2000) .globl psci_fiq_enter psci_fiq_enter: diff --git a/arch/arm/cpu/armv7/sunxi/psci_sun7i.S b/arch/arm/cpu/armv7/sunxi/psci_sun7i.S index ac8ebf8..87bbd72 100644 --- a/arch/arm/cpu/armv7/sunxi/psci_sun7i.S +++ b/arch/arm/cpu/armv7/sunxi/psci_sun7i.S @@ -42,8 +42,8 @@ #define ONE_MS (CONFIG_TIMER_CLK_FREQ / 1000) #define TEN_MS (10 * ONE_MS) -#define GICD_BASE 0x1c81000 -#define GICC_BASE 0x1c82000 +#define GICD_BASE (SUNXI_GIC400_BASE + 0x1000) +#define GICC_BASE (SUNXI_GIC400_BASE + 0x2000) .globl psci_fiq_enter psci_fiq_enter: diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h index 47e327e..c5e9d88 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun4i.h @@ -143,6 +143,8 @@ #define SUNXI_DRAM_PHY0_BASE 0x01c65000 #define SUNXI_DRAM_PHY1_BASE 0x01c66000 +#define SUNXI_GIC400_BASE 0x01c80000 + /* module sram */ #define SUNXI_SRAM_C_BASE 0x01d00000 |