]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock
authorPaul Cercueil <paul@crapouillou.net>
Sun, 20 May 2018 16:31:16 +0000 (16:31 +0000)
committerStephen Boyd <sboyd@kernel.org>
Sat, 2 Jun 2018 06:21:33 +0000 (23:21 -0700)
This was broken before, because the AHB1 bus was enabled before the VPU
clock was ungated, while it must be done afterwards.

Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/clk/ingenic/jz4770-cgu.c

index a5ad69464e57094e1357bb64ea492f3730330c4e..314f3143ca61176fd5cfbc2aa57453fe35247ce9 100644 (file)
@@ -154,7 +154,7 @@ static const struct ingenic_cgu_clk_info jz4770_cgu_clocks[] = {
                "h1clk", CGU_CLK_DIV | CGU_CLK_GATE,
                .parents = { JZ4770_CLK_PLL0, },
                .div = { CGU_REG_CPCCR, 24, 1, 4, 22, -1, -1 },
-               .gate = { CGU_REG_LCR, 30 },
+               .gate = { CGU_REG_CLKGR1, 7 },
        },
        [JZ4770_CLK_H2CLK] = {
                "h2clk", CGU_CLK_DIV,
@@ -362,7 +362,7 @@ static const struct ingenic_cgu_clk_info jz4770_cgu_clocks[] = {
        [JZ4770_CLK_VPU] = {
                "vpu", CGU_CLK_GATE,
                .parents = { JZ4770_CLK_H1CLK, },
-               .gate = { CGU_REG_CLKGR1, 7 },
+               .gate = { CGU_REG_LCR, 30 },
        },
        [JZ4770_CLK_MMC0] = {
                "mmc0", CGU_CLK_GATE,