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

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

Merge branch 'omap-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6

parents 807a96cd 0dc23d70

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 29

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Erotic Pickled Herring



# *DOCUMENTATION*

arch/arm/mach-omap1/devices.c

+1 −1
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ void __init omap1_init_mmc(struct omap_mmc_platform_data **mmc_data, 
		}

		size = OMAP1_MMC_SIZE;



		omap_mmc_add(i, base, size, irq, mmc_data[i]);

		omap_mmc_add("mmci-omap", i, base, size, irq, mmc_data[i]);

	};

}

arch/arm/mach-omap1/mcbsp.c

+10 −88
Original line number Diff line number Diff line
@@ -28,81 +28,8 @@ 
#define DPS_RSTCT2_PER_EN	(1 << 0)

#define DSP_RSTCT2_WD_PER_EN	(1 << 1)



struct mcbsp_internal_clk {

	struct clk clk;

	struct clk **childs;

	int n_childs;

};



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

static void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk)

{

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

	int i;



	mclk->n_childs = ARRAY_SIZE(clk_names);

	mclk->childs = kzalloc(mclk->n_childs * sizeof(struct clk *),

				GFP_KERNEL);



	for (i = 0; i < mclk->n_childs; i++) {

		/* We fake a platform device to get correct device id */

		struct platform_device pdev;



		pdev.dev.bus = &platform_bus_type;

		pdev.id = mclk->clk.id;

		mclk->childs[i] = clk_get(&pdev.dev, clk_names[i]);

		if (IS_ERR(mclk->childs[i]))

			printk(KERN_ERR "Could not get clock %s (%d).\n",

				clk_names[i], mclk->clk.id);

	}

}



static int omap_mcbsp_clk_enable(struct clk *clk)

{

	struct mcbsp_internal_clk *mclk = container_of(clk,

					struct mcbsp_internal_clk, clk);

	int i;



	for (i = 0; i < mclk->n_childs; i++)

		clk_enable(mclk->childs[i]);

	return 0;

}



static void omap_mcbsp_clk_disable(struct clk *clk)

{

	struct mcbsp_internal_clk *mclk = container_of(clk,

					struct mcbsp_internal_clk, clk);

	int i;



	for (i = 0; i < mclk->n_childs; i++)

		clk_disable(mclk->childs[i]);

}



static struct mcbsp_internal_clk omap_mcbsp_clks[] = {

	{

		.clk = {

			.name 		= "mcbsp_clk",

			.id		= 1,

			.enable		= omap_mcbsp_clk_enable,

			.disable	= omap_mcbsp_clk_disable,

		},

	},

	{

		.clk = {

			.name 		= "mcbsp_clk",

			.id		= 3,

			.enable		= omap_mcbsp_clk_enable,

			.disable	= omap_mcbsp_clk_disable,

		},

	},

};



#define omap_mcbsp_clks_size	ARRAY_SIZE(omap_mcbsp_clks)

#else

#define omap_mcbsp_clks_size	0

static struct mcbsp_internal_clk __initdata *omap_mcbsp_clks;

static inline void omap_mcbsp_clk_init(struct mcbsp_internal_clk *mclk)

{ }

#endif



static void omap1_mcbsp_request(unsigned int id)
@@ -167,7 +94,8 @@ static struct omap_mcbsp_platform_data omap15xx_mcbsp_pdata[] = { 
		.rx_irq		= INT_McBSP1RX,

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_name	= "mcbsp_clk",

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

	{

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

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_name	= "mcbsp_clk",

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

};

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

		.tx_irq		= INT_McBSP1TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_name	= "mcbsp_clk",

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

	{

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

		.tx_irq		= INT_McBSP3TX,

		.ops		= &omap1_mcbsp_ops,

		.clk_name	= "mcbsp_clk",

		.clk_names	= clk_names,

		.num_clks	= 3,

	},

};

#define OMAP16XX_MCBSP_PDATA_SZ		ARRAY_SIZE(omap16xx_mcbsp_pdata)
@@ -230,15 +161,6 @@ static struct omap_mcbsp_platform_data omap16xx_mcbsp_pdata[] = { 


int __init omap1_mcbsp_init(void)

{

	int i;



	for (i = 0; i < omap_mcbsp_clks_size; i++) {

		if (cpu_is_omap15xx() || cpu_is_omap16xx()) {

			omap_mcbsp_clk_init(&omap_mcbsp_clks[i]);

			clk_register(&omap_mcbsp_clks[i].clk);

		}

	}



	if (cpu_is_omap730())

		omap_mcbsp_count = OMAP730_MCBSP_PDATA_SZ;

	if (cpu_is_omap15xx())

arch/arm/mach-omap2/devices.c

+7 −4
Original line number Diff line number Diff line
@@ -421,6 +421,7 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 
			int nr_controllers)

{

	int i;

	char *name;



	for (i = 0; i < nr_controllers; i++) {

		unsigned long base, size;
@@ -450,12 +451,14 @@ void __init omap2_init_mmc(struct omap_mmc_platform_data **mmc_data, 
			continue;

		}



		if (cpu_is_omap2420())

		if (cpu_is_omap2420()) {

			size = OMAP2420_MMC_SIZE;

		else

			name = "mmci-omap";

		} else {

			size = HSMMC_SIZE;



		omap_mmc_add(i, base, size, irq, mmc_data[i]);

			name = "mmci-omap-hs";

		}

		omap_mmc_add(name, i, base, size, irq, mmc_data[i]);

	};

}

arch/arm/mach-omap2/id.c

+5 −1
Original line number Diff line number Diff line
@@ -172,9 +172,13 @@ void __init omap34xx_check_revision(void) 
			omap_revision = OMAP3430_REV_ES3_0;

			rev_name = "ES3.0";

			break;

		case 4:

			omap_revision = OMAP3430_REV_ES3_1;

			rev_name = "ES3.1";

			break;

		default:

			/* Use the latest known revision as default */

			omap_revision = OMAP3430_REV_ES3_0;

			omap_revision = OMAP3430_REV_ES3_1;

			rev_name = "Unknown revision\n";

		}

	}