Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

clk: tegra: Remove CLK_IS_ROOT

This flag is a no-op now. Remove usage of the flag.

Acked-by: Rhyland Klein <rklein@nvidia.com>
Acked-by: Thierry Reding <treding@nvidia.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

+8 -14
+1 -1
drivers/clk/tegra/clk-audio-sync.c
··· 72 72 73 73 init.ops = &tegra_clk_sync_source_ops; 74 74 init.name = name; 75 - init.flags = CLK_IS_ROOT; 75 + init.flags = 0; 76 76 init.parent_names = NULL; 77 77 init.num_parents = 0; 78 78
-1
drivers/clk/tegra/clk-dfll.c
··· 995 995 }; 996 996 997 997 static struct clk_init_data dfll_clk_init_data = { 998 - .flags = CLK_IS_ROOT, 999 998 .ops = &dfll_clk_ops, 1000 999 .num_parents = 0, 1001 1000 };
+2 -4
drivers/clk/tegra/clk-tegra-fixed.c
··· 52 52 return -EINVAL; 53 53 } 54 54 55 - osc = clk_register_fixed_rate(NULL, "osc", NULL, CLK_IS_ROOT, 56 - *osc_freq); 55 + osc = clk_register_fixed_rate(NULL, "osc", NULL, 0, *osc_freq); 57 56 58 57 dt_clk = tegra_lookup_dt_id(tegra_clk_clk_m, clks); 59 58 if (!dt_clk) ··· 87 88 /* clk_32k */ 88 89 dt_clk = tegra_lookup_dt_id(tegra_clk_clk_32k, tegra_clks); 89 90 if (dt_clk) { 90 - clk = clk_register_fixed_rate(NULL, "clk_32k", NULL, 91 - CLK_IS_ROOT, 32768); 91 + clk = clk_register_fixed_rate(NULL, "clk_32k", NULL, 0, 32768); 92 92 *dt_clk = clk; 93 93 } 94 94
+1 -2
drivers/clk/tegra/clk-tegra114.c
··· 972 972 struct clk *clk; 973 973 974 974 /* clk_32k */ 975 - clk = clk_register_fixed_rate(NULL, "clk_32k", NULL, CLK_IS_ROOT, 976 - 32768); 975 + clk = clk_register_fixed_rate(NULL, "clk_32k", NULL, 0, 32768); 977 976 clks[TEGRA114_CLK_CLK_32K] = clk; 978 977 979 978 /* clk_m_div2 */
+4 -6
drivers/clk/tegra/clk-tegra20.c
··· 837 837 clks[TEGRA20_CLK_PEX] = clk; 838 838 839 839 /* cdev1 */ 840 - clk = clk_register_fixed_rate(NULL, "cdev1_fixed", NULL, CLK_IS_ROOT, 841 - 26000000); 840 + clk = clk_register_fixed_rate(NULL, "cdev1_fixed", NULL, 0, 26000000); 842 841 clk = tegra_clk_register_periph_gate("cdev1", "cdev1_fixed", 0, 843 842 clk_base, 0, 94, periph_clk_enb_refcnt); 844 843 clks[TEGRA20_CLK_CDEV1] = clk; 845 844 846 845 /* cdev2 */ 847 - clk = clk_register_fixed_rate(NULL, "cdev2_fixed", NULL, CLK_IS_ROOT, 848 - 26000000); 846 + clk = clk_register_fixed_rate(NULL, "cdev2_fixed", NULL, 0, 26000000); 849 847 clk = tegra_clk_register_periph_gate("cdev2", "cdev2_fixed", 0, 850 848 clk_base, 0, 93, periph_clk_enb_refcnt); 851 849 clks[TEGRA20_CLK_CDEV2] = clk; ··· 877 879 input_freq = tegra20_clk_measure_input_freq(); 878 880 879 881 /* clk_m */ 880 - clk = clk_register_fixed_rate(NULL, "clk_m", NULL, CLK_IS_ROOT | 881 - CLK_IGNORE_UNUSED, input_freq); 882 + clk = clk_register_fixed_rate(NULL, "clk_m", NULL, CLK_IGNORE_UNUSED, 883 + input_freq); 882 884 clks[TEGRA20_CLK_CLK_M] = clk; 883 885 884 886 /* pll_ref */