Unverified Commit 887f655e authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-clk-for-7.1' of... 

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

Pull Allwinner clk driver updates from Chen-Yu Tsai:

Just one change for this cycle, implementing support for the r-spi
module clock in the A523 PRCM block, which was somehow missing during
the initial bring-up.

* tag 'sunxi-clk-for-7.1' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi-ng: sun55i-a523-r: Add missing r-spi module clock
parents c3692998 fb20ccf7

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

+16 −1
Original line number Diff line number Diff line
@@ -83,9 +83,22 @@ static SUNXI_CCU_MUX_DATA_WITH_GATE(r_pwmctrl_clk, "r-pwmctrl", 
static SUNXI_CCU_GATE_HW(bus_r_pwmctrl_clk, "bus-r-pwmctrl",

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



/* SPI clock is /M/N (same as new MMC?) */

static const struct clk_parent_data r_spi_parents[] = {

	{ .fw_name = "hosc" },

	{ .fw_name = "pll-periph" },

	{ .name = "pll-periph0-300M" },

	{ .name = "pll-periph1-300M" },

	{ .name = "pll-audio" },

};

static SUNXI_CCU_DUALDIV_MUX_GATE(r_spi_clk, "r-spi", r_spi_parents, 0x150,

				  0, 5,		/* M */

				  8, 5,		/* P */

				  24, 3,	/* mux */

				  BIT(31),	/* gate */

				  0);

static SUNXI_CCU_GATE_HW(bus_r_spi_clk, "bus-r-spi",

			 &r_ahb_clk.common.hw, 0x15c, BIT(0), 0);



static SUNXI_CCU_GATE_HW(bus_r_spinlock_clk, "bus-r-spinlock",

			 &r_ahb_clk.common.hw, 0x16c, BIT(0), 0);

static SUNXI_CCU_GATE_HW(bus_r_msgbox_clk, "bus-r-msgbox",
@@ -138,6 +151,7 @@ static struct ccu_common *sun55i_a523_r_ccu_clks[] = { 
	&bus_r_twd_clk.common,

	&r_pwmctrl_clk.common,

	&bus_r_pwmctrl_clk.common,

	&r_spi_clk.common,

	&bus_r_spi_clk.common,

	&bus_r_spinlock_clk.common,

	&bus_r_msgbox_clk.common,
@@ -169,6 +183,7 @@ static struct clk_hw_onecell_data sun55i_a523_r_hw_clks = { 
		[CLK_BUS_R_TWD]		= &bus_r_twd_clk.common.hw,

		[CLK_R_PWMCTRL]		= &r_pwmctrl_clk.common.hw,

		[CLK_BUS_R_PWMCTRL]	= &bus_r_pwmctrl_clk.common.hw,

		[CLK_R_SPI]		= &r_spi_clk.common.hw,

		[CLK_BUS_R_SPI]		= &bus_r_spi_clk.common.hw,

		[CLK_BUS_R_SPINLOCK]	= &bus_r_spinlock_clk.common.hw,

		[CLK_BUS_R_MSGBOX]	= &bus_r_msgbox_clk.common.hw,