Signed-off-by: Leo Yan leo.yan@linaro.org --- plat/hikey/pll.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/plat/hikey/pll.c b/plat/hikey/pll.c index 20f7a5a..ed007b9 100644 --- a/plat/hikey/pll.c +++ b/plat/hikey/pll.c @@ -45,7 +45,6 @@ static void init_pll(void) { unsigned int data;
- data = mmio_read_32((0xf7032000 + 0x000)); data |= 0x1; mmio_write_32((0xf7032000 + 0x000), data); @@ -54,7 +53,6 @@ static void init_pll(void) data = mmio_read_32((0xf7032000 + 0x000)); } while (!(data & (1 << 28)));
- data = mmio_read_32((0xf7800000 + 0x000)); data &= ~0x007; data |= 0x004; @@ -1061,17 +1059,17 @@ static void reset_mmc0_clk(void) unsigned int data;
/* disable mmc0 bus clock */ - mmio_write_32(PERI_SC_PERIPH_CLKDIS0, PERI_CLK_MMC0); + mmio_write_32(PERI_SC_PERIPH_CLKDIS0, PERI_CLK0_MMC0); do { data = mmio_read_32(PERI_SC_PERIPH_CLKSTAT0); - } while (data & PERI_CLK_MMC0); + } while (data & PERI_CLK0_MMC0); /* enable mmc0 bus clock */ - mmio_write_32(PERI_SC_PERIPH_CLKEN0, PERI_CLK_MMC0); + mmio_write_32(PERI_SC_PERIPH_CLKEN0, PERI_CLK0_MMC0); do { data = mmio_read_32(PERI_SC_PERIPH_CLKSTAT0); - } while (!(data & PERI_CLK_MMC0)); + } while (!(data & PERI_CLK0_MMC0)); /* reset mmc0 clock domain */ - mmio_write_32(PERI_SC_PERIPH_RSTEN0, PERI_CLK_MMC0); + mmio_write_32(PERI_SC_PERIPH_RSTEN0, PERI_RST0_MMC0);
/* bypass mmc0 clock phase */ data = mmio_read_32(PERI_SC_PERIPH_CTRL2); @@ -1115,7 +1113,10 @@ static void init_media_clk(void)
void hi6220_pll_init(void) { + init_hkadc(); + init_boardid(); init_pll(); + init_acpu_dvfs(); init_freq(); init_ddr(); init_ddrc_qos();