Commit 88d909be authored by Rhyland Klein's avatar Rhyland Klein Committed by Thierry Reding
Browse files

clk: tegra: Modify tegra_audio_clk_init to accept more plls 



tegra_audio_clk_init was written expecting a single PLL to be
passed in directly. Change this to accept an array which will
allow for supporting multiple plls and specifying specific data
about them, like their parent, which may change over time.

Reviewed-by: default avatarBenson Leung <bleung@chromium.org>
Signed-off-by: default avatarRhyland Klein <rklein@nvidia.com>
Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent db592c4e

drivers/clk/tegra/clk-tegra-audio.c

+18 −7
Original line number Diff line number Diff line
@@ -125,19 +125,30 @@ static struct tegra_audio2x_clk_initdata audio2x_clks[] = { 


void __init tegra_audio_clk_init(void __iomem *clk_base,

			void __iomem *pmc_base, struct tegra_clk *tegra_clks,

			struct tegra_clk_pll_params *pll_a_params)

			struct tegra_audio_clk_info *audio_info,

			unsigned int num_plls)

{

	struct clk *clk;

	struct clk **dt_clk;

	int i;



	/* PLLA */

	dt_clk = tegra_lookup_dt_id(tegra_clk_pll_a, tegra_clks);

	if (!audio_info || num_plls < 1) {

		pr_err("No audio data passed to tegra_audio_clk_init\n");

		WARN_ON(1);

		return;

	}



	for (i = 0; i < num_plls; i++) {

		struct tegra_audio_clk_info *info = &audio_info[i];



		dt_clk = tegra_lookup_dt_id(info->clk_id, tegra_clks);

		if (dt_clk) {

		clk = tegra_clk_register_pll("pll_a", "pll_p_out1", clk_base,

				pmc_base, 0, pll_a_params, NULL);

			clk = tegra_clk_register_pll(info->name, info->parent,

					clk_base, pmc_base, 0, info->pll_params,

					NULL);

			*dt_clk = clk;

		}

	}



	/* PLLA_OUT0 */

	dt_clk = tegra_lookup_dt_id(tegra_clk_pll_a_out0, tegra_clks);

drivers/clk/tegra/clk-tegra114.c

+7 −1
Original line number Diff line number Diff line
@@ -933,6 +933,10 @@ static u32 mux_pllm_pllc2_c_c3_pllp_plla_idx[] = { 
	[0] = 0, [1] = 1, [2] = 2, [3] = 3, [4] = 4, [5] = 6,

};



static struct tegra_audio_clk_info tegra114_audio_plls[] = {

	{ "pll_a", &pll_a_params, tegra_clk_pll_a, "pll_p_out1" },

};



static struct clk **clks;



static unsigned long osc_freq;
@@ -1481,7 +1485,9 @@ static void __init tegra114_clock_init(struct device_node *np) 
	tegra114_fixed_clk_init(clk_base);

	tegra114_pll_init(clk_base, pmc_base);

	tegra114_periph_clk_init(clk_base, pmc_base);

	tegra_audio_clk_init(clk_base, pmc_base, tegra114_clks, &pll_a_params);

	tegra_audio_clk_init(clk_base, pmc_base, tegra114_clks,

			     tegra114_audio_plls,

			     ARRAY_SIZE(tegra114_audio_plls));

	tegra_pmc_clk_init(pmc_base, tegra114_clks);

	tegra_super_clk_gen4_init(clk_base, pmc_base, tegra114_clks,

					&pll_x_params);

drivers/clk/tegra/clk-tegra124.c

+7 −1
Original line number Diff line number Diff line
@@ -1417,6 +1417,10 @@ static struct tegra_clk_init_table tegra132_init_table[] __initdata = { 
	{TEGRA124_CLK_CLK_MAX, TEGRA124_CLK_CLK_MAX, 0, 0},

};



static struct tegra_audio_clk_info tegra124_audio_plls[] = {

	{ "pll_a", &pll_a_params, tegra_clk_pll_a, "pll_p_out1" },

};



/**

 * tegra124_clock_apply_init_table - initialize clocks on Tegra124 SoCs

 *
@@ -1555,7 +1559,9 @@ static void __init tegra124_132_clock_init_pre(struct device_node *np) 
	tegra_fixed_clk_init(tegra124_clks);

	tegra124_pll_init(clk_base, pmc_base);

	tegra124_periph_clk_init(clk_base, pmc_base);

	tegra_audio_clk_init(clk_base, pmc_base, tegra124_clks, &pll_a_params);

	tegra_audio_clk_init(clk_base, pmc_base, tegra124_clks,

			     tegra124_audio_plls,

			     ARRAY_SIZE(tegra124_audio_plls));

	tegra_pmc_clk_init(pmc_base, tegra124_clks);



	/* For Tegra124 & Tegra132, PLLD is the only source for DSIA & DSIB */

drivers/clk/tegra/clk-tegra30.c

+7 −1
Original line number Diff line number Diff line
@@ -1405,6 +1405,10 @@ static const struct of_device_id pmc_match[] __initconst = { 
	{},

};



static struct tegra_audio_clk_info tegra30_audio_plls[] = {

	{ "pll_a", &pll_a_params, tegra_clk_pll_a, "pll_p_out1" },

};



static void __init tegra30_clock_init(struct device_node *np)

{

	struct device_node *node;
@@ -1442,7 +1446,9 @@ static void __init tegra30_clock_init(struct device_node *np) 
	tegra30_pll_init();

	tegra30_super_clk_init();

	tegra30_periph_clk_init();

	tegra_audio_clk_init(clk_base, pmc_base, tegra30_clks, &pll_a_params);

	tegra_audio_clk_init(clk_base, pmc_base, tegra30_clks,

			     tegra30_audio_plls,

			     ARRAY_SIZE(tegra30_audio_plls));

	tegra_pmc_clk_init(pmc_base, tegra30_clks);



	tegra_init_dup_clks(tegra_clk_duplicates, clks, TEGRA30_CLK_CLK_MAX);

drivers/clk/tegra/clk.h

+17 −1
Original line number Diff line number Diff line
@@ -270,6 +270,21 @@ struct tegra_clk_pll { 


#define to_clk_pll(_hw) container_of(_hw, struct tegra_clk_pll, hw)



/**

 * struct tegra_audio_clk_info - Tegra Audio Clk Information

 *

 * @name:	name for the audio pll

 * @pll_params:	pll_params for audio pll

 * @clk_id:	clk_ids for the audio pll

 * @parent:	name of the parent of the audio pll

 */

struct tegra_audio_clk_info {

	char *name;

	struct tegra_clk_pll_params *pll_params;

	int clk_id;

	char *parent;

};



extern const struct clk_ops tegra_clk_pll_ops;

extern const struct clk_ops tegra_clk_plle_ops;

struct clk *tegra_clk_register_pll(const char *name, const char *parent_name,
@@ -622,7 +637,8 @@ void tegra_register_devclks(struct tegra_devclk *dev_clks, int num); 


void tegra_audio_clk_init(void __iomem *clk_base,

			void __iomem *pmc_base, struct tegra_clk *tegra_clks,

			struct tegra_clk_pll_params *pll_params);

			struct tegra_audio_clk_info *audio_info,

			unsigned int num_plls);



void tegra_periph_clk_init(void __iomem *clk_base, void __iomem *pmc_base,

			struct tegra_clk *tegra_clks,

CRA Git | Maintained and supported by SUSTech CRA and CCSE