diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-13 15:10:47 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-19 08:30:32 +0100 |
commit | 1f33b72b9570c57590426afdd955cbb5693f1404 (patch) | |
tree | e073a6b2313f9d44cd3e4610650371f2315062a1 /arch/arm/boards/zii-imx7d-dev/lowlevel.c | |
parent | 6f8aea97281f88e62c2e4721a7a2ede12f3f5852 (diff) | |
download | barebox-1f33b72b9570c57590426afdd955cbb5693f1404.tar.gz barebox-1f33b72b9570c57590426afdd955cbb5693f1404.tar.xz |
ARM: i.MX: Add SoC namespace to imx7/8m CCM defines
The CCM defines used on i.MX7 and i.MX8M do not have any SoC namespace.
Add it to make clear where they are supposed to be used. Since it looks
confusing to call i.MX7 specific defines on i.MX8M and vice versa,
duplicate them for both SoCs.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/boards/zii-imx7d-dev/lowlevel.c')
-rw-r--r-- | arch/arm/boards/zii-imx7d-dev/lowlevel.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boards/zii-imx7d-dev/lowlevel.c b/arch/arm/boards/zii-imx7d-dev/lowlevel.c index 83d01446b9..83fb646fd6 100644 --- a/arch/arm/boards/zii-imx7d-dev/lowlevel.c +++ b/arch/arm/boards/zii-imx7d-dev/lowlevel.c @@ -25,12 +25,12 @@ static inline void setup_uart(void) { void __iomem *ccm = IOMEM(MX7_CCM_BASE_ADDR); - writel(CCM_CCGR_SETTINGn_NEEDED(0), - ccm + CCM_CCGRn_CLR(CCM_CCGR_UART2)); - writel(CCM_TARGET_ROOTn_ENABLE | UART2_CLK_ROOT__OSC_24M, - ccm + CCM_TARGET_ROOTn(UART2_CLK_ROOT)); - writel(CCM_CCGR_SETTINGn_NEEDED(0), - ccm + CCM_CCGRn_SET(CCM_CCGR_UART2)); + writel(IMX7_CCM_CCGR_SETTINGn_NEEDED(0), + ccm + IMX7_CCM_CCGRn_CLR(IMX7_CCM_CCGR_UART2)); + writel(IMX7_CCM_TARGET_ROOTn_ENABLE | IMX7_UART2_CLK_ROOT__OSC_24M, + ccm + IMX7_CCM_TARGET_ROOTn(IMX7_UART2_CLK_ROOT)); + writel(IMX7_CCM_CCGR_SETTINGn_NEEDED(0), + ccm + IMX7_CCM_CCGRn_SET(IMX7_CCM_CCGR_UART2)); imx7_setup_pad(MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX); |