Commit d0e88704 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 1af5c1d3 3c493b52

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

+2 −2
Original line number Diff line number Diff line
@@ -121,11 +121,11 @@ static SUNXI_CCU_GATE_HW(bus_r_ir_rx_clk, "bus-r-ir-rx", 
			 &r_apb0_clk.common.hw, 0x1cc, BIT(0), 0);



static SUNXI_CCU_GATE_HW(bus_r_dma_clk, "bus-r-dma",

			 &r_apb0_clk.common.hw, 0x1dc, BIT(0), 0);

			 &r_apb0_clk.common.hw, 0x1dc, BIT(0), CLK_IS_CRITICAL);

static SUNXI_CCU_GATE_HW(bus_r_rtc_clk, "bus-r-rtc",

			 &r_apb0_clk.common.hw, 0x20c, BIT(0), 0);

static SUNXI_CCU_GATE_HW(bus_r_cpucfg_clk, "bus-r-cpucfg",

			 &r_apb0_clk.common.hw, 0x22c, BIT(0), 0);

			 &r_apb0_clk.common.hw, 0x22c, BIT(0), CLK_IS_CRITICAL);



static struct ccu_common *sun55i_a523_r_ccu_clks[] = {

	&r_ahb_clk.common,

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

+1 −1
Original line number Diff line number Diff line
@@ -300,7 +300,7 @@ static struct ccu_nm pll_audio0_4x_clk = { 
	.m		= _SUNXI_CCU_DIV(16, 6),

	.sdm		= _SUNXI_CCU_SDM(pll_audio0_sdm_table, BIT(24),

					 0x178, BIT(31)),

	.min_rate	= 180000000U,

	.min_rate	= 90000000U,

	.max_rate	= 3000000000U,

	.common		= {

		.reg		= 0x078,