mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 03:27:44 -04:00
Tegra clk updates for 3.18
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQIcBAABAgAGBQJUHBvYAAoJEFFb18rurjwTyaoP/37XBxRXfN2mL+WroUC7rb4m qb7PKg0RTOjjWV6Dp2EzmXThxsy0sGRpML9ZNp6LYIqPOH4sBHNeRK0+Qf1dB1XZ /DySj4oqEgJ+x8GHTqceM5x4C5fwDrF4sl5uacYIZcA42ih3nY331zlJaNPpkSpx iP91SJsQghK9OpdnOTl8oOV9p6PIjFfn712GPIRL7PBIBkVswdkJHufozzvcX+mI O30/FGEGbQCmCs1pFXufFNwJQcOy0qK5zyZPhGbzyji9gkCXz4OQOqWLdE1kXbWY CDfolp0Xdr+hLN/6YkQBEkZSjvKzLZf8OOYmVsXWXplVDjLf9/2p/Kq33p8JGKUa R8BC17MtmKjNgJ7g0Zo870meRWDcsLOfr60Wu4MIhzSJKSVDp6oq0ZqYay10/ZuF iMv49Mcpbgl4d0D6DgJztMPYwQZrMOkTLByGo+s/UxB+gY2XtvUO/6mPchYfhYUX M7y28Im4j5pmTKw5WhulfDWTBUPul8tvqGLdB4i9zKOA0iszby7pnGzjKfZd4RYg FD5Byzd225X92R/kKxWPTv4SQBM7flVkfvJLbOV2SiedoCHcyLXJjtSgaFlE3XYY gUt9uqM5cwiw6hwPVzP1su02419L6cZYkCWOlVMNlMZ3fjd6js6NUtNjxH30tU7H TrwJ4tAYaIkuTw0jBnFE =WIPU -----END PGP SIGNATURE----- Merge tag 'tegra-clk-3.18' of git://nv-tegra.nvidia.com/user/pdeschrijver/linux into clk-next Tegra clk updates for 3.18
This commit is contained in:
commit
b6b2fe5b6e
482 changed files with 5432 additions and 2806 deletions
|
|
@ -1166,6 +1166,12 @@ static void __init tegra124_pll_init(void __iomem *clk_base,
|
|||
clk_register_clkdev(clk, "pll_c_out1", NULL);
|
||||
clks[TEGRA124_CLK_PLL_C_OUT1] = clk;
|
||||
|
||||
/* PLLC_UD */
|
||||
clk = clk_register_fixed_factor(NULL, "pll_c_ud", "pll_c",
|
||||
CLK_SET_RATE_PARENT, 1, 1);
|
||||
clk_register_clkdev(clk, "pll_c_ud", NULL);
|
||||
clks[TEGRA124_CLK_PLL_C_UD] = clk;
|
||||
|
||||
/* PLLC2 */
|
||||
clk = tegra_clk_register_pllc("pll_c2", "pll_ref", clk_base, pmc, 0,
|
||||
&pll_c2_params, NULL);
|
||||
|
|
@ -1198,6 +1204,8 @@ static void __init tegra124_pll_init(void __iomem *clk_base,
|
|||
/* PLLM_UD */
|
||||
clk = clk_register_fixed_factor(NULL, "pll_m_ud", "pll_m",
|
||||
CLK_SET_RATE_PARENT, 1, 1);
|
||||
clk_register_clkdev(clk, "pll_m_ud", NULL);
|
||||
clks[TEGRA124_CLK_PLL_M_UD] = clk;
|
||||
|
||||
/* PLLU */
|
||||
val = readl(clk_base + pll_u_params.base_reg);
|
||||
|
|
|
|||
|
|
@ -207,8 +207,13 @@ void __init tegra_init_from_table(struct tegra_clk_init_table *tbl,
|
|||
|
||||
for (; tbl->clk_id < clk_max; tbl++) {
|
||||
clk = clks[tbl->clk_id];
|
||||
if (IS_ERR_OR_NULL(clk))
|
||||
return;
|
||||
if (IS_ERR_OR_NULL(clk)) {
|
||||
pr_err("%s: invalid entry %ld in clks array for id %d\n",
|
||||
__func__, PTR_ERR(clk), tbl->clk_id);
|
||||
WARN_ON(1);
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
if (tbl->parent_id < clk_max) {
|
||||
struct clk *parent = clks[tbl->parent_id];
|
||||
|
|
|
|||
Loading…
Reference in a new issue