diff options
Diffstat (limited to 'arch/arm/mach-mx3')
| -rw-r--r-- | arch/arm/mach-mx3/devices.c | 17 | ||||
| -rw-r--r-- | arch/arm/mach-mx3/usb_dr.c | 22 |
2 files changed, 4 insertions, 35 deletions
diff --git a/arch/arm/mach-mx3/devices.c b/arch/arm/mach-mx3/devices.c index c7d9560f0850..2861ecf81235 100644 --- a/arch/arm/mach-mx3/devices.c +++ b/arch/arm/mach-mx3/devices.c @@ -891,22 +891,6 @@ static inline void mxc_init_iim(void) } #endif -static struct platform_device mxc_v4l2_device = { - .name = "mxc_v4l2_capture", - .id = 0, -}; - -static struct platform_device mxc_v4l2out_device = { - .name = "mxc_v4l2_output", - .id = 0, -}; - -static inline void mxc_init_v4l2() -{ - platform_device_register(&mxc_v4l2_device); - platform_device_register(&mxc_v4l2out_device); -} - int __init mxc_init_devices(void) { mxc_init_wdt(); @@ -926,7 +910,6 @@ int __init mxc_init_devices(void) mxc_init_vpu(); mxc_init_rnga(); mxc_init_iim(); - mxc_init_v4l2(); return 0; } diff --git a/arch/arm/mach-mx3/usb_dr.c b/arch/arm/mach-mx3/usb_dr.c index d84fea7f1a80..7331463173e9 100644 --- a/arch/arm/mach-mx3/usb_dr.c +++ b/arch/arm/mach-mx3/usb_dr.c @@ -1,5 +1,5 @@ /* - * Copyright 2005-2010 Freescale Semiconductor, Inc. All Rights Reserved. + * Copyright 2005-2009 Freescale Semiconductor, Inc. All Rights Reserved. */ /* @@ -59,7 +59,7 @@ static struct fsl_usb2_platform_data __maybe_unused dr_1504_config = { /* - * OTG resources + * resources */ static struct resource otg_resources[] = { [0] = { @@ -73,20 +73,6 @@ static struct resource otg_resources[] = { }, }; -/* - * UDC resources (same as OTG resource) - */ -static struct resource udc_resources[] = { - [0] = { - .start = (u32)(USB_OTGREGS_BASE), - .end = (u32)(USB_OTGREGS_BASE + 0x1ff), - .flags = IORESOURCE_MEM, - }, - [1] = { - .start = MXC_INT_USB3, - .flags = IORESOURCE_IRQ, - }, -}; static u64 dr_udc_dmamask = ~(u32) 0; static void dr_udc_release(struct device *dev) @@ -110,8 +96,8 @@ static struct platform_device __maybe_unused dr_udc_device = { .dma_mask = &dr_udc_dmamask, .coherent_dma_mask = 0xffffffff, }, - .resource = udc_resources, - .num_resources = ARRAY_SIZE(udc_resources), + .resource = otg_resources, + .num_resources = ARRAY_SIZE(otg_resources), }; static struct platform_device __maybe_unused dr_otg_device = { |