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

Commit 65f2e753 authored by Russell King's avatar Russell King
Browse files

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

This reverts commit 5dd7bf59.

Conflicts:

	scripts/mod/file2alias.c

This change is wrong on many levels.  First and foremost, it causes a
regression.  On boot on Assabet, which this patch gives a codec id of
'ucb1x00', it gives:

	ucb1x00 ID not found: 1005

0x1005 is a valid ID for the UCB1300 device.

Secondly, this patch is way over the top in terms of complexity.  The
only device which has been seen to be connected with this MCP code is
the UCB1x00 (UCB1200, UCB1300 etc) devices, and they all use the same
driver.  Adding a match table, requiring the codec string to match the
hardware ID read out of the ID register, etc is completely over the top
when we can just read the hardware ID register.
parent 216f63c4

arch/arm/mach-sa1100/assabet.c

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ 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

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ 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

+1 −7
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#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>
@@ -86,15 +85,10 @@ 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,

	.codec		= "ucb1x00",

	.codec_pdata	= &collie_ucb1x00_data,

	.gpio_base	= COLLIE_TC35143_GPIO_BASE,

};



/*

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

+0 −2
Original line number Diff line number Diff line
@@ -17,8 +17,6 @@ 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

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

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

	.codec		= "ucb1x00",

};



static void __init lart_init(void)