RK3588 is using a generic CRU_BASE name for its SoC specific CRU base address constant.
Add a RK3588 SoC prefix to the CRU_BASE constant, similar to how other RK35xx CRU base address constants are named, to more easily distinguish what SoC specific CRU base address the constant refers to. Signed-off-by: Jonas Karlman <[email protected]> --- arch/arm/include/asm/arch-rockchip/cru_rk3588.h | 2 +- board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c | 2 +- board/theobroma-systems/tiger_rk3588/tiger_rk3588.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h index 85cc17840436..2723a0a36fb4 100644 --- a/arch/arm/include/asm/arch-rockchip/cru_rk3588.h +++ b/arch/arm/include/asm/arch-rockchip/cru_rk3588.h @@ -63,7 +63,7 @@ struct rk3588_pll { unsigned int reserved0[3]; }; -#define CRU_BASE 0xfd7c0000 +#define RK3588_CRU_BASE 0xfd7c0000 struct rk3588_cru { struct rk3588_pll pll[18]; diff --git a/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c b/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c index 5177aa9d6e80..840504c3f564 100644 --- a/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c +++ b/board/theobroma-systems/jaguar_rk3588/jaguar_rk3588.c @@ -31,7 +31,7 @@ void setup_eth0refclko(void) { /* Configure and enable ETH0_REFCLKO_25MHz */ static struct rk3588_bus_ioc * const bus_ioc = (void *)BUS_IOC_BASE; - static struct rk3588_cru * const cru = (void *)CRU_BASE; + static struct rk3588_cru * const cru = (void *)RK3588_CRU_BASE; /* 1. Pinmux */ rk_clrsetreg(&bus_ioc->gpio2c_iomux_sel_l, GPIO2C3_SEL_MASK, GPIO2C3_ETH0_REFCLKO_25M); diff --git a/board/theobroma-systems/tiger_rk3588/tiger_rk3588.c b/board/theobroma-systems/tiger_rk3588/tiger_rk3588.c index a6d44f10db32..55f298adfc55 100644 --- a/board/theobroma-systems/tiger_rk3588/tiger_rk3588.c +++ b/board/theobroma-systems/tiger_rk3588/tiger_rk3588.c @@ -31,7 +31,7 @@ void setup_eth0refclko(void) { /* Configure and enable ETH0_REFCLKO_25MHz */ static struct rk3588_bus_ioc * const bus_ioc = (void *)BUS_IOC_BASE; - static struct rk3588_cru * const cru = (void *)CRU_BASE; + static struct rk3588_cru * const cru = (void *)RK3588_CRU_BASE; /* 1. Pinmux */ rk_clrsetreg(&bus_ioc->gpio2c_iomux_sel_l, GPIO2C3_SEL_MASK, GPIO2C3_ETH0_REFCLKO_25M); -- 2.54.0
