amlogic: Fix prefixes in the platform macros file
Fixing at the same time the related register names. Signed-off-by: Carlo Caione <ccaione@baylibre.com> Change-Id: Ib1130d50abe6088f1c0826878d1ae454a0f23008
This commit is contained in:
parent
f681c676df
commit
821781f30e
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2018, ARM Limited and Contributors. All rights reserved.
|
* Copyright (c) 2018-2019, ARM Limited and Contributors. All rights reserved.
|
||||||
*
|
*
|
||||||
* SPDX-License-Identifier: BSD-3-Clause
|
* SPDX-License-Identifier: BSD-3-Clause
|
||||||
*/
|
*/
|
||||||
|
@ -33,7 +33,7 @@ spacer:
|
||||||
|
|
||||||
/* GICC registers */
|
/* GICC registers */
|
||||||
|
|
||||||
mov_imm x17, GXBB_GICC_BASE
|
mov_imm x17, AML_GICC_BASE
|
||||||
|
|
||||||
adr x6, gicc_regs
|
adr x6, gicc_regs
|
||||||
ldr w8, [x17, #GICC_HPPIR]
|
ldr w8, [x17, #GICC_HPPIR]
|
||||||
|
@ -43,7 +43,7 @@ spacer:
|
||||||
|
|
||||||
/* GICD registers */
|
/* GICD registers */
|
||||||
|
|
||||||
mov_imm x16, GXBB_GICD_BASE
|
mov_imm x16, AML_GICD_BASE
|
||||||
|
|
||||||
add x7, x16, #GICD_ISPENDR
|
add x7, x16, #GICD_ISPENDR
|
||||||
adr x4, gicd_pend_reg
|
adr x4, gicd_pend_reg
|
||||||
|
|
|
@ -127,8 +127,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const gicv2_driver_data_t gxbb_gic_data = {
|
static const gicv2_driver_data_t gxbb_gic_data = {
|
||||||
.gicd_base = GXBB_GICD_BASE,
|
.gicd_base = AML_GICD_BASE,
|
||||||
.gicc_base = GXBB_GICC_BASE,
|
.gicc_base = AML_GICC_BASE,
|
||||||
.interrupt_props = gxbb_interrupt_props,
|
.interrupt_props = gxbb_interrupt_props,
|
||||||
.interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
|
.interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
|
||||||
};
|
};
|
||||||
|
|
|
@ -58,8 +58,8 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* GIC-400 and interrupt handling related constants
|
* GIC-400 and interrupt handling related constants
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#define GXBB_GICD_BASE UL(0xC4301000)
|
#define AML_GICD_BASE UL(0xC4301000)
|
||||||
#define GXBB_GICC_BASE UL(0xC4302000)
|
#define AML_GICC_BASE UL(0xC4302000)
|
||||||
|
|
||||||
#define IRQ_SEC_PHY_TIMER 29
|
#define IRQ_SEC_PHY_TIMER 29
|
||||||
|
|
||||||
|
|
|
@ -141,8 +141,8 @@ static const interrupt_prop_t gxbb_interrupt_props[] = {
|
||||||
};
|
};
|
||||||
|
|
||||||
static const gicv2_driver_data_t gxbb_gic_data = {
|
static const gicv2_driver_data_t gxbb_gic_data = {
|
||||||
.gicd_base = GXBB_GICD_BASE,
|
.gicd_base = AML_GICD_BASE,
|
||||||
.gicc_base = GXBB_GICC_BASE,
|
.gicc_base = AML_GICC_BASE,
|
||||||
.interrupt_props = gxbb_interrupt_props,
|
.interrupt_props = gxbb_interrupt_props,
|
||||||
.interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
|
.interrupt_props_num = ARRAY_SIZE(gxbb_interrupt_props),
|
||||||
};
|
};
|
||||||
|
|
|
@ -62,8 +62,8 @@
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
* GIC-400 and interrupt handling related constants
|
* GIC-400 and interrupt handling related constants
|
||||||
******************************************************************************/
|
******************************************************************************/
|
||||||
#define GXBB_GICD_BASE UL(0xC4301000)
|
#define AML_GICD_BASE UL(0xC4301000)
|
||||||
#define GXBB_GICC_BASE UL(0xC4302000)
|
#define AML_GICC_BASE UL(0xC4302000)
|
||||||
|
|
||||||
#define IRQ_SEC_PHY_TIMER 29
|
#define IRQ_SEC_PHY_TIMER 29
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue