Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f925a054 authored by Stephen Boyd's avatar Stephen Boyd
Browse files

Merge tag 'sunxi-ng-parent-rewrite-part-1-take-2' of... 

Merge tag 'sunxi-ng-parent-rewrite-part-1-take-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-allwinner

Pull Allwinner sunxi-ng clk driver parent relation rewrite part 1 - take 2
from Chen-Yu Tsai:

"The first part of ongoing work to convert the sunxi-ng clk driver from
using global clock name strings to describe clk parenting, to having
direct struct clk_hw pointers, or local names based on clock-names from
the device tree binding.

This is based on Stephen Boyd's recent work allowing clk drivers to
specify clk parents using struct clk_hw * or parsing DT phandles in the
clk node.

This series can be split into a few major parts:

1) The first patch is a small fix for clk debugfs representation.

2) A bunch of CLK_HW_INIT_* helper macros are added. These cover the
   situations I encountered, or assume I will encounter, such as single
   internal (struct clk_hw *) parent, single DT (struct clk_parent_data
   .fw_name), multiple internal parents, and multiple mixed (internal +
   DT) parents. A special variant for just an internal single parent is
   added, CLK_HW_INIT_HWS, which lets the driver share the singular
   list, instead of having the compiler create a compound literal every
   time. It might even make sense to only keep this variant.

3) A bunch of CLK_FIXED_FACTOR_* helper macros are added. The rationale
   is the same as the single parent CLK_HW_INIT_* helpers.

4) Bulk conversion of CLK_FIXED_FACTOR to use local parent references,
   either struct clk_hw * or DT .fw_name types, whichever the hardware
   requires.

5) The beginning of SUNXI_CCU_GATE conversion to local parent
   references. This part is not done. They are included as justification
   and examples for the shared list of clk parents case."

* tag 'sunxi-ng-parent-rewrite-part-1-take-2' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux: (25 commits)
  clk: sunxi-ng: sun8i-r: Use local parent references for SUNXI_CCU_GATE
  clk: sunxi-ng: a80-usb: Use local parent references for SUNXI_CCU_GATE
  clk: sunxi-ng: gate: Add macros for referencing local clock parents
  clk: sunxi-ng: h6-r: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: h6: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: a64: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: f1c100s: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: sun8i-r: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: v3s: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: r40: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: h3: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: a33: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: a23: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: a31: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: sun5i: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: a10: Use local parent references for CLK_FIXED_FACTOR
  clk: sunxi-ng: sun8i-r: Use local parent references for CLK_HW_INIT_*
  clk: sunxi-ng: switch to of_clk_hw_register() for registering clks
  clk: fixed-factor: Add CLK_FIXED_FACTOR_FW_NAME for DT clock-names parent
  clk: fixed-factor: Add CLK_FIXED_FACTOR_HWS which takes list of struct clk_hw *
  ...
parents b2f874d2 89f27fb2

drivers/clk/clk.c

+41 −3
Original line number Diff line number Diff line
@@ -3000,12 +3000,50 @@ DEFINE_SHOW_ATTRIBUTE(clk_flags); 
static int possible_parents_show(struct seq_file *s, void *data)

{

	struct clk_core *core = s->private;

	struct clk_core *parent;

	int i;



	for (i = 0; i < core->num_parents - 1; i++)

	/*

	 * Go through the following options to fetch a parent's name.

	 *

	 * 1. Fetch the registered parent clock and use its name

	 * 2. Use the global (fallback) name if specified

	 * 3. Use the local fw_name if provided

	 * 4. Fetch parent clock's clock-output-name if DT index was set

	 *

	 * This may still fail in some cases, such as when the parent is

	 * specified directly via a struct clk_hw pointer, but it isn't

	 * registered (yet).

	 */

	for (i = 0; i < core->num_parents - 1; i++) {

		parent = clk_core_get_parent_by_index(core, i);

		if (parent)

			seq_printf(s, "%s ", parent->name);

		else if (core->parents[i].name)

			seq_printf(s, "%s ", core->parents[i].name);

		else if (core->parents[i].fw_name)

			seq_printf(s, "<%s>(fw) ", core->parents[i].fw_name);

		else if (core->parents[i].index >= 0)

			seq_printf(s, "%s ",

				   of_clk_get_parent_name(core->of_node,

							  core->parents[i].index));

		else

			seq_puts(s, "(missing) ");

	}



	seq_printf(s, "%s\n", core->parents[i].name);

	parent = clk_core_get_parent_by_index(core, i);

	if (parent)

		seq_printf(s, "%s", parent->name);

	else if (core->parents[i].name)

		seq_printf(s, "%s", core->parents[i].name);

	else if (core->parents[i].fw_name)

		seq_printf(s, "<%s>(fw)", core->parents[i].fw_name);

	else if (core->parents[i].index >= 0)

		seq_printf(s, "%s",

			   of_clk_get_parent_name(core->of_node,

						  core->parents[i].index));

	else

		seq_puts(s, "(missing)");



	return 0;

}

drivers/clk/sunxi-ng/ccu-sun4i-a10.c

+25 −14
Original line number Diff line number Diff line
@@ -168,7 +168,8 @@ static struct ccu_nk pll_periph_base_clk = { 
	},

};



static CLK_FIXED_FACTOR(pll_periph_clk, "pll-periph", "pll-periph-base",

static CLK_FIXED_FACTOR_HW(pll_periph_clk, "pll-periph",

			   &pll_periph_base_clk.common.hw,

			   2, 1, CLK_SET_RATE_PARENT);



/* Not documented on A10 */
@@ -1036,19 +1037,29 @@ static struct ccu_common *sun4i_sun7i_ccu_clks[] = { 
	&out_b_clk.common

};



static const struct clk_hw *clk_parent_pll_audio[] = {

	&pll_audio_base_clk.common.hw

};



/* Post-divider for pll-audio is hardcoded to 1 */

static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",

			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",

			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_video0_2x_clk, "pll-video0-2x",

			"pll-video0", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_video1_2x_clk, "pll-video1-2x",

			"pll-video1", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_clk, "pll-audio",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_2x_clk, "pll-audio-2x",

			    clk_parent_pll_audio,

			    2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_4x_clk, "pll-audio-4x",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_8x_clk, "pll-audio-8x",

			    clk_parent_pll_audio,

			    1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HW(pll_video0_2x_clk, "pll-video0-2x",

			   &pll_video0_clk.common.hw,

			   1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HW(pll_video1_2x_clk, "pll-video1-2x",

			   &pll_video1_clk.common.hw,

			   1, 2, CLK_SET_RATE_PARENT);





static struct clk_hw_onecell_data sun4i_a10_hw_clks = {

drivers/clk/sunxi-ng/ccu-sun50i-a64.c

+26 −15
Original line number Diff line number Diff line
@@ -605,23 +605,34 @@ static SUNXI_CCU_M_WITH_GATE(gpu_clk, "gpu", "pll-gpu", 
			     0x1a0, 0, 3, BIT(31), CLK_SET_RATE_PARENT);



/* Fixed Factor clocks */

static CLK_FIXED_FACTOR(osc12M_clk, "osc12M", "osc24M", 2, 1, 0);

static CLK_FIXED_FACTOR_FW_NAME(osc12M_clk, "osc12M", "hosc", 2, 1, 0);



static const struct clk_hw *clk_parent_pll_audio[] = {

	&pll_audio_base_clk.common.hw

};



/* We hardcode the divider to 1 for now */

static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",

			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",

			"pll-audio-base", 1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_8x_clk, "pll-audio-8x",

			"pll-audio-base", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x",

			"pll-periph0", 1, 2, 0);

static CLK_FIXED_FACTOR(pll_periph1_2x_clk, "pll-periph1-2x",

			"pll-periph1", 1, 2, 0);

static CLK_FIXED_FACTOR(pll_video0_2x_clk, "pll-video0-2x",

			"pll-video0", 1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_clk, "pll-audio",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_2x_clk, "pll-audio-2x",

			    clk_parent_pll_audio,

			    2, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_4x_clk, "pll-audio-4x",

			    clk_parent_pll_audio,

			    1, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_8x_clk, "pll-audio-8x",

			    clk_parent_pll_audio,

			    1, 2, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HW(pll_periph0_2x_clk, "pll-periph0-2x",

			   &pll_periph0_clk.common.hw,

			   1, 2, 0);

static CLK_FIXED_FACTOR_HW(pll_periph1_2x_clk, "pll-periph1-2x",

			   &pll_periph1_clk.common.hw,

			   1, 2, 0);

static CLK_FIXED_FACTOR_HW(pll_video0_2x_clk, "pll-video0-2x",

			   &pll_video0_clk.common.hw,

			   1, 2, CLK_SET_RATE_PARENT);



static struct ccu_common *sun50i_a64_ccu_clks[] = {

	&pll_cpux_clk.common,

drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ static struct ccu_div ar100_clk = { 
	},

};



static CLK_FIXED_FACTOR(r_ahb_clk, "r-ahb", "ar100", 1, 1, 0);

static CLK_FIXED_FACTOR_HW(r_ahb_clk, "r-ahb", &ar100_clk.common.hw, 1, 1, 0);



static struct ccu_div r_apb1_clk = {

	.div		= _SUNXI_CCU_DIV(0, 2),

drivers/clk/sunxi-ng/ccu-sun50i-h6.c

+44 −25
Original line number Diff line number Diff line
@@ -622,8 +622,9 @@ static SUNXI_CCU_GATE(bus_xhci_clk, "bus-xhci", "ahb3", 0xa8c, BIT(5), 0); 
static SUNXI_CCU_GATE(bus_ehci3_clk, "bus-ehci3", "ahb3", 0xa8c, BIT(7), 0);

static SUNXI_CCU_GATE(bus_otg_clk, "bus-otg", "ahb3", 0xa8c, BIT(8), 0);



static CLK_FIXED_FACTOR(pcie_ref_100m_clk, "pcie-ref-100M",

			"pll-periph0-4x", 24, 1, 0);

static struct clk_fixed_factor pll_periph0_4x_clk;

static CLK_FIXED_FACTOR_HW(pcie_ref_100m_clk, "pcie-ref-100M",

			   &pll_periph0_4x_clk.hw, 24, 1, 0);

static SUNXI_CCU_GATE(pcie_ref_clk, "pcie-ref", "pcie-ref-100M",

		      0xab0, BIT(31), 0);

static SUNXI_CCU_GATE(pcie_ref_out_clk, "pcie-ref-out", "pcie-ref",
@@ -745,34 +746,52 @@ static SUNXI_CCU_M_WITH_MUX_GATE(hdcp_clk, "hdcp", hdcp_parents, 0xc40, 
static SUNXI_CCU_GATE(bus_hdcp_clk, "bus-hdcp", "ahb3", 0xc4c, BIT(0), 0);



/* Fixed factor clocks */

static CLK_FIXED_FACTOR(osc12M_clk, "osc12M", "osc24M", 2, 1, 0);

static CLK_FIXED_FACTOR_FW_NAME(osc12M_clk, "osc12M", "hosc", 2, 1, 0);



static const struct clk_hw *clk_parent_pll_audio[] = {

	&pll_audio_base_clk.common.hw

};



/*

 * The divider of pll-audio is fixed to 8 now, as pll-audio-4x has a

 * fixed post-divider 2.

 */

static CLK_FIXED_FACTOR(pll_audio_clk, "pll-audio",

			"pll-audio-base", 8, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_2x_clk, "pll-audio-2x",

			"pll-audio-base", 4, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR(pll_audio_4x_clk, "pll-audio-4x",

			"pll-audio-base", 2, 1, CLK_SET_RATE_PARENT);



static CLK_FIXED_FACTOR(pll_periph0_4x_clk, "pll-periph0-4x",

			"pll-periph0", 1, 4, 0);

static CLK_FIXED_FACTOR(pll_periph0_2x_clk, "pll-periph0-2x",

			"pll-periph0", 1, 2, 0);



static CLK_FIXED_FACTOR(pll_periph1_4x_clk, "pll-periph1-4x",

			"pll-periph1", 1, 4, 0);

static CLK_FIXED_FACTOR(pll_periph1_2x_clk, "pll-periph1-2x",

			"pll-periph1", 1, 2, 0);



static CLK_FIXED_FACTOR(pll_video0_4x_clk, "pll-video0-4x",

			"pll-video0", 1, 4, CLK_SET_RATE_PARENT);



static CLK_FIXED_FACTOR(pll_video1_4x_clk, "pll-video1-4x",

			"pll-video1", 1, 4, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_clk, "pll-audio",

			    clk_parent_pll_audio,

			    8, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_2x_clk, "pll-audio-2x",

			    clk_parent_pll_audio,

			    4, 1, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HWS(pll_audio_4x_clk, "pll-audio-4x",

			    clk_parent_pll_audio,

			    2, 1, CLK_SET_RATE_PARENT);



static const struct clk_hw *pll_periph0_parents[] = {

	&pll_periph0_clk.common.hw

};

static CLK_FIXED_FACTOR_HWS(pll_periph0_4x_clk, "pll-periph0-4x",

			    pll_periph0_parents,

			    1, 4, 0);

static CLK_FIXED_FACTOR_HWS(pll_periph0_2x_clk, "pll-periph0-2x",

			    pll_periph0_parents,

			    1, 2, 0);



static const struct clk_hw *pll_periph1_parents[] = {

	&pll_periph1_clk.common.hw

};

static CLK_FIXED_FACTOR_HWS(pll_periph1_4x_clk, "pll-periph1-4x",

			    pll_periph1_parents,

			    1, 4, 0);

static CLK_FIXED_FACTOR_HWS(pll_periph1_2x_clk, "pll-periph1-2x",

			    pll_periph1_parents,

			    1, 2, 0);



static CLK_FIXED_FACTOR_HW(pll_video0_4x_clk, "pll-video0-4x",

			   &pll_video0_clk.common.hw,

			   1, 4, CLK_SET_RATE_PARENT);

static CLK_FIXED_FACTOR_HW(pll_video1_4x_clk, "pll-video1-4x",

			   &pll_video1_clk.common.hw,

			   1, 4, CLK_SET_RATE_PARENT);



static struct ccu_common *sun50i_h6_ccu_clks[] = {

	&pll_cpux_clk.common,