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

Commit 5dd7bf59 authored by Jochen Friedrich's avatar Jochen Friedrich Committed by Samuel Ortiz
Browse files

ARM: sa11x0: Implement autoloading of codec and codec pdata for mcp bus. 



Signed-off-by: default avatarJochen Friedrich <jochen@scram.de>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent c9531227

arch/arm/mach-sa1100/assabet.c

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ static struct irda_platform_data assabet_irda_data = { 
static struct mcp_plat_data assabet_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

	.codec		= "ucb1x00",

};



static void __init assabet_init(void)

arch/arm/mach-sa1100/cerf.c

+1 −0
Original line number Diff line number Diff line
@@ -124,6 +124,7 @@ static void __init cerf_map_io(void) 
static struct mcp_plat_data cerf_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

	.codec		= "ucb1x00",

};



static void __init cerf_init(void)

arch/arm/mach-sa1100/collie.c

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/timer.h>

#include <linux/gpio.h>

#include <linux/pda_power.h>

#include <linux/mfd/ucb1x00.h>



#include <mach/hardware.h>

#include <asm/mach-types.h>
@@ -85,10 +86,15 @@ static struct scoop_pcmcia_config collie_pcmcia_config = { 
	.num_devs	= 1,

};



static struct ucb1x00_plat_data collie_ucb1x00_data = {

	.gpio_base	= COLLIE_TC35143_GPIO_BASE,

};



static struct mcp_plat_data collie_mcp_data = {

	.mccr0		= MCCR0_ADM | MCCR0_ExtClk,

	.sclk_rate	= 9216000,

	.gpio_base	= COLLIE_TC35143_GPIO_BASE,

	.codec		= "ucb1x00",

	.codec_pdata	= &collie_ucb1x00_data,

};



/*

arch/arm/mach-sa1100/include/mach/mcp.h

+2 −0
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ struct mcp_plat_data { 
	u32 mccr1;

	unsigned int sclk_rate;

	int gpio_base;

	const char *codec;

	void *codec_pdata;

};



#endif

arch/arm/mach-sa1100/lart.c

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
static struct mcp_plat_data lart_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

	.codec		= "ucb1x00",

};



static void __init lart_init(void)