diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:16 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-03-18 08:48:16 +0100 |
commit | fcad6e3394943e32bc9e08d971f2c6511a99a151 (patch) | |
tree | f8f4ad6996ef81492d49c36273ef78aac75bd781 /arch/arm/boards/zii-imx7d-dev/lowlevel.c | |
parent | 394b88e6872c607e5317cf57c61c641288555311 (diff) | |
parent | e6e12e9368f730d5e50c9495c2332abe2ad6abf0 (diff) | |
download | barebox-fcad6e3394943e32bc9e08d971f2c6511a99a151.tar.gz barebox-fcad6e3394943e32bc9e08d971f2c6511a99a151.tar.xz |
Merge branch 'for-next/imx'
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, 2 insertions, 10 deletions
diff --git a/arch/arm/boards/zii-imx7d-dev/lowlevel.c b/arch/arm/boards/zii-imx7d-dev/lowlevel.c index 3bacfd0c7d..7579a2a8a0 100644 --- a/arch/arm/boards/zii-imx7d-dev/lowlevel.c +++ b/arch/arm/boards/zii-imx7d-dev/lowlevel.c @@ -23,17 +23,9 @@ extern char __dtb_z_imx7d_zii_rmu2_start[]; static inline void setup_uart(void) { - void __iomem *iomux = IOMEM(MX7_IOMUXC_BASE_ADDR); - void __iomem *ccm = IOMEM(MX7_CCM_BASE_ADDR); + imx7_early_setup_uart_clock(); - 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)); - - mx7_setup_pad(iomux, MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX); + imx7_setup_pad(MX7D_PAD_UART2_TX_DATA__UART2_DCE_TX); imx7_uart_setup_ll(); |