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

Commit 57e5171c authored by Ben Dooks's avatar Ben Dooks Committed by Russell King
Browse files

[ARM] 4325/1: S3C24XX: remove s3c24xx_board 



Remove the use of struct s3c24xx_board as
this is just as easily done by using the
platform device registration functions to
make the initialisation sequence easier.

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

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

+1 −6
Original line number Diff line number Diff line
@@ -160,17 +160,11 @@ static struct platform_device *amlm5900_devices[] __initdata = { 
#endif

};



static struct s3c24xx_board amlm5900_board __initdata = {

	.devices       = amlm5900_devices,

	.devices_count = ARRAY_SIZE(amlm5900_devices)

};



void __init amlm5900_map_io(void)

{

	s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));

	s3c24xx_set_board(&amlm5900_board);

}



#ifdef CONFIG_FB_S3C2410
@@ -247,6 +241,7 @@ static void __init amlm5900_init(void) 
#ifdef CONFIG_FB_S3C2410

	s3c24xx_fb_set_platdata(&amlm5900_lcd_info);

#endif

	platform_add_devices(amlm5900_devices, ARRAY_SIZE(amlm5900_devices));

}



MACHINE_START(AML_M5900, "AML_M5900")

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

+2 −6
Original line number Diff line number Diff line
@@ -464,11 +464,6 @@ static struct clk *bast_clocks[] = { 
	&s3c24xx_uclk,

};



static struct s3c24xx_board bast_board __initdata = {

	.devices       = bast_devices,

	.devices_count = ARRAY_SIZE(bast_devices),

};



static void __init bast_map_io(void)

{

	/* initialise the clocks */
@@ -492,13 +487,14 @@ static void __init bast_map_io(void) 
	s3c24xx_init_io(bast_iodesc, ARRAY_SIZE(bast_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(bast_uartcfgs, ARRAY_SIZE(bast_uartcfgs));

	s3c24xx_set_board(&bast_board);



	usb_simtec_init();

}



static void __init bast_init(void)

{

	s3c24xx_fb_set_platdata(&bast_lcd_info);

	platform_add_devices(bast_devices, ARRAY_SIZE(bast_devices));

}



MACHINE_START(BAST, "Simtec-BAST")

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

+2 −7
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ static struct s3c2410_udc_mach_info h1940_udc_cfg __initdata = { 
};







/**

 * Set lcd on or off

 **/
@@ -188,17 +187,11 @@ static struct platform_device *h1940_devices[] __initdata = { 
	&s3c_device_leds,

};



static struct s3c24xx_board h1940_board __initdata = {

	.devices       = h1940_devices,

	.devices_count = ARRAY_SIZE(h1940_devices)

};



static void __init h1940_map_io(void)

{

	s3c24xx_init_io(h1940_iodesc, ARRAY_SIZE(h1940_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(h1940_uartcfgs, ARRAY_SIZE(h1940_uartcfgs));

	s3c24xx_set_board(&h1940_board);



	/* setup PM */
@@ -232,6 +225,8 @@ static void __init h1940_init(void) 
	      | (0x02 << S3C2410_PLLCON_PDIVSHIFT)

	      | (0x03 << S3C2410_PLLCON_SDIVSHIFT);

	writel(tmp, S3C2410_UPLLCON);



	platform_add_devices(h1940_devices, ARRAY_SIZE(h1940_devices));

}



MACHINE_START(H1940, "IPAQ-H1940")

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

+2 −6
Original line number Diff line number Diff line
@@ -90,17 +90,11 @@ static struct s3c2410_platform_i2c n30_i2ccfg = { 
	.max_freq	= 10*1000,

};



static struct s3c24xx_board n30_board __initdata = {

	.devices       = n30_devices,

	.devices_count = ARRAY_SIZE(n30_devices)

};



static void __init n30_map_io(void)

{

	s3c24xx_init_io(n30_iodesc, ARRAY_SIZE(n30_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(n30_uartcfgs, ARRAY_SIZE(n30_uartcfgs));

	s3c24xx_set_board(&n30_board);

}



static void __init n30_init_irq(void)
@@ -120,6 +114,8 @@ static void __init n30_init(void) 
	s3c2410_modify_misccr(S3C2410_MISCCR_USBHOST |

			      S3C2410_MISCCR_USBSUSPND0 |

			      S3C2410_MISCCR_USBSUSPND1, 0x0);



	platform_add_devices(n30_devices, ARRAY_SIZE(n30_devices));

}



MACHINE_START(N30, "Acer-N30")

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

+5 −7
Original line number Diff line number Diff line
@@ -100,20 +100,17 @@ static struct platform_device *otom11_devices[] __initdata = { 
	&otom_device_nor,

};



static struct s3c24xx_board otom11_board __initdata = {

	.devices       = otom11_devices,

	.devices_count = ARRAY_SIZE(otom11_devices)

};





static void __init otom11_map_io(void)

{

	s3c24xx_init_io(otom11_iodesc, ARRAY_SIZE(otom11_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(otom11_uartcfgs, ARRAY_SIZE(otom11_uartcfgs));

	s3c24xx_set_board(&otom11_board);

}



static void __init otom11_init(void)

{

	platform_add_devices(otom11_devices, ARRAY_SIZE(otom11_devices));

}



MACHINE_START(OTOM, "Nex Vision - Otom 1.1")

	/* Maintainer: Guillaume GOURAT <guillaume.gourat@nexvision.tv> */
@@ -121,6 +118,7 @@ MACHINE_START(OTOM, "Nex Vision - Otom 1.1") 
	.io_pg_offst	= (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,

	.boot_params	= S3C2410_SDRAM_PA + 0x100,

	.map_io		= otom11_map_io,

	.init_machine	= otom11_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

MACHINE_END