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

Commit 2321fbd2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge HEAD from master.kernel.org:/home/rmk/linux-2.6-ucb.git

parents 3d963f5b 323cdfc1

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -752,6 +752,8 @@ source "drivers/hwmon/Kconfig" 


source "drivers/misc/Kconfig"



source "drivers/mfd/Kconfig"



source "drivers/media/Kconfig"



source "drivers/video/Kconfig"

arch/arm/mach-sa1100/assabet.c

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <asm/mach/map.h>

#include <asm/mach/serial_sa1100.h>

#include <asm/arch/assabet.h>

#include <asm/arch/mcp.h>



#include "generic.h"
@@ -198,6 +199,11 @@ static struct irda_platform_data assabet_irda_data = { 
	.set_speed	= assabet_irda_set_speed,

};



static struct mcp_plat_data assabet_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

};



static void __init assabet_init(void)

{

	/*
@@ -246,6 +252,7 @@ static void __init assabet_init(void) 
	sa11x0_set_flash_data(&assabet_flash_data, assabet_flash_resources,

			      ARRAY_SIZE(assabet_flash_resources));

	sa11x0_set_irda_data(&assabet_irda_data);

	sa11x0_set_mcp_data(&assabet_mcp_data);

}



/*

arch/arm/mach-sa1100/cerf.c

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <asm/mach/serial_sa1100.h>



#include <asm/arch/cerf.h>

#include <asm/arch/mcp.h>

#include "generic.h"



static struct resource cerfuart2_resources[] = {
@@ -116,10 +117,16 @@ static void __init cerf_map_io(void) 
	GPDR |= CERF_GPIO_CF_RESET;

}



static struct mcp_plat_data cerf_mcp_data = {

	.mccr0		= MCCR0_ADM,

	.sclk_rate	= 11981000,

};



static void __init cerf_init(void)

{

	platform_add_devices(cerf_devices, ARRAY_SIZE(cerf_devices));

	sa11x0_set_flash_data(&cerf_flash_data, &cerf_flash_resource, 1);

	sa11x0_set_mcp_data(&cerf_mcp_data);

}



MACHINE_START(CERF, "Intrinsyc CerfBoard/CerfCube")

arch/arm/mach-sa1100/generic.c

+5 −0
Original line number Diff line number Diff line
@@ -221,6 +221,11 @@ static struct platform_device sa11x0mcp_device = { 
	.resource	= sa11x0mcp_resources,

};



void sa11x0_set_mcp_data(struct mcp_plat_data *data)

{

	sa11x0mcp_device.dev.platform_data = data;

}



static struct resource sa11x0ssp_resources[] = {

	[0] = {

		.start	= 0x80070000,

arch/arm/mach-sa1100/generic.h

+3 −0
Original line number Diff line number Diff line
@@ -34,5 +34,8 @@ struct resource; 
extern void sa11x0_set_flash_data(struct flash_platform_data *flash,

				  struct resource *res, int nr);



struct sa11x0_ssp_plat_ops;

extern void sa11x0_set_ssp_data(struct sa11x0_ssp_plat_ops *ops);



struct irda_platform_data;

void sa11x0_set_irda_data(struct irda_platform_data *irda);