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

Commit 7256ecc2 authored by Russell King's avatar Russell King
Browse files

Merge branch 'sa11x0-mcp' into sa11x0 

Conflicts:
	arch/arm/mach-sa1100/assabet.c
	arch/arm/mach-sa1100/collie.c
	arch/arm/mach-sa1100/generic.c
	arch/arm/mach-sa1100/lart.c
	arch/arm/mach-sa1100/shannon.c
parents 18bbff9f 6ed3e2ac

arch/arm/mach-sa1100/assabet.c

+15 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/errno.h>

#include <linux/ioport.h>

#include <linux/serial_core.h>

#include <linux/mfd/ucb1x00.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/delay.h>
@@ -71,6 +72,12 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val) 


EXPORT_SYMBOL(ASSABET_BCR_frob);



static void assabet_ucb1x00_reset(enum ucb1x00_reset state)

{

	if (state == UCB_RST_PROBE)

		ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);

}





/*

 * Assabet flash support code.
@@ -167,9 +174,15 @@ static struct irda_platform_data assabet_irda_data = { 
	.set_speed	= assabet_irda_set_speed,

};



static struct ucb1x00_plat_data assabet_ucb1x00_data = {

	.reset		= assabet_ucb1x00_reset,

	.gpio_base	= -1,

};



static struct mcp_plat_data assabet_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

	.codec_pdata	= &assabet_ucb1x00_data,

};



static void assabet_lcd_set_visual(u32 visual)
@@ -309,6 +322,8 @@ static void __init assabet_init(void) 
	PPDR |= PPC_TXD3 | PPC_TXD1;

	PPSR |= PPC_TXD3 | PPC_TXD1;



	sa11x0_ppc_configure_mcp();



	if (machine_has_neponset()) {

		/*

		 * Angel sets this, but other bootloaders may not.

arch/arm/mach-sa1100/cerf.c

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


static void __init cerf_init(void)

{

	sa11x0_ppc_configure_mcp();

	platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));

	sa11x0_register_mtd(&cerf_flash_data, &cerf_flash_resource, 1);

	sa11x0_register_mcp(&cerf_mcp_data);

arch/arm/mach-sa1100/collie.c

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

#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/mfd/ucb1x00.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/timer.h>
@@ -83,10 +84,14 @@ 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_pdata	= &collie_ucb1x00_data,

};



/*
@@ -341,6 +346,10 @@ static void __init collie_init(void) 


	collie_power_resource[0].start = gpio_to_irq(COLLIE_GPIO_AC_IN);

	collie_power_resource[0].end = gpio_to_irq(COLLIE_GPIO_AC_IN);



	sa11x0_ppc_configure_mcp();





	platform_scoop_config = &collie_pcmcia_config;



	ret = platform_add_devices(devices, ARRAY_SIZE(devices));

arch/arm/mach-sa1100/generic.c

+12 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ static struct platform_device sa11x0uart3_device = { 


static struct resource sa11x0mcp_resources[] = {

	[0] = DEFINE_RES_MEM(__PREG(Ser4MCCR0), SZ_64K),

	[1] = DEFINE_RES_IRQ(IRQ_Ser4MCP),

	[1] = DEFINE_RES_MEM(__PREG(Ser4MCCR1), 4),

	[2] = DEFINE_RES_IRQ(IRQ_Ser4MCP),

};



static u64 sa11x0mcp_dma_mask = 0xffffffffUL;
@@ -211,6 +212,16 @@ static struct platform_device sa11x0mcp_device = { 
	.resource	= sa11x0mcp_resources,

};



void __init sa11x0_ppc_configure_mcp(void)

{

	/* Setup the PPC unit for the MCP */

	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);

}



void sa11x0_register_mcp(struct mcp_plat_data *data)

{

	sa11x0_register_device(&sa11x0mcp_device, data);

arch/arm/mach-sa1100/generic.h

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ struct irda_platform_data; 
void sa11x0_register_irda(struct irda_platform_data *irda);



struct mcp_plat_data;

void sa11x0_ppc_configure_mcp(void);

void sa11x0_register_mcp(struct mcp_plat_data *data);



struct sa1100fb_mach_info;