diff mbox

[V3,11/25] arm: mmp2: change the defintion of usb devices

Message ID 1358230758-10176-12-git-send-email-chao.xie@marvell.com (mailing list archive)
State New, archived
Headers show

Commit Message

Chao Xie Jan. 15, 2013, 6:19 a.m. UTC 
add the udc/otg/ehci devices for mmp2

Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
 arch/arm/mach-mmp/include/mach/mmp2.h |    4 ++++
 arch/arm/mach-mmp/mmp2.c              |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

Comments

Felipe Balbi Jan. 17, 2013, 9:12 a.m. UTC | #1 
On Tue, Jan 15, 2013 at 01:19:04AM -0500, Chao Xie wrote:
> add the udc/otg/ehci devices for mmp2
> 
> Signed-off-by: Chao Xie <chao.xie@marvell.com>

Haojian, can I get an Acked-by for this patch or will you carry it
yourself ?

Likewise for all other arch/arm/* patches in this series
Haojian Zhuang Jan. 17, 2013, 9:59 a.m. UTC | #2 
On Thu, Jan 17, 2013 at 5:12 PM, Felipe Balbi <balbi@ti.com> wrote:
> On Tue, Jan 15, 2013 at 01:19:04AM -0500, Chao Xie wrote:
>> add the udc/otg/ehci devices for mmp2
>>
>> Signed-off-by: Chao Xie <chao.xie@marvell.com>
>
> Haojian, can I get an Acked-by for this patch or will you carry it
> yourself ?
>
> Likewise for all other arch/arm/* patches in this series
>
> --
> balbi

Sure. You can apply these patches.

Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>
Felipe Balbi Jan. 17, 2013, 11 a.m. UTC | #3 
Hi,

On Thu, Jan 17, 2013 at 05:59:20PM +0800, Haojian Zhuang wrote:
> On Thu, Jan 17, 2013 at 5:12 PM, Felipe Balbi <balbi@ti.com> wrote:
> > On Tue, Jan 15, 2013 at 01:19:04AM -0500, Chao Xie wrote:
> >> add the udc/otg/ehci devices for mmp2
> >>
> >> Signed-off-by: Chao Xie <chao.xie@marvell.com>
> >
> > Haojian, can I get an Acked-by for this patch or will you carry it
> > yourself ?
> >
> > Likewise for all other arch/arm/* patches in this series
> >
> > --
> > balbi
> 
> Sure. You can apply these patches.
> 
> Acked-by: Haojian Zhuang <haojian.zhuang@gmail.com>

Thank you
diff mbox

Patch

diff --git a/arch/arm/mach-mmp/include/mach/mmp2.h b/arch/arm/mach-mmp/include/mach/mmp2.h
index c4ca4d1..58e96b0 100644
--- a/arch/arm/mach-mmp/include/mach/mmp2.h
+++ b/arch/arm/mach-mmp/include/mach/mmp2.h
@@ -31,6 +31,10 @@  extern struct pxa_device_desc mmp2_device_sdh2;
 extern struct pxa_device_desc mmp2_device_sdh3;
 extern struct pxa_device_desc mmp2_device_asram;
 extern struct pxa_device_desc mmp2_device_isram;
+extern struct pxa_device_desc mmp2_device_u2o;
+extern struct pxa_device_desc mmp2_device_u2ootg;
+extern struct pxa_device_desc mmp2_device_u2oehci;
+extern struct pxa_device_desc mmp2_device_u2ophy;
 
 extern struct platform_device mmp2_device_gpio;
 
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index 3a3768c..73edbfc 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -153,6 +153,10 @@  MMP2_DEVICE(sdh3, "sdhci-pxav3", 3, MMC4, 0xd4281800, 0x120);
 MMP2_DEVICE(asram, "asram", -1, NONE, 0xe0000000, 0x4000);
 /* 0xd1000000 ~ 0xd101ffff is reserved for secure processor */
 MMP2_DEVICE(isram, "isram", -1, NONE, 0xd1020000, 0x18000);
+MMP2_DEVICE(u2ophy, "mmp2-usb-phy", -1, NONE, 0xd4207000, 0x1ff);
+MMP2_DEVICE(u2o, "mv-udc", -1, USB_OTG, 0xd4208100, 0x1ff);
+MMP2_DEVICE(u2ootg, "mv-otg", -1, USB_OTG, 0xd4208100, 0x1ff);
+MMP2_DEVICE(u2oehci, "mv-ehci", -1, USB_OTG, 0xd4208100, 0x1ff);
 
 struct resource mmp2_resource_gpio[] = {
 	{