Re: [PATCH v3 11/19] clk: tegra: move periph clocks to common file

[Stephen Warren]

On 10/15/2013 08:52 AM, Peter De Schrijver wrote:
> Introduce a new file for peripheral clocks common between several Tegra
> SoCs and move Tegra114 to this new infrastructure. Also PLLP and the PLLP_OUT
> clocks will be initialized here.

> diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c

> @@ -966,22 +699,22 @@ static struct tegra_clk tegra114_clks[tegra_clk_max] __initdata = {
>  	[tegra_clk_pwm] = { .dt_id = TEGRA114_CLK_PWM, .present = true },
>  	[tegra_clk_i2s0] = { .dt_id = TEGRA114_CLK_I2S0, .present = true },
>  	[tegra_clk_i2s2] = { .dt_id = TEGRA114_CLK_I2S2, .present = true },
> -	[tegra_clk_epp] = { .dt_id = TEGRA114_CLK_EPP, .present = true },
> -	[tegra_clk_gr2d] = { .dt_id = TEGRA114_CLK_GR2D, .present = true },
> +	[tegra_clk_epp_8] = { .dt_id = TEGRA114_CLK_EPP, .present = true },
> +	[tegra_clk_gr2d_8] = { .dt_id = TEGRA114_CLK_GR2D, .present = true },
>  	[tegra_clk_usbd] = { .dt_id = TEGRA114_CLK_USBD, .present = true },
>  	[tegra_clk_isp] = { .dt_id = TEGRA114_CLK_ISP, .present = true },
> -	[tegra_clk_gr3d] = { .dt_id = TEGRA114_CLK_GR3D, .present = true },
> +	[tegra_clk_gr3d_8] = { .dt_id = TEGRA114_CLK_GR3D, .present = true },
...

Why the need to edit this table in this patch? Why not just get it right
in the previous patch, where it's first added?

> @@ -2166,9 +1606,10 @@ 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);
> +	tegra114_periph_clk_init(clk_base, pmc_base);
>  	tegra_audio_clk_init(clk_base, pmc_base, tegra114_clks, &pll_a_params);
>  	tegra114_pmc_clk_init(pmc_base);
> +
>  	tegra114_super_clk_init(clk_base);

That seems like an unrelated whitespace change. There's one in the
previous patch too:

> @@ -502,7 +492,6 @@ static struct tegra_clk_pll_freq_table pll_a_freq_table[] = {
>  	{0, 0, 0, 0, 0, 0},
>  };
>  
> -
>  static struct tegra_clk_pll_params pll_a_params = {
>  	.input_min = 2000000,
>  	.input_max = 31000000,

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/