Skip to content

Commit d0e8870

Browse files
committed
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Fixes for the Allwinner A523 clk driver: - Lower the minimum rate for the A523 audio PLL to support frequencies required by audio devices - Mark a couple clks critical on A523 so that Linux doesn't turn them off when they're used by other code like TF-A" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: sunxi-ng: sun55i-a523-ccu: Lower audio0 pll minimum rate clk: sunxi-ng: sun55i-a523-r-ccu: Mark bus-r-dma as critical clk: sunxi-ng: Mark A523 bus-r-cpucfg clock as critical
2 parents 1af5c1d + 3c493b5 commit d0e8870

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,11 +121,11 @@ static SUNXI_CCU_GATE_HW(bus_r_ir_rx_clk, "bus-r-ir-rx",
121121
&r_apb0_clk.common.hw, 0x1cc, BIT(0), 0);
122122

123123
static SUNXI_CCU_GATE_HW(bus_r_dma_clk, "bus-r-dma",
124-
&r_apb0_clk.common.hw, 0x1dc, BIT(0), 0);
124+
&r_apb0_clk.common.hw, 0x1dc, BIT(0), CLK_IS_CRITICAL);
125125
static SUNXI_CCU_GATE_HW(bus_r_rtc_clk, "bus-r-rtc",
126126
&r_apb0_clk.common.hw, 0x20c, BIT(0), 0);
127127
static SUNXI_CCU_GATE_HW(bus_r_cpucfg_clk, "bus-r-cpucfg",
128-
&r_apb0_clk.common.hw, 0x22c, BIT(0), 0);
128+
&r_apb0_clk.common.hw, 0x22c, BIT(0), CLK_IS_CRITICAL);
129129

130130
static struct ccu_common *sun55i_a523_r_ccu_clks[] = {
131131
&r_ahb_clk.common,

drivers/clk/sunxi-ng/ccu-sun55i-a523.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ static struct ccu_nm pll_audio0_4x_clk = {
300300
.m = _SUNXI_CCU_DIV(16, 6),
301301
.sdm = _SUNXI_CCU_SDM(pll_audio0_sdm_table, BIT(24),
302302
0x178, BIT(31)),
303-
.min_rate = 180000000U,
303+
.min_rate = 90000000U,
304304
.max_rate = 3000000000U,
305305
.common = {
306306
.reg = 0x078,

0 commit comments

Comments
 (0)