Unverified Commit 3c493b52 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-fixes-for-6.18' of... 

Merge tag 'sunxi-clk-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

Pull Allwinner clk driver fixes from Chen-Yu Tsai:

Just a couple fixes for the A523 family. A couple clocks are marked as
critical, and the lower bound of the audio PLL was lowered to match
the datasheet.

* tag 'sunxi-clk-fixes-for-6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/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 3a866087 2050280a

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,