Skip to contentSkip to conversation

Samsung SoC device updates (rev2)

PATCH New Ben Dooks 2 participants 10 messages Jan 18, 2010 – Jan 19, 2010

Subsystems (5)
Documentation Arm (32-bit) Arm sub-architectures Arm Samsung Exynos +1 more subsystems
lore
Share & tools
lore

Ben Dooks

author
#0 lore raw

Updated series to include the s3c24xx_mci_set_platdata() call.

Current branch next-samsung-devupdates1

author
#1 lore raw

PATCH 1/1 ARM: S3C: Rename s3c_device_usb to s3c_device_ohci

Prepare for the forthcoming device changes by renaming s3c_device_usb to s3c_device_ohci as this is what the device represents.

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c2410/mach-amlm5900.c   |    2 +-
 arch/arm/mach-s3c2410/mach-bast.c       |    2 +-
 arch/arm/mach-s3c2410/mach-h1940.c      |    2 +-
 arch/arm/mach-s3c2410/mach-n30.c        |    2 +-
 arch/arm/mach-s3c2410/mach-otom.c       |    2 +-
 arch/arm/mach-s3c2410/mach-qt2410.c     |    2 +-
 arch/arm/mach-s3c2410/mach-smdk2410.c   |    2 +-
 arch/arm/mach-s3c2410/mach-tct_hammer.c |    2 +-
 arch/arm/mach-s3c2410/mach-vr1000.c     |    2 +-
 arch/arm/mach-s3c2410/usb-simtec.c      |    2 +-
 arch/arm/mach-s3c2412/mach-jive.c       |    2 +-
 arch/arm/mach-s3c2412/mach-smdk2413.c   |    2 +-
 arch/arm/mach-s3c2412/mach-vstms.c      |    2 +-
 arch/arm/mach-s3c2440/mach-anubis.c     |    2 +-
 arch/arm/mach-s3c2440/mach-at2440evb.c  |    2 +-
 arch/arm/mach-s3c2440/mach-mini2440.c   |    2 +-
 arch/arm/mach-s3c2440/mach-nexcoder.c   |    2 +-
 arch/arm/mach-s3c2440/mach-rx3715.c     |    2 +-
 arch/arm/mach-s3c2440/mach-smdk2440.c   |    2 +-
 arch/arm/mach-s3c2442/mach-gta02.c      |    4 ++--
 arch/arm/mach-s3c6410/mach-hmt.c        |    2 +-
 arch/arm/mach-s3c6410/mach-smdk6410.c   |    2 +-
 arch/arm/plat-s3c/include/plat/devs.h   |    2 +-
 arch/arm/plat-samsung/dev-usb.c         |    4 ++--
 24 files changed, 26 insertions(+), 26 deletions(-)
arch/arm/mach-s3c2410/mach-amlm5900.c +1 -1
index 06a84ad..7047317 100644
@@ -153,7 +153,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
 	&s3c_device_adc,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
-	&s3c_device_usb,
+	&s3c_device_ohci,
  	&s3c_device_rtc,
 	&s3c_device_usbgadget,
         &s3c_device_sdi,
arch/arm/mach-s3c2410/mach-bast.c +1 -1
index 97162fd..02b1b62 100644
@@ -584,7 +584,7 @@ static struct s3c_hwmon_pdata bast_hwmon_info = {
 // cat /sys/devices/platform/s3c24xx-adc/s3c-hwmon/in_0
 
 static struct platform_device *bast_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/mach-h1940.c +1 -1
index 1e34abe..3f9217d 100644
@@ -272,7 +272,7 @@ static struct platform_device h1940_lcd_powerdev = {
 
 static struct platform_device *h1940_devices[] __initdata = {
 	&s3c_device_ts,
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/mach-n30.c +1 -1
index 0405712..684710f 100644
@@ -322,7 +322,7 @@ static struct platform_device *n30_devices[] __initdata = {
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
 	&s3c_device_iis,
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_usbgadget,
 	&n30_button_device,
 	&n30_blue_led,
arch/arm/mach-s3c2410/mach-otom.c +1 -1
index f6c7261..d8c7f2e 100644
@@ -92,7 +92,7 @@ static struct platform_device otom_device_nor = {
 /* Standard OTOM devices */
 
 static struct platform_device *otom11_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/mach-qt2410.c +1 -1
index ab092bc..92a4ec3 100644
@@ -246,7 +246,7 @@ static struct platform_device qt2410_spi = {
 /* Board devices */
 
 static struct platform_device *qt2410_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/mach-smdk2410.c +1 -1
index c49126c..4522230 100644
@@ -87,7 +87,7 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] __initdata = {
 };
 
 static struct platform_device *smdk2410_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/mach-tct_hammer.c +1 -1
index 8fdb043..929164a 100644
@@ -129,7 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
 	&s3c_device_adc,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_rtc,
 	&s3c_device_usbgadget,
 	&s3c_device_sdi,
arch/arm/mach-s3c2410/mach-vr1000.c +1 -1
index 0d61fb5..9051f0d 100644
@@ -334,7 +334,7 @@ static struct i2c_board_info vr1000_i2c_devs[] __initdata = {
 /* devices for this board */
 
 static struct platform_device *vr1000_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2410/usb-simtec.c +1 -1
index 6b9d0d8..199bb4f 100644
@@ -127,6 +127,6 @@ int usb_simtec_init(void)
 	gpio_direction_output(S3C2410_GPB(4), 1);
 	gpio_direction_input(S3C2410_GPG(10));
 
-	s3c_device_usb.dev.platform_data = &usb_simtec_info;
+	s3c_device_ohci.dev.platform_data = &usb_simtec_info;
 	return 0;
 }
arch/arm/mach-s3c2412/mach-jive.c +1 -1
index c9fa3fc..14f4798 100644
@@ -468,7 +468,7 @@ static struct i2c_board_info jive_i2c_devs[] __initdata = {
 /* The platform devices being used. */
 
 static struct platform_device *jive_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_rtc,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2412/mach-smdk2413.c +1 -1
index 9a5e434..437c087 100644
@@ -104,7 +104,7 @@ static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = {
 
 
 static struct platform_device *smdk2413_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	//&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2412/mach-vstms.c +1 -1
index a6ba591..3ca9265 100644
@@ -121,7 +121,7 @@ static struct s3c2410_platform_nand __initdata vstms_nand_info = {
 };
 
 static struct platform_device *vstms_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
 	&s3c_device_iis,
arch/arm/mach-s3c2440/mach-anubis.c +1 -1
index 62a4c3e..b73f78a 100644
@@ -409,7 +409,7 @@ static struct platform_device anubis_device_sm501 = {
 /* Standard Anubis devices */
 
 static struct platform_device *anubis_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_wdt,
 	&s3c_device_adc,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2440/mach-at2440evb.c +1 -1
index aa69290..0defde6 100644
@@ -203,7 +203,7 @@ static struct s3c2410fb_mach_info at2440evb_fb_info __initdata = {
 };
 
 static struct platform_device *at2440evb_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_wdt,
 	&s3c_device_adc,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2440/mach-mini2440.c +1 -1
index 2068e90..347eb6d 100644
@@ -506,7 +506,7 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
 };
 
 static struct platform_device *mini2440_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_wdt,
 /*	&s3c_device_adc,*/ /* ADC doesn't like living with touchscreen ! */
 	&s3c_device_i2c0,
arch/arm/mach-s3c2440/mach-nexcoder.c +1 -1
index d43eded..86a243b 100644
@@ -106,7 +106,7 @@ static struct platform_device nexcoder_device_nor = {
 /* Standard Nexcoder devices */
 
 static struct platform_device *nexcoder_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2440/mach-rx3715.c +1 -1
index a952a13..1e836e5 100644
@@ -176,7 +176,7 @@ static struct s3c2410_platform_nand __initdata rx3715_nand_info = {
 };
 
 static struct platform_device *rx3715_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2440/mach-smdk2440.c +1 -1
index ec13e74..df3e9a3 100644
@@ -150,7 +150,7 @@ static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {
 };
 
 static struct platform_device *smdk2440_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
arch/arm/mach-s3c2442/mach-gta02.c +2 -2
index 0b4a3a0..825800b 100644
@@ -565,7 +565,7 @@ static void __init gta02_map_io(void)
 /* These are the guys that don't need to be children of PMU. */
 
 static struct platform_device *gta02_devices[] __initdata = {
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_wdt,
 	&s3c_device_sdi,
 	&s3c_device_usbgadget,

@@ -623,7 +623,7 @@ static void __init gta02_machine_init(void)
 	INIT_DELAYED_WORK(&gta02_charger_work, gta02_charger_worker);
 #endif
 
-	s3c_device_usb.dev.platform_data = &gta02_usb_info;
+	s3c_device_ohci.dev.platform_data = &gta02_usb_info;
 
 	s3c24xx_udc_set_platdata(&gta02_udc_cfg);
 	s3c_nand_set_platdata(&gta02_nand_info);
arch/arm/mach-s3c6410/mach-hmt.c +1 -1
index cdd4b53..284886c 100644
@@ -233,7 +233,7 @@ static struct platform_device *hmt_devices[] __initdata = {
 	&s3c_device_i2c0,
 	&s3c_device_nand,
 	&s3c_device_fb,
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_timer[1],
 	&hmt_backlight_device,
 	&hmt_leds_device,
arch/arm/mach-s3c6410/mach-smdk6410.c +1 -1
index 8969fe7..e2811fc 100644
@@ -235,7 +235,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&s3c_device_i2c0,
 	&s3c_device_i2c1,
 	&s3c_device_fb,
-	&s3c_device_usb,
+	&s3c_device_ohci,
 	&s3c_device_usb_hsotg,
 
 #ifdef CONFIG_REGULATOR
arch/arm/plat-s3c/include/plat/devs.h +1 -1
index 8a4153b..543a351 100644
@@ -34,7 +34,7 @@ extern struct platform_device s3c64xx_device_pcm1;
 
 extern struct platform_device s3c_device_ts;
 extern struct platform_device s3c_device_fb;
-extern struct platform_device s3c_device_usb;
+extern struct platform_device s3c_device_ohci;
 extern struct platform_device s3c_device_lcd;
 extern struct platform_device s3c_device_wdt;
 extern struct platform_device s3c_device_i2c0;
arch/arm/plat-samsung/dev-usb.c +2 -2
index 2ee85ab..431ae5d 100644
@@ -36,7 +36,7 @@ static struct resource s3c_usb_resource[] = {
 
 static u64 s3c_device_usb_dmamask = 0xffffffffUL;
 
-struct platform_device s3c_device_usb = {
+struct platform_device s3c_device_ohci = {
 	.name		  = "s3c2410-ohci",
 	.id		  = -1,
 	.num_resources	  = ARRAY_SIZE(s3c_usb_resource),

@@ -47,4 +47,4 @@ struct platform_device s3c_device_usb = {
 	}
 };
 
-EXPORT_SYMBOL(s3c_device_usb);
+EXPORT_SYMBOL(s3c_device_ohci);
Signature · 1 line
1.6.0.4
author
#2 lore raw

PATCH 1/1 ARM: S3C2412: Fixup commented out device in SMDK2413

In reply to Ben Dooks

The SMDK2413 has a commented out device that does not have any setup data for it, so remove it for now.

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c2412/mach-smdk2413.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)
arch/arm/mach-s3c2412/mach-smdk2413.c +0 -1
index 437c087..0392065 100644
@@ -105,7 +105,6 @@ static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = {
 
 static struct platform_device *smdk2413_devices[] __initdata = {
 	&s3c_device_ohci,
-	//&s3c_device_lcd,
 	&s3c_device_wdt,
 	&s3c_device_i2c0,
 	&s3c_device_iis,
Signature · 1 line
1.6.0.4
author
#3 lore raw

PATCH 1/1 ARM: SAMSUNG: Add initial documentation directory and overview

In reply to Ben Dooks

Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing.

Signed-off-by Ben Dooks <[email protected]>
---
 Documentation/arm/Samsung/Overview.txt |   63 ++++++++++++++++++++++++++++++++
 1 files changed, 63 insertions(+), 0 deletions(-)
 create mode 100644 Documentation/arm/Samsung/Overview.txt
Documentation/arm/Samsung/Overview.txt new file +63 -0
new file mode 100644
index 0000000..c3d2f44
@@ -0,0 +1,63 @@
+		Samsung ARM Linux Overview
+		==========================
+
+Introduction
+------------
+
+  The Samsung range of ARM SoCs spans many similar devices, from the initial
+  ARM9 through to the newest ARM cores. This document shows an overview of
+  the current kernel support, how to use it and where to find the code
+  that supports this.
+
+  The currently supported SoCs are:
+
+  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list
+  - S3C64XX: S3C6400 and S3C6410
+
+  S5PC100 and S5PC110 support is currently being merged
+
+
+S3C24XX Systems
+---------------
+
+  There is still documentation in Docuemntation/arm/Samsung-S3C24XX/ which
+  deals with the architecture and drivers specific to these devices.
+
+  See Documentation/arm/Samsung-S3C24XX/Overview.txt for more information
+  on the implementation details and specific support.
+
+
+Configuration
+-------------
+
+  A number of configurations are supplied, as there is no current way of
+  unifying all the SoCs into one kernel.
+
+  [ to finish ]
+
+Layout
+------
+
+  [ to finish ]
+
+
+Port Contributors
+-----------------
+
+  Ben Dooks (BJD)
+  Vincent Sanders
+  Herbert Potzl
+  Arnaud Patard (RTP)
+  Roc Wu
+  Klaus Fetscher
+  Dimitry Andric
+  Shannon Holland
+  Guillaume Gourat (NexVision)
+  Christer Weinigel (wingel) (Acer N30)
+  Lucas Correia Villa Real (S3C2400 port)
+
+
+Document Author
+---------------
+
+Copyright 2009 Ben Dooks <[email protected]>
Signature · 1 line
1.6.0.4
#4 lore raw

PATCH 1/1 ARM: SAMSUNG: Add initial documentation directory and overview

Op 18-01-10 09:45, Ben Dooks schreef:

Quoted 29 lines

Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing.

Signed-off-by Ben Dooks<[email protected]>
---
  Documentation/arm/Samsung/Overview.txt |   63 ++++++++++++++++++++++++++++++++
  1 files changed, 63 insertions(+), 0 deletions(-)

create mode 100644 Documentation/arm/Samsung/Overview.txt

Documentation/arm/Samsung/Overview.txt new file +13 -0
new file mode 100644
index 0000000..c3d2f44
@@ -0,0 +1,63 @@
+		Samsung ARM Linux Overview
+		==========================
+
+Introduction
+------------
+
+  The Samsung range of ARM SoCs spans many similar devices, from the initial
+  ARM9 through to the newest ARM cores. This document shows an overview of
+  the current kernel support, how to use it and where to find the code
+  that supports this.
+
+  The currently supported SoCs are:
+

Documentation/arm/Samsung/Overview.txt line 23

Quoted 10 lines
Documentation/arm/Samsung/Overview.txt new file +10 -0
+  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list
+  - S3C64XX: S3C6400 and S3C6410
+
+  S5PC100 and S5PC110 support is currently being merged
+
+
+S3C24XX Systems
+---------------
+
+  There is still documentation in Docuemntation/arm/Samsung-S3C24XX/ which

Same typo as before? Docuemntation -> Documentation

Quoted 31 lines
Documentation/arm/Samsung/Overview.txt new file +30 -0
+  deals with the architecture and drivers specific to these devices.
+
+  See Documentation/arm/Samsung-S3C24XX/Overview.txt for more information
+  on the implementation details and specific support.
+
+
+Configuration
+-------------
+
+  A number of configurations are supplied, as there is no current way of
+  unifying all the SoCs into one kernel.
+
+  [ to finish ]
+
+Layout
+------
+
+  [ to finish ]
+
+
+Port Contributors
+-----------------
+
+  Ben Dooks (BJD)
+  Vincent Sanders
+  Herbert Potzl
+  Arnaud Patard (RTP)
+  Roc Wu
+  Klaus Fetscher
+  Dimitry Andric

Documentation/arm/Samsung/Overview.txt

Quoted 10 lines
Documentation/arm/Samsung/Overview.txt new file +10 -0
+  Shannon Holland
+  Guillaume Gourat (NexVision)
+  Christer Weinigel (wingel) (Acer N30)
+  Lucas Correia Villa Real (S3C2400 port)
+
+
+Document Author
+---------------
+
+Copyright 2009 Ben Dooks<[email protected]>

Regards,
Maurus Cuelenaere

author
#5 lore raw

PATCH 1/1 ARM: SAMSUNG: Add initial documentation directory and overview

Quoted 34 lines · Maurus Cuelenaere

Op 18-01-10 09:45, Ben Dooks schreef:

Quoted 33 lines

Start Documentation/arm/Samsung and add an initial overview file which whilst is not complete, is better than nothing.

Signed-off-by Ben Dooks<[email protected]>
---
  Documentation/arm/Samsung/Overview.txt |   63 ++++++++++++++++++++++++++++++++
  1 files changed, 63 insertions(+), 0 deletions(-)

create mode 100644 Documentation/arm/Samsung/Overview.txt

Documentation/arm/Samsung/Overview.txt new file +18 -0
new file mode 100644
index 0000000..c3d2f44
@@ -0,0 +1,63 @@
+		Samsung ARM Linux Overview
+		==========================
+
+Introduction
+------------
+
+  The Samsung range of ARM SoCs spans many similar devices, from the initial
+  ARM9 through to the newest ARM cores. This document shows an overview of
+  the current kernel support, how to use it and where to find the code
+  that supports this.
+
+  The currently supported SoCs are:
+
+  - S3C24XX: See Documentation/arm/Samsung-S3C24XX/Overview.txt for full list
+  - S3C64XX: S3C6400 and S3C6410
+
+  S5PC100 and S5PC110 support is currently being merged
+
Quoted 8 lines

Documentation/arm/Samsung/Overview.txt line 23

Quoted 6 lines
Documentation/arm/Samsung/Overview.txt new file +5 -0
+
+S3C24XX Systems
+---------------
+
+  There is still documentation in Docuemntation/arm/Samsung-S3C24XX/ which

Same typo as before? Docuemntation -> Documentation

Fixed in next-samsung-doc1 branch, forgot to remove this one from this series.

Quoted 50 lines
Quoted 31 lines
Documentation/arm/Samsung/Overview.txt new file +30 -0
+  deals with the architecture and drivers specific to these devices.
+
+  See Documentation/arm/Samsung-S3C24XX/Overview.txt for more information
+  on the implementation details and specific support.
+
+
+Configuration
+-------------
+
+  A number of configurations are supplied, as there is no current way of
+  unifying all the SoCs into one kernel.
+
+  [ to finish ]
+
+Layout
+------
+
+  [ to finish ]
+
+
+Port Contributors
+-----------------
+
+  Ben Dooks (BJD)
+  Vincent Sanders
+  Herbert Potzl
+  Arnaud Patard (RTP)
+  Roc Wu
+  Klaus Fetscher
+  Dimitry Andric

Documentation/arm/Samsung/Overview.txt

Quoted 10 lines
Documentation/arm/Samsung/Overview.txt new file +10 -0
+  Shannon Holland
+  Guillaume Gourat (NexVision)
+  Christer Weinigel (wingel) (Acer N30)
+  Lucas Correia Villa Real (S3C2400 port)
+
+
+Document Author
+---------------
+
+Copyright 2009 Ben Dooks<[email protected]>

Regards,
Maurus Cuelenaere

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel at lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

Signature · 5 lines
-- 
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
author
#6 lore raw

PATCH 1/1 ARM: SAMSUNG: Make UART device code common

In reply to Ben Dooks

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 Ben Dooks <[email protected]>
---
 arch/arm/plat-s3c24xx/devs.c     |   28 ------------------------
 arch/arm/plat-s3c64xx/dev-uart.c |   29 -------------------------
 arch/arm/plat-s5p/dev-uart.c     |   28 ------------------------
 arch/arm/plat-s5pc1xx/dev-uart.c |   29 -------------------------
 arch/arm/plat-samsung/Makefile   |    1 +
 arch/arm/plat-samsung/dev-uart.c |   44 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 45 insertions(+), 114 deletions(-)
 create mode 100644 arch/arm/plat-samsung/dev-uart.c
arch/arm/plat-s3c24xx/devs.c +0 -28
index 7f686a3..38c358c 100644
@@ -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
index 62c11a6..f797f74 100644
@@ -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
index af726f4..23c7531 100644
@@ -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
index f749bc5..586c95c 100644
@@ -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
index aeb7e12..f834e42 100644
@@ -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
arch/arm/plat-samsung/dev-uart.c new file +44 -0

44 lines not on this page · raw message

Signature · 1 line
1.6.0.4
author
#7 lore raw

PATCH 1/1 ARM: SAMSUNG: Add platform data registration for OHCI

In reply to Ben Dooks

Add a platform data helper for the OHCI device

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c2410/usb-simtec.c           |    4 ++--
 arch/arm/mach-s3c2442/mach-gta02.c           |    5 ++---
 arch/arm/plat-s3c/include/plat/usb-control.h |    2 ++
 arch/arm/plat-samsung/dev-usb.c              |   21 ++++++++++++++++++++-
 4 files changed, 26 insertions(+), 6 deletions(-)
arch/arm/mach-s3c2410/usb-simtec.c +2 -2
index 199bb4f..29bd3d9 100644
@@ -91,7 +91,7 @@ static void usb_simtec_enableoc(struct s3c2410_hcd_info *info, int on)
 	}
 }
 
-static struct s3c2410_hcd_info usb_simtec_info = {
+static struct s3c2410_hcd_info usb_simtec_info __initdata = {
 	.port[0]	= {
 		.flags	= S3C_HCDFLG_USED
 	},

@@ -127,6 +127,6 @@ int usb_simtec_init(void)
 	gpio_direction_output(S3C2410_GPB(4), 1);
 	gpio_direction_input(S3C2410_GPG(10));
 
-	s3c_device_ohci.dev.platform_data = &usb_simtec_info;
+	s3c_ohci_set_platdata(&usb_simtec_info);
 	return 0;
 }
arch/arm/mach-s3c2442/mach-gta02.c +2 -3
index 825800b..45799c6 100644
@@ -544,7 +544,7 @@ static struct platform_device gta02_bl_dev = {
 
 
 /* USB */
-static struct s3c2410_hcd_info gta02_usb_info = {
+static struct s3c2410_hcd_info gta02_usb_info __initdata = {
 	.port[0]	= {
 		.flags	= S3C_HCDFLG_USED,
 	},

@@ -623,9 +623,8 @@ static void __init gta02_machine_init(void)
 	INIT_DELAYED_WORK(&gta02_charger_work, gta02_charger_worker);
 #endif
 
-	s3c_device_ohci.dev.platform_data = &gta02_usb_info;
-
 	s3c24xx_udc_set_platdata(&gta02_udc_cfg);
+	s3c_ohci_set_platdata(&gta02_usb_info);
 	s3c_nand_set_platdata(&gta02_nand_info);
 	s3c_i2c0_set_platdata(NULL);
arch/arm/plat-s3c/include/plat/usb-control.h +2 -0
index 822c87f..a6a57bf 100644
@@ -38,4 +38,6 @@ static void inline s3c2410_usb_report_oc(struct s3c2410_hcd_info *info, int port
 	}
 }
 
+extern void s3c_ohci_set_platdata(struct s3c2410_hcd_info *info);
+
 #endif /*__ASM_ARCH_USBCONTROL_H */
arch/arm/plat-samsung/dev-usb.c +20 -1
index 431ae5d..8816565 100644
@@ -19,7 +19,7 @@
 #include <mach/map.h>
 
 #include <plat/devs.h>
-
+#include <plat/usb-control.h>
 
 static struct resource s3c_usb_resource[] = {
 	[0] = {

@@ -48,3 +48,22 @@ struct platform_device s3c_device_ohci = {
 };
 
 EXPORT_SYMBOL(s3c_device_ohci);
+
+/**
+ * s3c_ohci_set_platdata - initialise OHCI device platform data
+ * @info: The platform data.
+ *
+ * This call copies the @info passed in and sets the device .platform_data
+ * field to that copy. The @info is copied so that the original can be marked
+ * __initdata.
+ */
+void __init s3c_ohci_set_platdata(struct s3c2410_hcd_info *info)
+{
+	struct s3c2410_hcd_info *npd;
+
+	npd = kmemdup(info, sizeof(struct s3c2410_hcd_info), GFP_KERNEL);
+	if (!npd)
+		printk(KERN_ERR "%s: no memory for platform data\n", __func__);
+
+	s3c_device_ohci.dev.platform_data = npd;
+}
Signature · 1 line
1.6.0.4
author
#8 lore raw

PATCH 1/1 ARM: MINI2440: Remove commented out devices from device array

In reply to Ben Dooks

There's no point in having these in until there is proper support for them, so remove as they only confuse the device changing script.

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c2440/mach-mini2440.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)
arch/arm/mach-s3c2440/mach-mini2440.c +0 -3
index 347eb6d..65ea3b5 100644
@@ -508,7 +508,6 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
 static struct platform_device *mini2440_devices[] __initdata = {
 	&s3c_device_ohci,
 	&s3c_device_wdt,
-/*	&s3c_device_adc,*/ /* ADC doesn't like living with touchscreen ! */
 	&s3c_device_i2c0,
 	&s3c_device_rtc,
 	&s3c_device_usbgadget,

@@ -522,8 +521,6 @@ static struct platform_device *mini2440_devices[] __initdata = {
 	&s3c_device_sdi,
 	&s3c_device_iis,
 	&mini2440_audio,
-/*	&s3c_device_timer[0],*/	/* buzzer pwm, no API for it */
-	/* remaining devices are optional */
 };
 
 static void __init mini2440_map_io(void)
Signature · 1 line
1.6.0.4
author
#9 lore raw

PATCH 1/1 ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().

In reply to Ben Dooks

Add a s3c24xx_mci_set_platdata() call for all the machine files that have platform data for the MCI driver. This brings the MCI device into line with the other devices with __initdata and a specific call to ensure the right structure type is being passed.

Signed-off-by Ben Dooks <[email protected]>
---
 arch/arm/mach-s3c2410/mach-h1940.c       |    5 ++---
 arch/arm/mach-s3c2440/mach-at2440evb.c   |    5 ++---
 arch/arm/mach-s3c2440/mach-mini2440.c    |    3 +--
 arch/arm/plat-s3c24xx/devs.c             |   12 ++++++++++++
 arch/arm/plat-s3c24xx/include/plat/mci.h |    9 +++++++++
 5 files changed, 26 insertions(+), 8 deletions(-)
arch/arm/mach-s3c2410/mach-h1940.c +2 -3
index 3f9217d..fbedd07 100644
@@ -196,7 +196,7 @@ static struct platform_device h1940_device_bluetooth = {
 	.id               = -1,
 };
 
-static struct s3c24xx_mci_pdata h1940_mmc_cfg = {
+static struct s3c24xx_mci_pdata h1940_mmc_cfg __initdata = {
 	.gpio_detect   = S3C2410_GPF(5),
 	.gpio_wprotect = S3C2410_GPH(8),
 	.set_power     = NULL,

@@ -311,12 +311,11 @@ static void __init h1940_init(void)
 	u32 tmp;
 
 	s3c24xx_fb_set_platdata(&h1940_fb_info);
+	s3c24xx_mci_set_platdata(&h1940_mmc_cfg);
  	s3c24xx_udc_set_platdata(&h1940_udc_cfg);
 	s3c24xx_ts_set_platdata(&h1940_ts_cfg);
 	s3c_i2c0_set_platdata(NULL);
 
-	s3c_device_sdi.dev.platform_data = &h1940_mmc_cfg;
-
 	/* Turn off suspend on both USB ports, and switch the
 	 * selectable USB port to USB device mode. */
arch/arm/mach-s3c2440/mach-at2440evb.c +2 -3
index 0defde6..8472579 100644
@@ -165,7 +165,7 @@ static struct platform_device at2440evb_device_eth = {
 	},
 };
 
-static struct s3c24xx_mci_pdata at2440evb_mci_pdata = {
+static struct s3c24xx_mci_pdata at2440evb_mci_pdata __initdata = {
 	.gpio_detect	= S3C2410_GPG(10),
 };
 

@@ -216,8 +216,6 @@ static struct platform_device *at2440evb_devices[] __initdata = {
 
 static void __init at2440evb_map_io(void)
 {
-	s3c_device_sdi.dev.platform_data = &at2440evb_mci_pdata;
-
 	s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));
 	s3c24xx_init_clocks(16934400);
 	s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs));

@@ -226,6 +224,7 @@ static void __init at2440evb_map_io(void)
 static void __init at2440evb_init(void)
 {
 	s3c24xx_fb_set_platdata(&at2440evb_fb_info);
+	s3c24xx_mci_set_platdata(&at2440evb_mci_pdata);
 	s3c_nand_set_platdata(&at2440evb_nand_info);
 	s3c_i2c0_set_platdata(NULL);
arch/arm/mach-s3c2440/mach-mini2440.c +1 -2
index 65ea3b5..571b176 100644
@@ -528,8 +528,6 @@ static void __init mini2440_map_io(void)
 	s3c24xx_init_io(mini2440_iodesc, ARRAY_SIZE(mini2440_iodesc));
 	s3c24xx_init_clocks(12000000);
 	s3c24xx_init_uarts(mini2440_uartcfgs, ARRAY_SIZE(mini2440_uartcfgs));
-
-	s3c_device_sdi.dev.platform_data = &mini2440_mmc_cfg;
 }
 
 /*

@@ -675,6 +673,7 @@ static void __init mini2440_init(void)
 	}
 
 	s3c24xx_udc_set_platdata(&mini2440_udc_cfg);
+	s3c24xx_mci_set_platdata(&mini2440_mmc_cfg);
 	s3c_nand_set_platdata(&mini2440_nand_info);
 	s3c_i2c0_set_platdata(NULL);
arch/arm/plat-s3c24xx/devs.c +12 -0
index 38c358c..3acb534 100644
@@ -351,6 +351,18 @@ struct platform_device s3c_device_sdi = {
 
 EXPORT_SYMBOL(s3c_device_sdi);
 
+void s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata)
+{
+	struct s3c24xx_mci_pdata *npd;
+
+	npd = kmemdup(pdata, sizeof(struct s3c24xx_mci_pdata), GFP_KERNEL);
+	if (!npd)
+		printk(KERN_ERR "%s: no memory to copy pdata", __func__);
+
+	s3c_device_sdi.dev.platform_data = npd;
+}
+
+
 /* SPI (0) */
 
 static struct resource s3c_spi0_resource[] = {
arch/arm/plat-s3c24xx/include/plat/mci.h +9 -0
index 36aaa10..2ac2b21 100644
@@ -40,4 +40,13 @@ struct s3c24xx_mci_pdata {
 				     unsigned short vdd);
 };
 
+/**
+ * s3c24xx_mci_set_platdata - set platform data for mmc/sdi device
+ * @pdata: The platform data
+ *
+ * Copy the platform data supplied by @pdata so that this can be marked
+ * __initdata.
+ */
+extern void s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata);
+
 #endif /* _ARCH_NCI_H */
Signature · 1 line
1.6.0.4