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

Commit d161edfb authored by Linus Walleij's avatar Linus Walleij Committed by Russell King
Browse files

ARM: 6215/2: add character LCD platform data for RealView and Versatile 



This adds some platform data for the character LCD found in the
RealView and Versatile reference designs from ARM.

Signed-off-by: default avatarLinus Walleij <triad@df.lth.se>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent ef6f4b12

arch/arm/mach-realview/realview_eb.c

+21 −0
Original line number Diff line number Diff line
@@ -331,6 +331,26 @@ static struct platform_device pmu_device = { 
	.resource		= pmu_resources,

};



static struct resource char_lcd_resources[] = {

	{

		.start = REALVIEW_CHAR_LCD_BASE,

		.end   = (REALVIEW_CHAR_LCD_BASE + SZ_4K - 1),

		.flags = IORESOURCE_MEM,

	},

	{

		.start	= IRQ_EB_CHARLCD,

		.end	= IRQ_EB_CHARLCD,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device char_lcd_device = {

	.name		=	"arm-charlcd",

	.id		=	-1,

	.num_resources	=	ARRAY_SIZE(char_lcd_resources),

	.resource	=	char_lcd_resources,

};



static void __init gic_init_irq(void)

{

	if (core_tile_eb11mp() || core_tile_a9mp()) {
@@ -449,6 +469,7 @@ static void __init realview_eb_init(void) 


	realview_flash_register(&realview_eb_flash_resource, 1);

	platform_device_register(&realview_i2c_device);

	platform_device_register(&char_lcd_device);

	eth_device_register();

	realview_usb_register(realview_eb_isp1761_resources);

arch/arm/mach-realview/realview_pb1176.c

+21 −0
Original line number Diff line number Diff line
@@ -281,6 +281,26 @@ static struct platform_device pmu_device = { 
	.resource		= &pmu_resource,

};



static struct resource char_lcd_resources[] = {

	{

		.start = REALVIEW_CHAR_LCD_BASE,

		.end   = (REALVIEW_CHAR_LCD_BASE + SZ_4K - 1),

		.flags = IORESOURCE_MEM,

	},

	{

		.start	= IRQ_PB1176_CHARLCD,

		.end	= IRQ_PB1176_CHARLCD,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device char_lcd_device = {

	.name		=	"arm-charlcd",

	.id		=	-1,

	.num_resources	=	ARRAY_SIZE(char_lcd_resources),

	.resource	=	char_lcd_resources,

};



static void __init gic_init_irq(void)

{

	/* ARM1176 DevChip GIC, primary */
@@ -343,6 +363,7 @@ static void __init realview_pb1176_init(void) 
	platform_device_register(&realview_i2c_device);

	realview_usb_register(realview_pb1176_isp1761_resources);

	platform_device_register(&pmu_device);

	platform_device_register(&char_lcd_device);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];

arch/arm/mach-versatile/core.c

+16 −0
Original line number Diff line number Diff line
@@ -355,6 +355,21 @@ static struct mmci_platform_data mmc0_plat_data = { 
	.gpio_cd	= -1,

};



static struct resource char_lcd_resources[] = {

	{

		.start = VERSATILE_CHAR_LCD_BASE,

		.end   = (VERSATILE_CHAR_LCD_BASE + SZ_4K - 1),

		.flags = IORESOURCE_MEM,

	},

};



static struct platform_device char_lcd_device = {

	.name           =       "arm-charlcd",

	.id             =       -1,

	.num_resources  =       ARRAY_SIZE(char_lcd_resources),

	.resource       =       char_lcd_resources,

};



/*

 * Clock handling

 */
@@ -853,6 +868,7 @@ void __init versatile_init(void) 
	platform_device_register(&versatile_flash_device);

	platform_device_register(&versatile_i2c_device);

	platform_device_register(&smc91x_device);

	platform_device_register(&char_lcd_device);



	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {

		struct amba_device *d = amba_devs[i];