OMAP3/4 clock: split into per-chip family files
clock34xx_data.c now contains data for the OMAP34xx family, the OMAP36xx family, and the OMAP3517 family, so rename it to clock3xxx_data.c. Rename clock34xx.c to clock3xxx.c, and move the chip family-specific clock functions to clock34xx.c, clock36xx.c, or clock3517.c, as appropriate. So now "clock3xxx.*" refers to the OMAP3 superset. The main goal here is to prepare to compile chip family-specific clock functions only for kernel builds that target that chip family. To get to that point, we also need to add CONFIG_SOC_* options for those other chip families; that will be done in future patches, planned for 2.6.35. OMAP4 is also affected by this. It duplicated the OMAP3 non-CORE DPLL clkops structure. The OMAP4 variant of this clkops structure has been removed, and since there was nothing else currently in clock44xx.c, it too has been removed -- it can always be added back later when there is some content for it. (The OMAP4 clock autogeneration scripts have been updated accordingly.) Signed-off-by: Paul Walmsley <paul@pwsan.com> Cc: Benoît Cousson <b-cousson@ti.com> Cc: Rajendra Nayak <rnayak@ti.com> Cc: Ranjith Lohithakshan <ranjithl@ti.com> Cc: Tony Lindgren <tony@atomide.com>
This commit is contained in:
@@ -277,7 +277,7 @@ static struct clk dpll_abe_ck = {
|
||||
.parent = &abe_dpll_refclk_mux_ck,
|
||||
.dpll_data = &dpll_abe_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
@@ -644,7 +644,7 @@ static struct clk dpll_iva_ck = {
|
||||
.parent = &dpll_sys_ref_clk,
|
||||
.dpll_data = &dpll_iva_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
@@ -704,7 +704,7 @@ static struct clk dpll_mpu_ck = {
|
||||
.parent = &dpll_sys_ref_clk,
|
||||
.dpll_data = &dpll_mpu_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
@@ -776,7 +776,7 @@ static struct clk dpll_per_ck = {
|
||||
.parent = &dpll_sys_ref_clk,
|
||||
.dpll_data = &dpll_per_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
@@ -891,7 +891,7 @@ static struct clk dpll_unipro_ck = {
|
||||
.parent = &dpll_sys_ref_clk,
|
||||
.dpll_data = &dpll_unipro_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
@@ -947,7 +947,7 @@ static struct clk dpll_usb_ck = {
|
||||
.parent = &dpll_sys_ref_clk,
|
||||
.dpll_data = &dpll_usb_dd,
|
||||
.init = &omap2_init_dpll_parent,
|
||||
.ops = &omap4_clkops_noncore_dpll_ops,
|
||||
.ops = &clkops_omap3_noncore_dpll_ops,
|
||||
.recalc = &omap3_dpll_recalc,
|
||||
.round_rate = &omap2_dpll_round_rate,
|
||||
.set_rate = &omap3_noncore_dpll_set_rate,
|
||||
|
Reference in New Issue
Block a user