Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3774bec7 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Tony Lindgren
Browse files

ARM: OMAP2+: McBSP: Remove the old iclk allow/deny idle code 



The new pdata callback (force_ick_on) is now used by the driver and the old
callback related code can be removed.

Signed-off-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent bbfa26c5

arch/arm/mach-omap2/mcbsp.c

+0 −18
Original line number Diff line number Diff line
@@ -34,20 +34,6 @@ 
#include "cm3xxx.h"

#include "cm-regbits-34xx.h"



static struct clk *mcbsp_iclks[5];



static int omap3_enable_st_clock(unsigned int id, bool enable)

{

	/*

	 * Sidetone uses McBSP ICLK - which must not idle when sidetones

	 * are enabled or sidetones start sounding ugly.

	 */

	if (enable)

		return omap2_clk_deny_idle(mcbsp_iclks[id]);

	else

		return omap2_clk_allow_idle(mcbsp_iclks[id]);

}



static int omap3_mcbsp_force_ick_on(struct clk *clk, bool force_on)

{

	if (!clk)
@@ -75,7 +61,6 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused) 
	struct omap_hwmod *oh_device[2];

	struct omap_mcbsp_platform_data *pdata = NULL;

	struct platform_device *pdev;

	char clk_name[11];



	sscanf(oh->name, "mcbsp%d", &id);
@@ -116,10 +101,7 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused) 
	if (oh->dev_attr) {

		oh_device[1] = omap_hwmod_lookup((

		(struct omap_mcbsp_dev_attr *)(oh->dev_attr))->sidetone);

		pdata->enable_st_clock = omap3_enable_st_clock;

		pdata->force_ick_on = omap3_mcbsp_force_ick_on;

		sprintf(clk_name, "mcbsp%d_ick", id);

		mcbsp_iclks[id] = clk_get(NULL, clk_name);

		count++;

	}

	pdev = omap_device_build_ss(name, id, oh_device, count, pdata,

include/linux/platform_data/asoc-ti-mcbsp.h

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ struct omap_mcbsp_platform_data { 
	/* McBSP platform and instance specific features */

	bool has_wakeup; /* Wakeup capability */

	bool has_ccr; /* Transceiver has configuration control registers */

	int (*enable_st_clock)(unsigned int, bool);

	int (*force_ick_on)(struct clk *clk, bool force_on);

};