* Omar Ramirez Luna <omar.l...@linaro.org> [121119 17:08]:
> This prevents hwmod _enable_clocks...omap2_dflt_clk_enable path
> from enabling modulemode inside CLKCTRL using its clk->enable_reg
> field. Instead is left to _omap4_enable_module though soc_ops, as
> the one in charge of this setting.
>
> According to comments received[1] for related patches the idea is
> to get rid of leaf clocks in future. So remove these two while at it.
>
> [1] http://lkml.org/lkml/2012/8/20/226
This one should be queued by Paul, or at least acked by him.
Regards,
Tony
> Signed-off-by: Omar Ramirez Luna <omar.l...@linaro.org>
> ---
> arch/arm/mach-omap2/clock44xx_data.c | 22 ----------------------
> arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 4 ++--
> 2 files changed, 2 insertions(+), 24 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock44xx_data.c
> b/arch/arm/mach-omap2/clock44xx_data.c
> index 6efc30c..067c486 100644
> --- a/arch/arm/mach-omap2/clock44xx_data.c
> +++ b/arch/arm/mach-omap2/clock44xx_data.c
> @@ -1316,16 +1316,6 @@ static struct clk dmic_fck = {
> .clkdm_name = "abe_clkdm",
> };
>
> -static struct clk dsp_fck = {
> - .name = "dsp_fck",
> - .ops = &clkops_omap2_dflt,
> - .enable_reg = OMAP4430_CM_TESLA_TESLA_CLKCTRL,
> - .enable_bit = OMAP4430_MODULEMODE_HWCTRL,
> - .clkdm_name = "tesla_clkdm",
> - .parent = &dpll_iva_m4x2_ck,
> - .recalc = &followparent_recalc,
> -};
> -
> static struct clk dss_sys_clk = {
> .name = "dss_sys_clk",
> .ops = &clkops_omap2_dflt,
> @@ -1696,16 +1686,6 @@ static struct clk i2c4_fck = {
> .recalc = &followparent_recalc,
> };
>
> -static struct clk ipu_fck = {
> - .name = "ipu_fck",
> - .ops = &clkops_omap2_dflt,
> - .enable_reg = OMAP4430_CM_DUCATI_DUCATI_CLKCTRL,
> - .enable_bit = OMAP4430_MODULEMODE_HWCTRL,
> - .clkdm_name = "ducati_clkdm",
> - .parent = &ducati_clk_mux_ck,
> - .recalc = &followparent_recalc,
> -};
> -
> static struct clk iss_ctrlclk = {
> .name = "iss_ctrlclk",
> .ops = &clkops_omap2_dflt,
> @@ -3151,7 +3131,6 @@ static struct omap_clk omap44xx_clks[] = {
> CLK(NULL, "div_ts_ck", &div_ts_ck,
> CK_446X),
> CLK(NULL, "dmic_sync_mux_ck", &dmic_sync_mux_ck,
> CK_443X),
> CLK(NULL, "dmic_fck", &dmic_fck,
> CK_443X),
> - CLK(NULL, "dsp_fck", &dsp_fck,
> CK_443X),
> CLK(NULL, "dss_sys_clk", &dss_sys_clk,
> CK_443X),
> CLK(NULL, "dss_tv_clk", &dss_tv_clk,
> CK_443X),
> CLK(NULL, "dss_48mhz_clk", &dss_48mhz_clk,
> CK_443X),
> @@ -3183,7 +3162,6 @@ static struct omap_clk omap44xx_clks[] = {
> CLK(NULL, "i2c2_fck", &i2c2_fck,
> CK_443X),
> CLK(NULL, "i2c3_fck", &i2c3_fck,
> CK_443X),
> CLK(NULL, "i2c4_fck", &i2c4_fck,
> CK_443X),
> - CLK(NULL, "ipu_fck", &ipu_fck,
> CK_443X),
> CLK(NULL, "iss_ctrlclk", &iss_ctrlclk,
> CK_443X),
> CLK(NULL, "iss_fck", &iss_fck,
> CK_443X),
> CLK(NULL, "iva_fck", &iva_fck,
> CK_443X),
> diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> index aab5c12..1f61093 100644
> --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
> @@ -650,7 +650,7 @@ static struct omap_hwmod omap44xx_dsp_hwmod = {
> .mpu_irqs = omap44xx_dsp_irqs,
> .rst_lines = omap44xx_dsp_resets,
> .rst_lines_cnt = ARRAY_SIZE(omap44xx_dsp_resets),
> - .main_clk = "dsp_fck",
> + .main_clk = "dpll_iva_m4x2_ck",
> .prcm = {
> .omap4 = {
> .clkctrl_offs = OMAP4_CM_TESLA_TESLA_CLKCTRL_OFFSET,
> @@ -1677,7 +1677,7 @@ static struct omap_hwmod omap44xx_ipu_hwmod = {
> .mpu_irqs = omap44xx_ipu_irqs,
> .rst_lines = omap44xx_ipu_resets,
> .rst_lines_cnt = ARRAY_SIZE(omap44xx_ipu_resets),
> - .main_clk = "ipu_fck",
> + .main_clk = "ducati_clk_mux_ck",
> .prcm = {
> .omap4 = {
> .clkctrl_offs = OMAP4_CM_DUCATI_DUCATI_CLKCTRL_OFFSET,
> --
> 1.7.4.1
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
