Skip to content
Snippets Groups Projects
Commit 22b61834 authored by Hans de Goede's avatar Hans de Goede
Browse files

sunxi: Drop pll6 setting from clock_init_uart


As the comment says now that we have SPL support this is no longer necessary,
as PLL6 is already setup with the exact same parameters by the SPL.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Acked-by: default avatarIan Campbell <ijc@hellion.org.uk>
parent 6515032e
No related branches found
No related tags found
No related merge requests found
...@@ -45,10 +45,10 @@ void clock_init_safe(void) ...@@ -45,10 +45,10 @@ void clock_init_safe(void)
void clock_init_uart(void) void clock_init_uart(void)
{ {
#if CONFIG_CONS_INDEX < 5
struct sunxi_ccm_reg *const ccm = struct sunxi_ccm_reg *const ccm =
(struct sunxi_ccm_reg *)SUNXI_CCM_BASE; (struct sunxi_ccm_reg *)SUNXI_CCM_BASE;
#if CONFIG_CONS_INDEX < 5
/* uart clock source is apb2 */ /* uart clock source is apb2 */
writel(APB2_CLK_SRC_OSC24M| writel(APB2_CLK_SRC_OSC24M|
APB2_CLK_RATE_N_1| APB2_CLK_RATE_N_1|
...@@ -68,9 +68,6 @@ void clock_init_uart(void) ...@@ -68,9 +68,6 @@ void clock_init_uart(void)
/* enable R_PIO and R_UART clocks, and de-assert resets */ /* enable R_PIO and R_UART clocks, and de-assert resets */
prcm_apb0_enable(PRCM_APB0_GATE_PIO | PRCM_APB0_GATE_UART); prcm_apb0_enable(PRCM_APB0_GATE_PIO | PRCM_APB0_GATE_UART);
#endif #endif
/* Dup with clock_init_safe(), drop once sun6i SPL support lands */
writel(PLL6_CFG_DEFAULT, &ccm->pll6_cfg);
} }
int clock_twi_onoff(int port, int state) int clock_twi_onoff(int port, int state)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment