diff options
| author | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-07-11 12:42:00 +0100 |
|---|---|---|
| committer | Bryan O'Donoghue <bryan.odonoghue@linaro.org> | 2019-08-06 15:14:48 +0100 |
| commit | 1bfd36b39414309277a1275dc16eb8ce4fae2aaf (patch) | |
| tree | c4a3e749d7df3691e218bee3bc7e215ce7641c2d /plat/imx/imx7/picopi/picopi_bl2_el3_setup.c | |
| parent | 9638584fdb4f5d7aa3f5b554f305509d77c68cde (diff) | |
plat: imx7: imx7_clock: Aggregate imx7 clocks into one file
Previous patches split up the imx7 clock layer into different pieces in
expectation that some of those pieces would be reusable across different
SoC architectures.
When implementing the i.MX6UL clock layer though its obvious that the
clocking structure is quite different between the different SoC
architectures, so, it makes sense to conglomerate the i.MX7 stuff into an
i.MX7 specific set of files.
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Diffstat (limited to 'plat/imx/imx7/picopi/picopi_bl2_el3_setup.c')
| -rw-r--r-- | plat/imx/imx7/picopi/picopi_bl2_el3_setup.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c b/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c index 76c32244c..fc32b91c1 100644 --- a/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c +++ b/plat/imx/imx7/picopi/picopi_bl2_el3_setup.c @@ -19,7 +19,7 @@ #include <lib/xlat_tables/xlat_tables_defs.h> #include <imx_aips.h> #include <imx_caam.h> -#include <imx_clock.h> +#include <imx7_clock.h> #include <imx_csu.h> #include <imx_gpt.h> #include <imx_io_mux.h> @@ -221,22 +221,22 @@ static void picopi_setup_wdog_clocks(void) { uint32_t wdog_en_bits = (uint32_t)WDOG_CLK_SELECT; - imx_clock_set_wdog_clk_root_bits(wdog_en_bits); - imx_clock_enable_wdog(0); - imx_clock_enable_wdog(1); - imx_clock_enable_wdog(2); - imx_clock_enable_wdog(3); + imx7_clock_set_wdog_clk_root_bits(wdog_en_bits); + imx7_clock_enable_wdog(0); + imx7_clock_enable_wdog(1); + imx7_clock_enable_wdog(2); + imx7_clock_enable_wdog(3); } static void picopi_setup_usb_clocks(void) { uint32_t usb_en_bits = (uint32_t)USB_CLK_SELECT; - imx_clock_set_usb_clk_root_bits(usb_en_bits); - imx_clock_enable_usb(CCM_CCGR_ID_USB_IPG); - imx_clock_enable_usb(CCM_CCGR_ID_USB_PHY_480MCLK); - imx_clock_enable_usb(CCM_CCGR_ID_USB_OTG1_PHY); - imx_clock_enable_usb(CCM_CCGR_ID_USB_OTG2_PHY); + imx7_clock_set_usb_clk_root_bits(usb_en_bits); + imx7_clock_enable_usb(CCM_CCGR_ID_USB_IPG); + imx7_clock_enable_usb(CCM_CCGR_ID_USB_PHY_480MCLK); + imx7_clock_enable_usb(CCM_CCGR_ID_USB_OTG1_PHY); + imx7_clock_enable_usb(CCM_CCGR_ID_USB_OTG2_PHY); } /* * bl2_el3_early_platform_setup() @@ -257,9 +257,9 @@ void bl2_el3_early_platform_setup(u_register_t arg1, u_register_t arg2, imx_gpt_ops_init(GPT1_BASE_ADDR); /* Initialize clocks, regulators, pin-muxes etc */ - imx_clock_init(); - imx_clock_enable_uart(4, uart5_en_bits); - imx_clock_enable_usdhc(usdhc_clock_sel, USDHC_CLK_SELECT); + imx7_clock_init(); + imx7_clock_enable_uart(4, uart5_en_bits); + imx7_clock_enable_usdhc(usdhc_clock_sel, USDHC_CLK_SELECT); picopi_setup_system_counter(); picopi_setup_wdog_clocks(); picopi_setup_usb_clocks(); |