瀏覽代碼

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: Hans de Goede <hdegoede@redhat.com>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
Hans de Goede 10 年之前
父節點
當前提交
22b618346a
共有 1 個文件被更改,包括 1 次插入4 次删除
  1. 1 4
      arch/arm/cpu/armv7/sunxi/clock_sun6i.c

+ 1 - 4
arch/arm/cpu/armv7/sunxi/clock_sun6i.c

@@ -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)
 	/* 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)