| Message ID | 1358216975-1404-2-git-send-email-peter.chen@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Jan 15, 2013 at 10:29:33AM +0800, Peter Chen wrote: > As mach/hardware.h is deleted, we need to use platform_device_id to > differentiate SoCs. Besides, one cpu_is_mx35 is useless as it has > already used pdata to differentiate runtime > > Meanwhile we update the platform code accordingly. > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > --- > arch/arm/mach-imx/devices/devices-common.h | 1 + > arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 15 ++++--- > drivers/usb/gadget/fsl_mxc_udc.c | 24 +++++------- > drivers/usb/gadget/fsl_udc_core.c | 42 +++++++++++++-------- > 4 files changed, 45 insertions(+), 37 deletions(-) Since we are splitting the original patch anyway, it's a bit strange to me that you are mixing arch/arm/mach-imx and drivers/usb/gadget in this patch. I'm fine with it, since I assume all the patches to go via USB tree anyway. > > diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h > index 6277baf..9bd5777 100644 > --- a/arch/arm/mach-imx/devices/devices-common.h > +++ b/arch/arm/mach-imx/devices/devices-common.h > @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( > > #include <linux/fsl_devices.h> > struct imx_fsl_usb2_udc_data { > + const char *devid; > resource_size_t iobase; > resource_size_t irq; > }; > diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > index 37e4439..fb527c7 100644 > --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > @@ -11,35 +11,36 @@ > #include "../hardware.h" > #include "devices-common.h" > > -#define imx_fsl_usb2_udc_data_entry_single(soc) \ > +#define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ > { \ > + .devid = _devid, \ > .iobase = soc ## _USB_OTG_BASE_ADDR, \ > .irq = soc ## _INT_USB_OTG, \ > } > > #ifdef CONFIG_SOC_IMX25 > const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = > - imx_fsl_usb2_udc_data_entry_single(MX25); > + imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx25"); > #endif /* ifdef CONFIG_SOC_IMX25 */ > > #ifdef CONFIG_SOC_IMX27 > const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = > - imx_fsl_usb2_udc_data_entry_single(MX27); > + imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); > #endif /* ifdef CONFIG_SOC_IMX27 */ > > #ifdef CONFIG_SOC_IMX31 > const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = > - imx_fsl_usb2_udc_data_entry_single(MX31); > + imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx31"); > #endif /* ifdef CONFIG_SOC_IMX31 */ > > #ifdef CONFIG_SOC_IMX35 > const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = > - imx_fsl_usb2_udc_data_entry_single(MX35); > + imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx35"); > #endif /* ifdef CONFIG_SOC_IMX35 */ > > #ifdef CONFIG_SOC_IMX51 > const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = > - imx_fsl_usb2_udc_data_entry_single(MX51); > + imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); > #endif > > struct platform_device *__init imx_add_fsl_usb2_udc( > @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( > .flags = IORESOURCE_IRQ, > }, > }; > - return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, > + return imx_add_platform_device_dmamask(data->devid, -1, > res, ARRAY_SIZE(res), > pdata, sizeof(*pdata), DMA_BIT_MASK(32)); > } <snip> > +static const struct platform_device_id fsl_udc_devtype[] = { > + { > + .name = "imx-udc-mx25", > + }, { > + .name = "imx-udc-mx27", > + }, { > + .name = "imx-udc-mx31", > + }, { > + .name = "imx-udc-mx35", > + }, { > + .name = "imx-udc-mx51", > + } > +}; From what I understand balbi's comment, he dislikes this full list of device id. Instead, he prefers to something like below. static const struct platform_device_id fsl_udc_devtype[] = { { .name = "imx-udc-mx27", }, { .name = "imx-udc-mx51", } }; It basically tells that we are handling two type of devices here, one is imx-udc-mx27 type and the other is imx-udc-mx51 type, with mx25/31/35 completely compatible with mx27 type. We choose mx27 instead of mx25 to define the type because mx27 Si came out earlier than mx25. That said, we generally choose the earlies SoC name to define a particular version of IP block, since hardware version is mostly unavailable or unreliable. But that also means in platform code which create the platform_device, you will need to use name "imx-udc-mx27" for even mx25/31/35. imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); Considering this is a piece of code we will not use for any new hardware, I'm fine with either way. So, balbi, it's all your call to accept the series as it is or ask for another iteration. Shawn
On Tue, Jan 15, 2013 at 10:03:46PM +0800, Shawn Guo wrote: > On Tue, Jan 15, 2013 at 10:29:33AM +0800, Peter Chen wrote: > > As mach/hardware.h is deleted, we need to use platform_device_id to > > differentiate SoCs. Besides, one cpu_is_mx35 is useless as it has > > already used pdata to differentiate runtime > > > > Meanwhile we update the platform code accordingly. > > > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > > --- > > arch/arm/mach-imx/devices/devices-common.h | 1 + > > arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 15 ++++--- > > drivers/usb/gadget/fsl_mxc_udc.c | 24 +++++------- > > drivers/usb/gadget/fsl_udc_core.c | 42 +++++++++++++-------- > > 4 files changed, 45 insertions(+), 37 deletions(-) > > Since we are splitting the original patch anyway, it's a bit strange > to me that you are mixing arch/arm/mach-imx and drivers/usb/gadget > in this patch. I'm fine with it, since I assume all the patches to > go via USB tree anyway. > > > > > diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h > > index 6277baf..9bd5777 100644 > > --- a/arch/arm/mach-imx/devices/devices-common.h > > +++ b/arch/arm/mach-imx/devices/devices-common.h > > @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( > > > > #include <linux/fsl_devices.h> > > struct imx_fsl_usb2_udc_data { > > + const char *devid; > > resource_size_t iobase; > > resource_size_t irq; > > }; > > diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > index 37e4439..fb527c7 100644 > > --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > @@ -11,35 +11,36 @@ > > #include "../hardware.h" > > #include "devices-common.h" > > > > -#define imx_fsl_usb2_udc_data_entry_single(soc) \ > > +#define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ > > { \ > > + .devid = _devid, \ > > .iobase = soc ## _USB_OTG_BASE_ADDR, \ > > .irq = soc ## _INT_USB_OTG, \ > > } > > > > #ifdef CONFIG_SOC_IMX25 > > const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = > > - imx_fsl_usb2_udc_data_entry_single(MX25); > > + imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx25"); > > #endif /* ifdef CONFIG_SOC_IMX25 */ > > > > #ifdef CONFIG_SOC_IMX27 > > const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = > > - imx_fsl_usb2_udc_data_entry_single(MX27); > > + imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); > > #endif /* ifdef CONFIG_SOC_IMX27 */ > > > > #ifdef CONFIG_SOC_IMX31 > > const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = > > - imx_fsl_usb2_udc_data_entry_single(MX31); > > + imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx31"); > > #endif /* ifdef CONFIG_SOC_IMX31 */ > > > > #ifdef CONFIG_SOC_IMX35 > > const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = > > - imx_fsl_usb2_udc_data_entry_single(MX35); > > + imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx35"); > > #endif /* ifdef CONFIG_SOC_IMX35 */ > > > > #ifdef CONFIG_SOC_IMX51 > > const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = > > - imx_fsl_usb2_udc_data_entry_single(MX51); > > + imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); > > #endif > > > > struct platform_device *__init imx_add_fsl_usb2_udc( > > @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( > > .flags = IORESOURCE_IRQ, > > }, > > }; > > - return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, > > + return imx_add_platform_device_dmamask(data->devid, -1, > > res, ARRAY_SIZE(res), > > pdata, sizeof(*pdata), DMA_BIT_MASK(32)); > > } > > <snip> > > > +static const struct platform_device_id fsl_udc_devtype[] = { > > + { > > + .name = "imx-udc-mx25", > > + }, { > > + .name = "imx-udc-mx27", > > + }, { > > + .name = "imx-udc-mx31", > > + }, { > > + .name = "imx-udc-mx35", > > + }, { > > + .name = "imx-udc-mx51", > > + } > > +}; > > From what I understand balbi's comment, he dislikes this full list of > device id. Instead, he prefers to something like below. > > static const struct platform_device_id fsl_udc_devtype[] = { > { > .name = "imx-udc-mx27", > }, { > .name = "imx-udc-mx51", > } > }; > > It basically tells that we are handling two type of devices here, one > is imx-udc-mx27 type and the other is imx-udc-mx51 type, with mx25/31/35 > completely compatible with mx27 type. We choose mx27 instead of mx25 > to define the type because mx27 Si came out earlier than mx25. That > said, we generally choose the earlies SoC name to define a particular > version of IP block, since hardware version is mostly unavailable or > unreliable. > > But that also means in platform code which create the platform_device, > you will need to use name "imx-udc-mx27" for even mx25/31/35. > > imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); > imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); > imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); > > Considering this is a piece of code we will not use for any new > hardware, I'm fine with either way. > > So, balbi, it's all your call to accept the series as it is or ask for > another iteration. Thanks Shawn. Let's see Felipe's comment, nevertheless, I will send v6 patch due to a compile error at mx25 > > Shawn
On Wed, Jan 16, 2013 at 09:48:25AM +0800, Peter Chen wrote: > On Tue, Jan 15, 2013 at 10:03:46PM +0800, Shawn Guo wrote: > > On Tue, Jan 15, 2013 at 10:29:33AM +0800, Peter Chen wrote: > > > As mach/hardware.h is deleted, we need to use platform_device_id to > > > differentiate SoCs. Besides, one cpu_is_mx35 is useless as it has > > > already used pdata to differentiate runtime > > > > > > Meanwhile we update the platform code accordingly. > > > > > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > > > --- > > > arch/arm/mach-imx/devices/devices-common.h | 1 + > > > arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 15 ++++--- > > > drivers/usb/gadget/fsl_mxc_udc.c | 24 +++++------- > > > drivers/usb/gadget/fsl_udc_core.c | 42 +++++++++++++-------- > > > 4 files changed, 45 insertions(+), 37 deletions(-) > > > > Since we are splitting the original patch anyway, it's a bit strange > > to me that you are mixing arch/arm/mach-imx and drivers/usb/gadget > > in this patch. I'm fine with it, since I assume all the patches to > > go via USB tree anyway. > > > > > > > > diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h > > > index 6277baf..9bd5777 100644 > > > --- a/arch/arm/mach-imx/devices/devices-common.h > > > +++ b/arch/arm/mach-imx/devices/devices-common.h > > > @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( > > > > > > #include <linux/fsl_devices.h> > > > struct imx_fsl_usb2_udc_data { > > > + const char *devid; > > > resource_size_t iobase; > > > resource_size_t irq; > > > }; > > > diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > index 37e4439..fb527c7 100644 > > > --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > @@ -11,35 +11,36 @@ > > > #include "../hardware.h" > > > #include "devices-common.h" > > > > > > -#define imx_fsl_usb2_udc_data_entry_single(soc) \ > > > +#define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ > > > { \ > > > + .devid = _devid, \ > > > .iobase = soc ## _USB_OTG_BASE_ADDR, \ > > > .irq = soc ## _INT_USB_OTG, \ > > > } > > > > > > #ifdef CONFIG_SOC_IMX25 > > > const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = > > > - imx_fsl_usb2_udc_data_entry_single(MX25); > > > + imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx25"); > > > #endif /* ifdef CONFIG_SOC_IMX25 */ > > > > > > #ifdef CONFIG_SOC_IMX27 > > > const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = > > > - imx_fsl_usb2_udc_data_entry_single(MX27); > > > + imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); > > > #endif /* ifdef CONFIG_SOC_IMX27 */ > > > > > > #ifdef CONFIG_SOC_IMX31 > > > const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = > > > - imx_fsl_usb2_udc_data_entry_single(MX31); > > > + imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx31"); > > > #endif /* ifdef CONFIG_SOC_IMX31 */ > > > > > > #ifdef CONFIG_SOC_IMX35 > > > const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = > > > - imx_fsl_usb2_udc_data_entry_single(MX35); > > > + imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx35"); > > > #endif /* ifdef CONFIG_SOC_IMX35 */ > > > > > > #ifdef CONFIG_SOC_IMX51 > > > const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = > > > - imx_fsl_usb2_udc_data_entry_single(MX51); > > > + imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); > > > #endif > > > > > > struct platform_device *__init imx_add_fsl_usb2_udc( > > > @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( > > > .flags = IORESOURCE_IRQ, > > > }, > > > }; > > > - return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, > > > + return imx_add_platform_device_dmamask(data->devid, -1, > > > res, ARRAY_SIZE(res), > > > pdata, sizeof(*pdata), DMA_BIT_MASK(32)); > > > } > > > > <snip> > > > > > +static const struct platform_device_id fsl_udc_devtype[] = { > > > + { > > > + .name = "imx-udc-mx25", > > > + }, { > > > + .name = "imx-udc-mx27", > > > + }, { > > > + .name = "imx-udc-mx31", > > > + }, { > > > + .name = "imx-udc-mx35", > > > + }, { > > > + .name = "imx-udc-mx51", > > > + } > > > +}; > > > > From what I understand balbi's comment, he dislikes this full list of > > device id. Instead, he prefers to something like below. > > > > static const struct platform_device_id fsl_udc_devtype[] = { > > { > > .name = "imx-udc-mx27", > > }, { > > .name = "imx-udc-mx51", > > } > > }; > > > > It basically tells that we are handling two type of devices here, one > > is imx-udc-mx27 type and the other is imx-udc-mx51 type, with mx25/31/35 > > completely compatible with mx27 type. We choose mx27 instead of mx25 > > to define the type because mx27 Si came out earlier than mx25. That > > said, we generally choose the earlies SoC name to define a particular > > version of IP block, since hardware version is mostly unavailable or > > unreliable. > > > > But that also means in platform code which create the platform_device, > > you will need to use name "imx-udc-mx27" for even mx25/31/35. > > > > imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); > > imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); > > imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); > > > > Considering this is a piece of code we will not use for any new > > hardware, I'm fine with either way. > > > > So, balbi, it's all your call to accept the series as it is or ask for > > another iteration. right :-) > Thanks Shawn. Let's see Felipe's comment, nevertheless, I will send v6 patch > due to a compile error at mx25 Shawn is right.
On Thu, Jan 17, 2013 at 11:14:22AM +0200, Felipe Balbi wrote: > On Wed, Jan 16, 2013 at 09:48:25AM +0800, Peter Chen wrote: > > On Tue, Jan 15, 2013 at 10:03:46PM +0800, Shawn Guo wrote: > > > On Tue, Jan 15, 2013 at 10:29:33AM +0800, Peter Chen wrote: > > > > As mach/hardware.h is deleted, we need to use platform_device_id to > > > > differentiate SoCs. Besides, one cpu_is_mx35 is useless as it has > > > > already used pdata to differentiate runtime > > > > > > > > Meanwhile we update the platform code accordingly. > > > > > > > > Signed-off-by: Peter Chen <peter.chen@freescale.com> > > > > --- > > > > arch/arm/mach-imx/devices/devices-common.h | 1 + > > > > arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 15 ++++--- > > > > drivers/usb/gadget/fsl_mxc_udc.c | 24 +++++------- > > > > drivers/usb/gadget/fsl_udc_core.c | 42 +++++++++++++-------- > > > > 4 files changed, 45 insertions(+), 37 deletions(-) > > > > > > Since we are splitting the original patch anyway, it's a bit strange > > > to me that you are mixing arch/arm/mach-imx and drivers/usb/gadget > > > in this patch. I'm fine with it, since I assume all the patches to > > > go via USB tree anyway. > > > > > > > > > > > diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h > > > > index 6277baf..9bd5777 100644 > > > > --- a/arch/arm/mach-imx/devices/devices-common.h > > > > +++ b/arch/arm/mach-imx/devices/devices-common.h > > > > @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( > > > > > > > > #include <linux/fsl_devices.h> > > > > struct imx_fsl_usb2_udc_data { > > > > + const char *devid; > > > > resource_size_t iobase; > > > > resource_size_t irq; > > > > }; > > > > diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > > index 37e4439..fb527c7 100644 > > > > --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > > +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c > > > > @@ -11,35 +11,36 @@ > > > > #include "../hardware.h" > > > > #include "devices-common.h" > > > > > > > > -#define imx_fsl_usb2_udc_data_entry_single(soc) \ > > > > +#define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ > > > > { \ > > > > + .devid = _devid, \ > > > > .iobase = soc ## _USB_OTG_BASE_ADDR, \ > > > > .irq = soc ## _INT_USB_OTG, \ > > > > } > > > > > > > > #ifdef CONFIG_SOC_IMX25 > > > > const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = > > > > - imx_fsl_usb2_udc_data_entry_single(MX25); > > > > + imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx25"); > > > > #endif /* ifdef CONFIG_SOC_IMX25 */ > > > > > > > > #ifdef CONFIG_SOC_IMX27 > > > > const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = > > > > - imx_fsl_usb2_udc_data_entry_single(MX27); > > > > + imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); > > > > #endif /* ifdef CONFIG_SOC_IMX27 */ > > > > > > > > #ifdef CONFIG_SOC_IMX31 > > > > const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = > > > > - imx_fsl_usb2_udc_data_entry_single(MX31); > > > > + imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx31"); > > > > #endif /* ifdef CONFIG_SOC_IMX31 */ > > > > > > > > #ifdef CONFIG_SOC_IMX35 > > > > const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = > > > > - imx_fsl_usb2_udc_data_entry_single(MX35); > > > > + imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx35"); > > > > #endif /* ifdef CONFIG_SOC_IMX35 */ > > > > > > > > #ifdef CONFIG_SOC_IMX51 > > > > const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = > > > > - imx_fsl_usb2_udc_data_entry_single(MX51); > > > > + imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); > > > > #endif > > > > > > > > struct platform_device *__init imx_add_fsl_usb2_udc( > > > > @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( > > > > .flags = IORESOURCE_IRQ, > > > > }, > > > > }; > > > > - return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, > > > > + return imx_add_platform_device_dmamask(data->devid, -1, > > > > res, ARRAY_SIZE(res), > > > > pdata, sizeof(*pdata), DMA_BIT_MASK(32)); > > > > } > > > > > > <snip> > > > > > > > +static const struct platform_device_id fsl_udc_devtype[] = { > > > > + { > > > > + .name = "imx-udc-mx25", > > > > + }, { > > > > + .name = "imx-udc-mx27", > > > > + }, { > > > > + .name = "imx-udc-mx31", > > > > + }, { > > > > + .name = "imx-udc-mx35", > > > > + }, { > > > > + .name = "imx-udc-mx51", > > > > + } > > > > +}; > > > > > > From what I understand balbi's comment, he dislikes this full list of > > > device id. Instead, he prefers to something like below. > > > > > > static const struct platform_device_id fsl_udc_devtype[] = { > > > { > > > .name = "imx-udc-mx27", > > > }, { > > > .name = "imx-udc-mx51", > > > } > > > }; > > > > > > It basically tells that we are handling two type of devices here, one > > > is imx-udc-mx27 type and the other is imx-udc-mx51 type, with mx25/31/35 > > > completely compatible with mx27 type. We choose mx27 instead of mx25 > > > to define the type because mx27 Si came out earlier than mx25. That > > > said, we generally choose the earlies SoC name to define a particular > > > version of IP block, since hardware version is mostly unavailable or > > > unreliable. > > > > > > But that also means in platform code which create the platform_device, > > > you will need to use name "imx-udc-mx27" for even mx25/31/35. > > > > > > imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); > > > imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); > > > imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); > > > > > > Considering this is a piece of code we will not use for any new > > > hardware, I'm fine with either way. > > > > > > So, balbi, it's all your call to accept the series as it is or ask for > > > another iteration. > > right :-) > > > Thanks Shawn. Let's see Felipe's comment, nevertheless, I will send v6 patch > > due to a compile error at mx25 > > Shawn is right. In fact, this driver is just the temp solution, we will use chipidea in future, so just take all i.mx usb as two kinds of ip are ok. Do you want me to change like Shawn said, or current version is ok? > > -- > balbi
Hi, On Thu, Jan 17, 2013 at 05:28:30PM +0800, Peter Chen wrote: <trimming> > > > > From what I understand balbi's comment, he dislikes this full list of > > > > device id. Instead, he prefers to something like below. > > > > > > > > static const struct platform_device_id fsl_udc_devtype[] = { > > > > { > > > > .name = "imx-udc-mx27", > > > > }, { > > > > .name = "imx-udc-mx51", > > > > } > > > > }; > > > > > > > > It basically tells that we are handling two type of devices here, one > > > > is imx-udc-mx27 type and the other is imx-udc-mx51 type, with mx25/31/35 > > > > completely compatible with mx27 type. We choose mx27 instead of mx25 > > > > to define the type because mx27 Si came out earlier than mx25. That > > > > said, we generally choose the earlies SoC name to define a particular > > > > version of IP block, since hardware version is mostly unavailable or > > > > unreliable. > > > > > > > > But that also means in platform code which create the platform_device, > > > > you will need to use name "imx-udc-mx27" for even mx25/31/35. > > > > > > > > imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx27"); > > > > imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx27"); > > > > imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx27"); > > > > > > > > Considering this is a piece of code we will not use for any new > > > > hardware, I'm fine with either way. > > > > > > > > So, balbi, it's all your call to accept the series as it is or ask for > > > > another iteration. > > > > right :-) > > > > > Thanks Shawn. Let's see Felipe's comment, nevertheless, I will send v6 patch > > > due to a compile error at mx25 > > > > Shawn is right. > > In fact, this driver is just the temp solution, we will use chipidea > in future, so just take all i.mx usb as two kinds of ip are ok. > > Do you want me to change like Shawn said, or current version is ok? yes, please resend with changes.
diff --git a/arch/arm/mach-imx/devices/devices-common.h b/arch/arm/mach-imx/devices/devices-common.h index 6277baf..9bd5777 100644 --- a/arch/arm/mach-imx/devices/devices-common.h +++ b/arch/arm/mach-imx/devices/devices-common.h @@ -63,6 +63,7 @@ struct platform_device *__init imx_add_flexcan( #include <linux/fsl_devices.h> struct imx_fsl_usb2_udc_data { + const char *devid; resource_size_t iobase; resource_size_t irq; }; diff --git a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c index 37e4439..fb527c7 100644 --- a/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c +++ b/arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c @@ -11,35 +11,36 @@ #include "../hardware.h" #include "devices-common.h" -#define imx_fsl_usb2_udc_data_entry_single(soc) \ +#define imx_fsl_usb2_udc_data_entry_single(soc, _devid) \ { \ + .devid = _devid, \ .iobase = soc ## _USB_OTG_BASE_ADDR, \ .irq = soc ## _INT_USB_OTG, \ } #ifdef CONFIG_SOC_IMX25 const struct imx_fsl_usb2_udc_data imx25_fsl_usb2_udc_data __initconst = - imx_fsl_usb2_udc_data_entry_single(MX25); + imx_fsl_usb2_udc_data_entry_single(MX25, "imx-udc-mx25"); #endif /* ifdef CONFIG_SOC_IMX25 */ #ifdef CONFIG_SOC_IMX27 const struct imx_fsl_usb2_udc_data imx27_fsl_usb2_udc_data __initconst = - imx_fsl_usb2_udc_data_entry_single(MX27); + imx_fsl_usb2_udc_data_entry_single(MX27, "imx-udc-mx27"); #endif /* ifdef CONFIG_SOC_IMX27 */ #ifdef CONFIG_SOC_IMX31 const struct imx_fsl_usb2_udc_data imx31_fsl_usb2_udc_data __initconst = - imx_fsl_usb2_udc_data_entry_single(MX31); + imx_fsl_usb2_udc_data_entry_single(MX31, "imx-udc-mx31"); #endif /* ifdef CONFIG_SOC_IMX31 */ #ifdef CONFIG_SOC_IMX35 const struct imx_fsl_usb2_udc_data imx35_fsl_usb2_udc_data __initconst = - imx_fsl_usb2_udc_data_entry_single(MX35); + imx_fsl_usb2_udc_data_entry_single(MX35, "imx-udc-mx35"); #endif /* ifdef CONFIG_SOC_IMX35 */ #ifdef CONFIG_SOC_IMX51 const struct imx_fsl_usb2_udc_data imx51_fsl_usb2_udc_data __initconst = - imx_fsl_usb2_udc_data_entry_single(MX51); + imx_fsl_usb2_udc_data_entry_single(MX51, "imx-udc-mx51"); #endif struct platform_device *__init imx_add_fsl_usb2_udc( @@ -57,7 +58,7 @@ struct platform_device *__init imx_add_fsl_usb2_udc( .flags = IORESOURCE_IRQ, }, }; - return imx_add_platform_device_dmamask("fsl-usb2-udc", -1, + return imx_add_platform_device_dmamask(data->devid, -1, res, ARRAY_SIZE(res), pdata, sizeof(*pdata), DMA_BIT_MASK(32)); } diff --git a/drivers/usb/gadget/fsl_mxc_udc.c b/drivers/usb/gadget/fsl_mxc_udc.c index 1b0f086..1176bd8 100644 --- a/drivers/usb/gadget/fsl_mxc_udc.c +++ b/drivers/usb/gadget/fsl_mxc_udc.c @@ -18,8 +18,6 @@ #include <linux/platform_device.h> #include <linux/io.h> -#include <mach/hardware.h> - static struct clk *mxc_ahb_clk; static struct clk *mxc_per_clk; static struct clk *mxc_ipg_clk; @@ -59,7 +57,7 @@ int fsl_udc_clk_init(struct platform_device *pdev) clk_prepare_enable(mxc_per_clk); /* make sure USB_CLK is running at 60 MHz +/- 1000 Hz */ - if (!cpu_is_mx51()) { + if (strcmp(pdev->id_entry->name, "imx-udc-mx51")) { freq = clk_get_rate(mxc_per_clk); if (pdata->phy_mode != FSL_USB2_PHY_ULPI && (freq < 59999000 || freq > 60001000)) { @@ -82,17 +80,15 @@ eclkrate: void fsl_udc_clk_finalize(struct platform_device *pdev) { struct fsl_usb2_platform_data *pdata = pdev->dev.platform_data; - if (cpu_is_mx35()) { - unsigned int v; - - /* workaround ENGcm09152 for i.MX35 */ - if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { - v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + - USBPHYCTRL_OTGBASE_OFFSET)); - writel(v | USBPHYCTRL_EVDO, - MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + - USBPHYCTRL_OTGBASE_OFFSET)); - } + unsigned int v; + + /* workaround ENGcm09152 for i.MX35 */ + if (pdata->workaround & FLS_USB2_WORKAROUND_ENGCM09152) { + v = readl(MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + + USBPHYCTRL_OTGBASE_OFFSET)); + writel(v | USBPHYCTRL_EVDO, + MX35_IO_ADDRESS(MX35_USB_BASE_ADDR + + USBPHYCTRL_OTGBASE_OFFSET)); } /* ULPI transceivers don't need usbpll */ diff --git a/drivers/usb/gadget/fsl_udc_core.c b/drivers/usb/gadget/fsl_udc_core.c index c19f7f1..c971e84 100644 --- a/drivers/usb/gadget/fsl_udc_core.c +++ b/drivers/usb/gadget/fsl_udc_core.c @@ -41,6 +41,7 @@ #include <linux/fsl_devices.h> #include <linux/dmapool.h> #include <linux/delay.h> +#include <linux/of_device.h> #include <asm/byteorder.h> #include <asm/io.h> @@ -2438,11 +2439,6 @@ static int __init fsl_udc_probe(struct platform_device *pdev) unsigned int i; u32 dccparams; - if (strcmp(pdev->name, driver_name)) { - VDBG("Wrong device"); - return -ENODEV; - } - udc_controller = kzalloc(sizeof(struct fsl_udc), GFP_KERNEL); if (udc_controller == NULL) { ERR("malloc udc failed\n"); @@ -2756,22 +2752,36 @@ static int fsl_udc_otg_resume(struct device *dev) return fsl_udc_resume(NULL); } - /*------------------------------------------------------------------------- Register entry point for the peripheral controller driver --------------------------------------------------------------------------*/ - +static const struct platform_device_id fsl_udc_devtype[] = { + { + .name = "imx-udc-mx25", + }, { + .name = "imx-udc-mx27", + }, { + .name = "imx-udc-mx31", + }, { + .name = "imx-udc-mx35", + }, { + .name = "imx-udc-mx51", + } +}; +MODULE_DEVICE_TABLE(platform, fsl_udc_devtype); static struct platform_driver udc_driver = { - .remove = __exit_p(fsl_udc_remove), + .remove = __exit_p(fsl_udc_remove), + /* Just for FSL i.mx SoC currently */ + .id_table = fsl_udc_devtype, /* these suspend and resume are not usb suspend and resume */ - .suspend = fsl_udc_suspend, - .resume = fsl_udc_resume, - .driver = { - .name = (char *)driver_name, - .owner = THIS_MODULE, - /* udc suspend/resume called from OTG driver */ - .suspend = fsl_udc_otg_suspend, - .resume = fsl_udc_otg_resume, + .suspend = fsl_udc_suspend, + .resume = fsl_udc_resume, + .driver = { + .name = (char *)driver_name, + .owner = THIS_MODULE, + /* udc suspend/resume called from OTG driver */ + .suspend = fsl_udc_otg_suspend, + .resume = fsl_udc_otg_resume, }, };
As mach/hardware.h is deleted, we need to use platform_device_id to differentiate SoCs. Besides, one cpu_is_mx35 is useless as it has already used pdata to differentiate runtime Meanwhile we update the platform code accordingly. Signed-off-by: Peter Chen <peter.chen@freescale.com> --- arch/arm/mach-imx/devices/devices-common.h | 1 + arch/arm/mach-imx/devices/platform-fsl-usb2-udc.c | 15 ++++--- drivers/usb/gadget/fsl_mxc_udc.c | 24 +++++------- drivers/usb/gadget/fsl_udc_core.c | 42 +++++++++++++-------- 4 files changed, 45 insertions(+), 37 deletions(-)