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

Commit 0a636131 authored by Ben Dooks's avatar Ben Dooks
Browse files

ARM: SAMSUNG: Make UART device code common 



Move s3c24xx_uart_devs, s3c24xx_uart_src and the platform devices to a
common entry in plat-samsung since they are the same in all the current
implementations.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 0f61628e

arch/arm/plat-s3c24xx/devs.c

+0 −28
Original line number Diff line number Diff line
@@ -112,34 +112,6 @@ struct s3c24xx_uart_resources s3c2410_uart_resources[] __initdata = { 
	},

};



/* 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,

};



static struct platform_device s3c24xx_uart_device3 = {

	.id		= 3,

};



struct platform_device *s3c24xx_uart_src[4] = {

	&s3c24xx_uart_device0,

	&s3c24xx_uart_device1,

	&s3c24xx_uart_device2,

	&s3c24xx_uart_device3,

};



struct platform_device *s3c24xx_uart_devs[4] = {

};



/* LCD Controller */



static struct resource s3c_lcd_resource[] = {

arch/arm/plat-s3c64xx/dev-uart.c

+0 −29
Original line number Diff line number Diff line
@@ -145,32 +145,3 @@ struct s3c24xx_uart_resources s3c64xx_uart_resources[] __initdata = { 
		.nr_resources	= ARRAY_SIZE(s3c64xx_uart3_resource),

	},

};
 


/* uart 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,

};



static struct platform_device s3c24xx_uart_device3 = {

	.id		= 3,

};



struct platform_device *s3c24xx_uart_src[4] = {

	&s3c24xx_uart_device0,

	&s3c24xx_uart_device1,

	&s3c24xx_uart_device2,

	&s3c24xx_uart_device3,

};



struct platform_device *s3c24xx_uart_devs[4] = {

};

arch/arm/plat-s5p/dev-uart.c

+0 −28
Original line number Diff line number Diff line
@@ -135,31 +135,3 @@ struct s3c24xx_uart_resources s5p_uart_resources[] __initdata = { 
		.nr_resources	= ARRAY_SIZE(s5p_uart3_resource),

	},

};
 


/* uart devices */



static struct platform_device s5p_uart_device0 = {

	.id		= 0,

};



static struct platform_device s5p_uart_device1 = {

	.id		= 1,

};



static struct platform_device s5p_uart_device2 = {

	.id		= 2,

};



static struct platform_device s5p_uart_device3 = {

	.id		= 3,

};



struct platform_device *s3c24xx_uart_src[4] = {

	&s5p_uart_device0,

	&s5p_uart_device1,

	&s5p_uart_device2,

	&s5p_uart_device3,

};



struct platform_device *s3c24xx_uart_devs[4] = {

};

arch/arm/plat-s5pc1xx/dev-uart.c

+0 −29
Original line number Diff line number Diff line
@@ -143,32 +143,3 @@ struct s3c24xx_uart_resources s5pc1xx_uart_resources[] __initdata = { 
		.nr_resources	= ARRAY_SIZE(s5pc1xx_uart3_resource),

	},

};
 


/* uart 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,

};



static struct platform_device s3c24xx_uart_device3 = {

	.id		= 3,

};



struct platform_device *s3c24xx_uart_src[4] = {

	&s3c24xx_uart_device0,

	&s3c24xx_uart_device1,

	&s3c24xx_uart_device2,

	&s3c24xx_uart_device3,

};



struct platform_device *s3c24xx_uart_devs[4] = {

};

arch/arm/plat-samsung/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ obj-$(CONFIG_S3C_DEV_HSMMC2) += dev-hsmmc2.o 
obj-y				+= dev-i2c0.o

obj-$(CONFIG_S3C_DEV_I2C1)	+= dev-i2c1.o

obj-$(CONFIG_S3C_DEV_FB)	+= dev-fb.o

obj-y				+= dev-uart.o

obj-$(CONFIG_S3C_DEV_USB_HOST)	+= dev-usb.o

obj-$(CONFIG_S3C_DEV_USB_HSOTG)	+= dev-usb-hsotg.o

obj-$(CONFIG_S3C_DEV_NAND)	+= dev-nand.o