Commit b820ce4e authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] omap: mcbsp: convert to use fck/ick clocks directly 



Rather than introducing a special 'mcbsp_clk' with code behind it in
mach-omap*/mcbsp.c to handle the SoC specifics, arrange for the mcbsp
driver to be like any other driver.  mcbsp requests its fck and ick
clocks directly, and the SoC specific code deals with selecting the
correct clock.

There is one oddity to deal with - OMAP1 fiddles with the DSP clocks
and DSP reset, so we move this to the two callback functions.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 1b5715ec

arch/arm/mach-omap1/clock.c

+9 −0
Original line number Diff line number Diff line
@@ -132,6 +132,15 @@ static struct omap_clk omap_clks[] = { 
	CLK(NULL,	"mpu",		&virtual_ck_mpu, CK_16XX | CK_1510 | CK_310),

	CLK("i2c_omap.1", "i2c_fck",	&i2c_fck,	CK_16XX | CK_1510 | CK_310),

	CLK("i2c_omap.1", "i2c_ick",	&i2c_ick,	CK_16XX),

	CLK("omap-mcbsp.1", "ick",	&dspper_ck,	CK_16XX),

	CLK("omap-mcbsp.1", "ick",	&dummy_ck,	CK_1510 | CK_310),

	CLK("omap-mcbsp.2", "ick",	&armper_ck.clk,	CK_16XX),

	CLK("omap-mcbsp.2", "ick",	&dummy_ck,	CK_1510 | CK_310),

	CLK("omap-mcbsp.3", "ick",	&dspper_ck,	CK_16XX),

	CLK("omap-mcbsp.3", "ick",	&dummy_ck,	CK_1510 | CK_310),

	CLK("omap-mcbsp.1", "fck",	&dspxor_ck,	CK_16XX | CK_1510 | CK_310),

	CLK("omap-mcbsp.2", "fck",	&armper_ck.clk,	CK_16XX | CK_1510 | CK_310),

	CLK("omap-mcbsp.3", "fck",	&dspxor_ck,	CK_16XX | CK_1510 | CK_310),

};



static int omap1_clk_enable_generic(struct clk * clk);

arch/arm/mach-omap1/mcbsp.c

+32 −20
Original line number Diff line number Diff line
@@ -28,9 +28,9 @@ 
#define DPS_RSTCT2_PER_EN	(1 << 0)

#define DSP_RSTCT2_WD_PER_EN	(1 << 1)



#if defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX)

const char *clk_names[] = { "dsp_ck", "api_ck", "dspxor_ck" };

#endif

static int dsp_use;

static struct clk *api_clk;

static struct clk *dsp_clk;



static void omap1_mcbsp_request(unsigned int id)

{
@@ -39,6 +39,13 @@ static void omap1_mcbsp_request(unsigned int id) 
	 * are DSP public peripherals.

	 */

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

		if (dsp_use++ == 0) {

			api_clk = clk_get(NULL, "api_clk");

			dsp_clk = clk_get(NULL, "dsp_clk");

			if (!IS_ERR(api_clk) && !IS_ERR(dsp_clk)) {

				clk_enable(api_clk);

				clk_enable(dsp_clk);



				omap_dsp_request_mem();

				/*

				 * DSP external peripheral reset
@@ -48,11 +55,24 @@ static void omap1_mcbsp_request(unsigned int id) 
						DSP_RSTCT2_WD_PER_EN, DSP_RSTCT2);

			}

		}

	}

}



static void omap1_mcbsp_free(unsigned int id)

{

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)

	if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3) {

		if (--dsp_use == 0) {

			omap_dsp_release_mem();

			if (!IS_ERR(api_clk)) {

				clk_disable(api_clk);

				clk_put(api_clk);

			}

			if (!IS_ERR(dsp_clk)) {

				clk_disable(dsp_clk);

				clk_put(dsp_clk);

			}

		}

	}

}



static struct omap_mcbsp_ops omap1_mcbsp_ops = {
@@ -94,8 +114,6 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

	{

		.phys_base	= OMAP1510_MCBSP2_BASE,
@@ -112,8 +130,6 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

};

#define OMAP15XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap15xx_mcbsp_pdata)
@@ -131,8 +147,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

	{

		.phys_base	= OMAP1610_MCBSP2_BASE,
@@ -149,8 +163,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_McBSP3RX,

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

};

#define OMAP16XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap16xx_mcbsp_pdata)

arch/arm/mach-omap2/clock24xx.c

+10 −10
Original line number Diff line number Diff line
@@ -139,16 +139,16 @@ static struct omap_clk omap24xx_clks[] = { 
	CLK(NULL,	"gpt11_fck",	&gpt11_fck,	CK_243X | CK_242X),

	CLK(NULL,	"gpt12_ick",	&gpt12_ick,	CK_243X | CK_242X),

	CLK(NULL,	"gpt12_fck",	&gpt12_fck,	CK_243X | CK_242X),

	CLK("omap-mcbsp.1", "mcbsp_ick", &mcbsp1_ick,	CK_243X | CK_242X),

	CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,	CK_243X | CK_242X),

	CLK("omap-mcbsp.2", "mcbsp_ick", &mcbsp2_ick,	CK_243X | CK_242X),

	CLK("omap-mcbsp.2", "mcbsp_fck", &mcbsp2_fck,	CK_243X | CK_242X),

	CLK("omap-mcbsp.3", "mcbsp_ick", &mcbsp3_ick,	CK_243X),

	CLK("omap-mcbsp.3", "mcbsp_fck", &mcbsp3_fck,	CK_243X),

	CLK("omap-mcbsp.4", "mcbsp_ick", &mcbsp4_ick,	CK_243X),

	CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,	CK_243X),

	CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,	CK_243X),

	CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,	CK_243X),

	CLK("omap-mcbsp.1", "ick",	&mcbsp1_ick,	CK_243X | CK_242X),

	CLK("omap-mcbsp.1", "fck",	&mcbsp1_fck,	CK_243X | CK_242X),

	CLK("omap-mcbsp.2", "ick",	&mcbsp2_ick,	CK_243X | CK_242X),

	CLK("omap-mcbsp.2", "fck",	&mcbsp2_fck,	CK_243X | CK_242X),

	CLK("omap-mcbsp.3", "ick",	&mcbsp3_ick,	CK_243X),

	CLK("omap-mcbsp.3", "fck",	&mcbsp3_fck,	CK_243X),

	CLK("omap-mcbsp.4", "ick",	&mcbsp4_ick,	CK_243X),

	CLK("omap-mcbsp.4", "fck",	&mcbsp4_fck,	CK_243X),

	CLK("omap-mcbsp.5", "ick",	&mcbsp5_ick,	CK_243X),

	CLK("omap-mcbsp.5", "fck",	&mcbsp5_fck,	CK_243X),

	CLK("omap2_mcspi.1", "ick",	&mcspi1_ick,	CK_243X | CK_242X),

	CLK("omap2_mcspi.1", "fck",	&mcspi1_fck,	CK_243X | CK_242X),

	CLK("omap2_mcspi.2", "ick",	&mcspi2_ick,	CK_243X | CK_242X),

arch/arm/mach-omap2/clock34xx.c

+10 −10
Original line number Diff line number Diff line
@@ -144,8 +144,8 @@ static struct omap_clk omap34xx_clks[] = { 
	CLK("i2c_omap.3", "i2c_fck",	&i2c3_fck,	CK_343X),

	CLK("i2c_omap.2", "i2c_fck",	&i2c2_fck,	CK_343X),

	CLK("i2c_omap.1", "i2c_fck",	&i2c1_fck,	CK_343X),

	CLK("omap-mcbsp.5", "mcbsp_fck", &mcbsp5_fck,	CK_343X),

	CLK("omap-mcbsp.1", "mcbsp_fck", &mcbsp1_fck,	CK_343X),

	CLK("omap-mcbsp.5", "fck",	&mcbsp5_fck,	CK_343X),

	CLK("omap-mcbsp.1", "fck",	&mcbsp1_fck,	CK_343X),

	CLK(NULL,	"core_48m_fck",	&core_48m_fck,	CK_343X),

	CLK("omap2_mcspi.4", "fck",	&mcspi4_fck,	CK_343X),

	CLK("omap2_mcspi.3", "fck",	&mcspi3_fck,	CK_343X),
@@ -186,8 +186,8 @@ static struct omap_clk omap34xx_clks[] = { 
	CLK(NULL,	"uart1_ick",	&uart1_ick,	CK_343X),

	CLK(NULL,	"gpt11_ick",	&gpt11_ick,	CK_343X),

	CLK(NULL,	"gpt10_ick",	&gpt10_ick,	CK_343X),

	CLK("omap-mcbsp.5", "mcbsp_ick", &mcbsp5_ick,	CK_343X),

	CLK("omap-mcbsp.1", "mcbsp_ick", &mcbsp1_ick,	CK_343X),

	CLK("omap-mcbsp.5", "ick",	&mcbsp5_ick,	CK_343X),

	CLK("omap-mcbsp.1", "ick",	&mcbsp1_ick,	CK_343X),

	CLK(NULL,	"fac_ick",	&fac_ick,	CK_3430ES1),

	CLK(NULL,	"mailboxes_ick", &mailboxes_ick, CK_343X),

	CLK(NULL,	"omapctrl_ick",	&omapctrl_ick,	CK_343X),
@@ -257,12 +257,12 @@ static struct omap_clk omap34xx_clks[] = { 
	CLK(NULL,	"gpt4_ick",	&gpt4_ick,	CK_343X),

	CLK(NULL,	"gpt3_ick",	&gpt3_ick,	CK_343X),

	CLK(NULL,	"gpt2_ick",	&gpt2_ick,	CK_343X),

	CLK("omap-mcbsp.2", "mcbsp_ick", &mcbsp2_ick,	CK_343X),

	CLK("omap-mcbsp.3", "mcbsp_ick", &mcbsp3_ick,	CK_343X),

	CLK("omap-mcbsp.4", "mcbsp_ick", &mcbsp4_ick,	CK_343X),

	CLK("omap-mcbsp.2", "mcbsp_fck", &mcbsp2_fck,	CK_343X),

	CLK("omap-mcbsp.3", "mcbsp_fck", &mcbsp3_fck,	CK_343X),

	CLK("omap-mcbsp.4", "mcbsp_fck", &mcbsp4_fck,	CK_343X),

	CLK("omap-mcbsp.2", "ick",	&mcbsp2_ick,	CK_343X),

	CLK("omap-mcbsp.3", "ick",	&mcbsp3_ick,	CK_343X),

	CLK("omap-mcbsp.4", "ick",	&mcbsp4_ick,	CK_343X),

	CLK("omap-mcbsp.2", "fck",	&mcbsp2_fck,	CK_343X),

	CLK("omap-mcbsp.3", "fck",	&mcbsp3_fck,	CK_343X),

	CLK("omap-mcbsp.4", "fck",	&mcbsp4_fck,	CK_343X),

	CLK(NULL,	"emu_src_ck",	&emu_src_ck,	CK_343X),

	CLK(NULL,	"pclk_fck",	&pclk_fck,	CK_343X),

	CLK(NULL,	"pclkx2_fck",	&pclkx2_fck,	CK_343X),

arch/arm/mach-omap2/mcbsp.c

+0 −26
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ 
#include <mach/cpu.h>

#include <mach/mcbsp.h>



const char *clk_names[] = { "mcbsp_ick", "mcbsp_fck" };



static void omap2_mcbsp2_mux_setup(void)

{

	omap_cfg_reg(Y15_24XX_MCBSP2_CLKX);
@@ -57,8 +55,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -67,8 +63,6 @@ static struct omap_mcbsp_platform_data omap2420_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

};

#define OMAP2420_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2420_mcbsp_pdata)
@@ -86,8 +80,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP24XX_MCBSP2_BASE,
@@ -96,8 +88,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP2430_MCBSP3_BASE,
@@ -106,8 +96,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP2430_MCBSP4_BASE,
@@ -116,8 +104,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP2430_MCBSP5_BASE,
@@ -126,8 +112,6 @@ static struct omap_mcbsp_platform_data omap2430_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

};

#define OMAP2430_MCBSP_PDATA_SZ		ARRAY_SIZE(omap2430_mcbsp_pdata)
@@ -145,8 +129,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP1_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP1_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP34XX_MCBSP2_BASE,
@@ -155,8 +137,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP2_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP2_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP34XX_MCBSP3_BASE,
@@ -165,8 +145,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP3_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP3_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP34XX_MCBSP4_BASE,
@@ -175,8 +153,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP4_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP4_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

	{

		.phys_base	= OMAP34XX_MCBSP5_BASE,
@@ -185,8 +161,6 @@ static struct omap_mcbsp_platform_data omap34xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_24XX_MCBSP5_IRQ_RX,

		.tx_irq		= INT_24XX_MCBSP5_IRQ_TX,

		.ops		= &omap2_mcbsp_ops,

		.clk_names	= clk_names,

		.num_clks	= 2,

	},

};

#define OMAP34XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap34xx_mcbsp_pdata)

CRA Git | Maintained and supported by SUSTech CRA and CCSE