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

Commit 66a9b49a authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 3557/1: S3C24XX: centralise and cleanup uart registration 



Patch from Ben Dooks

All the S3C24XX based devices currently have similar
uart blocks, in the same location. Make the process
of adding new uart blocks easier by commonising the
device definitions and adding a new init function
for the cpu code.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 810c894f

arch/arm/mach-s3c2410/cpu.c

+49 −0
Original line number Diff line number Diff line
@@ -37,8 +37,10 @@ 
#include <asm/mach/map.h>



#include <asm/arch/regs-gpio.h>

#include <asm/arch/regs-serial.h>



#include "cpu.h"

#include "devs.h"

#include "clock.h"

#include "s3c2400.h"

#include "s3c2410.h"
@@ -208,6 +210,49 @@ void __init s3c24xx_init_clocks(int xtal) 
		(cpu->init_clocks)(xtal);

}



/* uart management */



static int nr_uarts __initdata = 0;



static struct s3c2410_uartcfg uart_cfgs[3];



/* s3c24xx_init_uartdevs

 *

 * copy the specified platform data and configuration into our central

 * set of devices, before the data is thrown away after the init process.

 *

 * This also fills in the array passed to the serial driver for the

 * early initialisation of the console.

*/



void __init s3c24xx_init_uartdevs(char *name,

				  struct s3c24xx_uart_resources *res,

				  struct s3c2410_uartcfg *cfg, int no)

{

	struct platform_device *platdev;

	struct s3c2410_uartcfg *cfgptr = uart_cfgs;

	struct s3c24xx_uart_resources *resp;

	int uart;



	memcpy(cfgptr, cfg, sizeof(struct s3c2410_uartcfg) * no);



	for (uart = 0; uart < no; uart++, cfg++, cfgptr++) {

		platdev = s3c24xx_uart_src[cfgptr->hwport];



		resp = res + cfgptr->hwport;



		s3c24xx_uart_devs[uart] = platdev;



		platdev->name = name;

		platdev->resource = resp->resources;

		platdev->num_resources = resp->nr_resources;



		platdev->dev.platform_data = cfgptr;

	}



	nr_uarts = no;

}



void __init s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)

{

	if (cpu == NULL)
@@ -232,6 +277,10 @@ static int __init s3c_arch_init(void) 
	if (ret != 0)

		return ret;



	ret = platform_add_devices(s3c24xx_uart_devs, nr_uarts);

	if (ret != 0)

		return ret;



	if (board != NULL) {

		struct platform_device **ptr = board->devices;

		int i;

arch/arm/mach-s3c2410/cpu.h

+6 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#define print_mhz(m) ((m) / MHZ), ((m / 1000) % 1000)



/* forward declaration */

struct s3c24xx_uart_resources;

struct platform_device;

struct s3c2410_uartcfg;

struct map_desc;
@@ -44,6 +46,10 @@ extern void s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no); 


extern void s3c24xx_init_clocks(int xtal);



extern void s3c24xx_init_uartdevs(char *name,

				  struct s3c24xx_uart_resources *res,

				  struct s3c2410_uartcfg *cfg, int no);



/* the board structure is used at first initialsation time

 * to get info such as the devices to register for this

 * board. This is done because platfrom_add_devices() cannot

arch/arm/mach-s3c2410/devs.c

+77 −1
Original line number Diff line number Diff line
@@ -38,10 +38,86 @@ 
#include <asm/arch/regs-serial.h>



#include "devs.h"

#include "cpu.h"



/* Serial port registrations */



struct platform_device *s3c24xx_uart_devs[3];

static struct resource s3c2410_uart0_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART0,

		.end   = S3C2410_PA_UART0 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX0,

		.end   = IRQ_S3CUART_ERR0,

		.flags = IORESOURCE_IRQ,

	}

};



static struct resource s3c2410_uart1_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART1,

		.end   = S3C2410_PA_UART1 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX1,

		.end   = IRQ_S3CUART_ERR1,

		.flags = IORESOURCE_IRQ,

	}

};



static struct resource s3c2410_uart2_resource[] = {

	[0] = {

		.start = S3C2410_PA_UART2,

		.end   = S3C2410_PA_UART2 + 0x3fff,

		.flags = IORESOURCE_MEM,

	},

	[1] = {

		.start = IRQ_S3CUART_RX2,

		.end   = IRQ_S3CUART_ERR2,

		.flags = IORESOURCE_IRQ,

	}

};



struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = {

	[0] = {

		.resources	= s3c2410_uart0_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart0_resource),

	},

	[1] = {

		.resources	= s3c2410_uart1_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart1_resource),

	},

	[2] = {

		.resources	= s3c2410_uart2_resource,

		.nr_resources	= ARRAY_SIZE(s3c2410_uart2_resource),

	},

};



/* yart devices */



static struct platform_device s3c24xx_uart_device0 = {

	.id		= 0,

};



static struct platform_device s3c24xx_uart_device1 = {

	.id		= 1,

};



static struct platform_device s3c24xx_uart_device2 = {

	.id		= 2,

};



struct platform_device *s3c24xx_uart_src[3] = {

	&s3c24xx_uart_device0,

	&s3c24xx_uart_device1,

	&s3c24xx_uart_device2,

};



struct platform_device *s3c24xx_uart_devs[3] = {

};



/* USB Host Controller */

arch/arm/mach-s3c2410/devs.h

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

#include <linux/platform_device.h>



struct s3c24xx_uart_resources {

	struct resource		*resources;

	unsigned long		 nr_resources;

};



extern struct s3c24xx_uart_resources s3c2410_uart_resources[];



extern struct platform_device *s3c24xx_uart_devs[];

extern struct platform_device *s3c24xx_uart_src[];



extern struct platform_device s3c_device_usb;

extern struct platform_device s3c_device_lcd;

arch/arm/mach-s3c2410/mach-anubis.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = { 
};





static struct s3c2410_uartcfg anubis_uartcfgs[] = {

static struct s3c2410_uartcfg anubis_uartcfgs[] __initdata = {

	[0] = {

		.hwport	     = 0,

		.flags	     = 0,