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

Commit 9a95b9e7 authored by Russell King's avatar Russell King
Browse files

Merge branch 'sa11x0-mcp-fixes' into fixes

parents 4e7682d0 0af5e4c3

Makefile

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

PATCHLEVEL = 2

PATCHLEVEL = 3

SUBLEVEL = 0

EXTRAVERSION =

EXTRAVERSION = -rc1

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/mach-sa1100/assabet.c

+0 −12
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)
@@ -253,17 +252,6 @@ static void __init assabet_init(void) 
	sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources,

			    ARRAY_SIZE(assabet_flash_resources));

	sa11x0_register_irda(&assabet_irda_data);



	/*

	 * Setup the PPC unit correctly.

	 */

	PPDR &= ~PPC_RXD4;

	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;

	PSDR |= PPC_RXD4;

	PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);

	PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);



	ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);

	sa11x0_register_mcp(&assabet_mcp_data);

}

arch/arm/mach-sa1100/cerf.c

+0 −11
Original line number Diff line number Diff line
@@ -124,23 +124,12 @@ 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)

{

	platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));

	sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);



	/*

	 * Setup the PPC unit correctly.

	 */

	PPDR &= ~PPC_RXD4;

	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;

	PSDR |= PPC_RXD4;

	PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);

	PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);



	sa11x0_register_mcp(&cerf_mcp_data);

}

arch/arm/mach-sa1100/collie.c

+1 −17
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,

};



/*
@@ -356,16 +350,6 @@ static void __init collie_init(void) 


	sa11x0_register_mtd(&collie_flash_data, collie_flash_resources,

			    ARRAY_SIZE(collie_flash_resources));



	/*

	 * Setup the PPC unit correctly.

	 */

	PPDR &= ~PPC_RXD4;

	PPDR |= PPC_TXD4 | PPC_SCLK | PPC_SFRM;

	PSDR |= PPC_RXD4;

	PSDR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);

	PPSR &= ~(PPC_TXD4 | PPC_SCLK | PPC_SFRM);



	sa11x0_register_mcp(&collie_mcp_data);



	sharpsl_save_param();

arch/arm/mach-sa1100/generic.c

+1 −6
Original line number Diff line number Diff line
@@ -217,15 +217,10 @@ static struct platform_device sa11x0uart3_device = { 
static struct resource sa11x0mcp_resources[] = {

	[0] = {

		.start	= __PREG(Ser4MCCR0),

		.end	= __PREG(Ser4MCCR0) + 0x1C - 1,

		.end	= __PREG(Ser4MCCR0) + 0xffff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= __PREG(Ser4MCCR1),

		.end	= __PREG(Ser4MCCR1) + 0x4 - 1,

		.flags	= IORESOURCE_MEM,

	},

	[2] = {

		.start	= IRQ_Ser4MCP,

		.end	= IRQ_Ser4MCP,

		.flags	= IORESOURCE_IRQ,