Skip to content

L
linux
Commit b813248c authored by Ben Dooks's avatar Ben Dooks
Browse files
Options

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: default avatarBen Dooks <ben-linux@fluff.org>
parent 501dae90
Show whitespace changes
Inline Side-by-side
Showing with 26 additions and 26 deletions
arch/arm/mach-s3c2410/mach-amlm5900.c
View file @ b813248c
...@@ -153,7 +153,7 @@ static struct platform_device *amlm5900_devices[] __initdata = { ...@@ -153,7 +153,7 @@ static struct platform_device *amlm5900_devices[] __initdata = {
&s3c_device_adc, &s3c_device_adc,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_rtc, &s3c_device_rtc,
&s3c_device_usbgadget, &s3c_device_usbgadget,
&s3c_device_sdi, &s3c_device_sdi,
......
arch/arm/mach-s3c2410/mach-bast.c
View file @ b813248c
...@@ -584,7 +584,7 @@ static struct s3c_hwmon_pdata bast_hwmon_info = { ...@@ -584,7 +584,7 @@ static struct s3c_hwmon_pdata bast_hwmon_info = {
// cat /sys/devices/platform/s3c24xx-adc/s3c-hwmon/in_0 // cat /sys/devices/platform/s3c24xx-adc/s3c-hwmon/in_0
static struct platform_device *bast_devices[] __initdata = { static struct platform_device *bast_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/mach-h1940.c
View file @ b813248c
...@@ -272,7 +272,7 @@ static struct platform_device h1940_lcd_powerdev = { ...@@ -272,7 +272,7 @@ static struct platform_device h1940_lcd_powerdev = {
static struct platform_device *h1940_devices[] __initdata = { static struct platform_device *h1940_devices[] __initdata = {
&s3c_device_ts, &s3c_device_ts,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/mach-n30.c
View file @ b813248c
...@@ -322,7 +322,7 @@ static struct platform_device *n30_devices[] __initdata = { ...@@ -322,7 +322,7 @@ static struct platform_device *n30_devices[] __initdata = {
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_iis, &s3c_device_iis,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_usbgadget, &s3c_device_usbgadget,
&n30_button_device, &n30_button_device,
&n30_blue_led, &n30_blue_led,
......
arch/arm/mach-s3c2410/mach-otom.c
View file @ b813248c
...@@ -92,7 +92,7 @@ static struct platform_device otom_device_nor = { ...@@ -92,7 +92,7 @@ static struct platform_device otom_device_nor = {
/* Standard OTOM devices */ /* Standard OTOM devices */
static struct platform_device *otom11_devices[] __initdata = { static struct platform_device *otom11_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/mach-qt2410.c
View file @ b813248c
...@@ -246,7 +246,7 @@ static struct platform_device qt2410_spi = { ...@@ -246,7 +246,7 @@ static struct platform_device qt2410_spi = {
/* Board devices */ /* Board devices */
static struct platform_device *qt2410_devices[] __initdata = { static struct platform_device *qt2410_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/mach-smdk2410.c
View file @ b813248c
...@@ -87,7 +87,7 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] __initdata = { ...@@ -87,7 +87,7 @@ static struct s3c2410_uartcfg smdk2410_uartcfgs[] __initdata = {
}; };
static struct platform_device *smdk2410_devices[] __initdata = { static struct platform_device *smdk2410_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/mach-tct_hammer.c
View file @ b813248c
...@@ -129,7 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = { ...@@ -129,7 +129,7 @@ static struct platform_device *tct_hammer_devices[] __initdata = {
&s3c_device_adc, &s3c_device_adc,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_rtc, &s3c_device_rtc,
&s3c_device_usbgadget, &s3c_device_usbgadget,
&s3c_device_sdi, &s3c_device_sdi,
......
arch/arm/mach-s3c2410/mach-vr1000.c
View file @ b813248c
...@@ -334,7 +334,7 @@ static struct i2c_board_info vr1000_i2c_devs[] __initdata = { ...@@ -334,7 +334,7 @@ static struct i2c_board_info vr1000_i2c_devs[] __initdata = {
/* devices for this board */ /* devices for this board */
static struct platform_device *vr1000_devices[] __initdata = { static struct platform_device *vr1000_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2410/usb-simtec.c
View file @ b813248c
...@@ -127,6 +127,6 @@ int usb_simtec_init(void) ...@@ -127,6 +127,6 @@ int usb_simtec_init(void)
gpio_direction_output(S3C2410_GPB(4), 1); gpio_direction_output(S3C2410_GPB(4), 1);
gpio_direction_input(S3C2410_GPG(10)); 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; return 0;
} }
arch/arm/mach-s3c2412/mach-jive.c
View file @ b813248c
...@@ -468,7 +468,7 @@ static struct i2c_board_info jive_i2c_devs[] __initdata = { ...@@ -468,7 +468,7 @@ static struct i2c_board_info jive_i2c_devs[] __initdata = {
/* The platform devices being used. */ /* The platform devices being used. */
static struct platform_device *jive_devices[] __initdata = { static struct platform_device *jive_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_rtc, &s3c_device_rtc,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2412/mach-smdk2413.c
View file @ b813248c
...@@ -104,7 +104,7 @@ static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = { ...@@ -104,7 +104,7 @@ static struct s3c2410_udc_mach_info smdk2413_udc_cfg __initdata = {
static struct platform_device *smdk2413_devices[] __initdata = { static struct platform_device *smdk2413_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
//&s3c_device_lcd, //&s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2412/mach-vstms.c
View file @ b813248c
...@@ -121,7 +121,7 @@ static struct s3c2410_platform_nand __initdata vstms_nand_info = { ...@@ -121,7 +121,7 @@ static struct s3c2410_platform_nand __initdata vstms_nand_info = {
}; };
static struct platform_device *vstms_devices[] __initdata = { static struct platform_device *vstms_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_iis, &s3c_device_iis,
......
arch/arm/mach-s3c2440/mach-anubis.c
View file @ b813248c
...@@ -409,7 +409,7 @@ static struct platform_device anubis_device_sm501 = { ...@@ -409,7 +409,7 @@ static struct platform_device anubis_device_sm501 = {
/* Standard Anubis devices */ /* Standard Anubis devices */
static struct platform_device *anubis_devices[] __initdata = { static struct platform_device *anubis_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_adc, &s3c_device_adc,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2440/mach-at2440evb.c
View file @ b813248c
...@@ -203,7 +203,7 @@ static struct s3c2410fb_mach_info at2440evb_fb_info __initdata = { ...@@ -203,7 +203,7 @@ static struct s3c2410fb_mach_info at2440evb_fb_info __initdata = {
}; };
static struct platform_device *at2440evb_devices[] __initdata = { static struct platform_device *at2440evb_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_adc, &s3c_device_adc,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2440/mach-mini2440.c
View file @ b813248c
...@@ -506,7 +506,7 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = { ...@@ -506,7 +506,7 @@ static struct i2c_board_info mini2440_i2c_devs[] __initdata = {
}; };
static struct platform_device *mini2440_devices[] __initdata = { static struct platform_device *mini2440_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
/* &s3c_device_adc,*/ /* ADC doesn't like living with touchscreen ! */ /* &s3c_device_adc,*/ /* ADC doesn't like living with touchscreen ! */
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2440/mach-nexcoder.c
View file @ b813248c
...@@ -106,7 +106,7 @@ static struct platform_device nexcoder_device_nor = { ...@@ -106,7 +106,7 @@ static struct platform_device nexcoder_device_nor = {
/* Standard Nexcoder devices */ /* Standard Nexcoder devices */
static struct platform_device *nexcoder_devices[] __initdata = { static struct platform_device *nexcoder_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2440/mach-rx3715.c
View file @ b813248c
...@@ -176,7 +176,7 @@ static struct s3c2410_platform_nand __initdata rx3715_nand_info = { ...@@ -176,7 +176,7 @@ static struct s3c2410_platform_nand __initdata rx3715_nand_info = {
}; };
static struct platform_device *rx3715_devices[] __initdata = { static struct platform_device *rx3715_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2440/mach-smdk2440.c
View file @ b813248c
...@@ -150,7 +150,7 @@ static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = { ...@@ -150,7 +150,7 @@ static struct s3c2410fb_mach_info smdk2440_fb_info __initdata = {
}; };
static struct platform_device *smdk2440_devices[] __initdata = { static struct platform_device *smdk2440_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_lcd, &s3c_device_lcd,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_i2c0, &s3c_device_i2c0,
......
arch/arm/mach-s3c2442/mach-gta02.c
View file @ b813248c
...@@ -565,7 +565,7 @@ static void __init gta02_map_io(void) ...@@ -565,7 +565,7 @@ static void __init gta02_map_io(void)
/* These are the guys that don't need to be children of PMU. */ /* These are the guys that don't need to be children of PMU. */
static struct platform_device *gta02_devices[] __initdata = { static struct platform_device *gta02_devices[] __initdata = {
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_wdt, &s3c_device_wdt,
&s3c_device_sdi, &s3c_device_sdi,
&s3c_device_usbgadget, &s3c_device_usbgadget,
...@@ -623,7 +623,7 @@ static void __init gta02_machine_init(void) ...@@ -623,7 +623,7 @@ static void __init gta02_machine_init(void)
INIT_DELAYED_WORK(&gta02_charger_work, gta02_charger_worker); INIT_DELAYED_WORK(&gta02_charger_work, gta02_charger_worker);
#endif #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); s3c24xx_udc_set_platdata(&gta02_udc_cfg);
s3c_nand_set_platdata(&gta02_nand_info); s3c_nand_set_platdata(&gta02_nand_info);
......
arch/arm/mach-s3c6410/mach-hmt.c
View file @ b813248c
...@@ -233,7 +233,7 @@ static struct platform_device *hmt_devices[] __initdata = { ...@@ -233,7 +233,7 @@ static struct platform_device *hmt_devices[] __initdata = {
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_nand, &s3c_device_nand,
&s3c_device_fb, &s3c_device_fb,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_timer[1], &s3c_device_timer[1],
&hmt_backlight_device, &hmt_backlight_device,
&hmt_leds_device, &hmt_leds_device,
......
arch/arm/mach-s3c6410/mach-smdk6410.c
View file @ b813248c
...@@ -235,7 +235,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { ...@@ -235,7 +235,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_i2c1, &s3c_device_i2c1,
&s3c_device_fb, &s3c_device_fb,
&s3c_device_usb, &s3c_device_ohci,
&s3c_device_usb_hsotg, &s3c_device_usb_hsotg,
#ifdef CONFIG_REGULATOR #ifdef CONFIG_REGULATOR
......
arch/arm/plat-s3c/include/plat/devs.h
View file @ b813248c
...@@ -34,7 +34,7 @@ extern struct platform_device s3c64xx_device_pcm1; ...@@ -34,7 +34,7 @@ extern struct platform_device s3c64xx_device_pcm1;
extern struct platform_device s3c_device_ts; extern struct platform_device s3c_device_ts;
extern struct platform_device s3c_device_fb; 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_lcd;
extern struct platform_device s3c_device_wdt; extern struct platform_device s3c_device_wdt;
extern struct platform_device s3c_device_i2c0; extern struct platform_device s3c_device_i2c0;
......
arch/arm/plat-samsung/dev-usb.c
View file @ b813248c
...@@ -36,7 +36,7 @@ static struct resource s3c_usb_resource[] = { ...@@ -36,7 +36,7 @@ static struct resource s3c_usb_resource[] = {
static u64 s3c_device_usb_dmamask = 0xffffffffUL; static u64 s3c_device_usb_dmamask = 0xffffffffUL;
struct platform_device s3c_device_usb = { struct platform_device s3c_device_ohci = {
.name = "s3c2410-ohci", .name = "s3c2410-ohci",
.id = -1, .id = -1,
.num_resources = ARRAY_SIZE(s3c_usb_resource), .num_resources = ARRAY_SIZE(s3c_usb_resource),
...@@ -47,4 +47,4 @@ struct platform_device s3c_device_usb = { ...@@ -47,4 +47,4 @@ struct platform_device s3c_device_usb = {
} }
}; };
EXPORT_SYMBOL(s3c_device_usb); EXPORT_SYMBOL(s3c_device_ohci);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7