From: chao.xie@marvell.com (Chao Xie)
To: linux-arm-kernel@lists.infradead.org
Subject: [V9 PATCH 09/12] arm: ttc_dkb: modify usb support
Date: Sun, 7 Apr 2013 06:29:43 -0400 [thread overview]
Message-ID: <1365330586-649-10-git-send-email-chao.xie@marvell.com> (raw)
In-Reply-To: <1365330586-649-1-git-send-email-chao.xie@marvell.com>
for ttc_dkb board, we use phy driver for usb support.
Modify the usb support for udc/otg/ehci support.
Signed-off-by: Chao Xie <chao.xie@marvell.com>
---
arch/arm/mach-mmp/ttc_dkb.c | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 6528a5f..c8b9ed8 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -18,6 +18,8 @@
#include <linux/i2c/pca953x.h>
#include <linux/gpio.h>
#include <linux/mfd/88pm860x.h>
+#include <linux/usb/phy.h>
+#include <linux/usb/mv_usb2.h>
#include <linux/platform_data/mv_usb.h>
#include <linux/spi/spi.h>
#include <linux/delay.h>
@@ -29,7 +31,6 @@
#include <mach/mfp-pxa910.h>
#include <mach/pxa910.h>
#include <mach/irqs.h>
-#include <mach/regs-usb.h>
#include "common.h"
@@ -166,8 +167,6 @@ static struct mv_usb_platform_data ttc_usb_pdata = {
.vbus = NULL,
.mode = MV_USB_MODE_OTG,
.otg_force_a_bus_req = 1,
- .phy_init = pxa_usb_phy_init,
- .phy_deinit = pxa_usb_phy_deinit,
.set_vbus = NULL,
};
#endif
@@ -280,19 +279,41 @@ static void __init ttc_dkb_init(void)
pxa910_add_twsi(0, NULL, ARRAY_AND_SIZE(ttc_dkb_i2c_info));
platform_add_devices(ARRAY_AND_SIZE(ttc_dkb_devices));
+#ifdef CONFIG_USB_SUPPORT
+ pxa_register_device(&pxa910_device_u2ophy, NULL, 0);
+#endif
+
#ifdef CONFIG_USB_MV_UDC
- pxa168_device_u2o.dev.platform_data = &ttc_usb_pdata;
- platform_device_register(&pxa168_device_u2o);
+ /* for usb2 phy */
+ usb_bind_phy(pxa910_device_u2o.drv_name, MV_USB2_PHY_INDEX,
+ pxa910_device_u2ophy.drv_name);
+#ifdef CONFIG_USB_MV_OTG
+ /* for usb2 otg phy */
+ usb_bind_phy(pxa910_device_u2o.drv_name, MV_USB2_OTG_PHY_INDEX,
+ pxa910_device_u2ootg.drv_name);
+#endif
+ pxa_register_device(&pxa910_device_u2o, &ttc_usb_pdata,
+ sizeof(ttc_usb_pdata));
#endif
#ifdef CONFIG_USB_EHCI_MV_U2O
- pxa168_device_u2oehci.dev.platform_data = &ttc_usb_pdata;
- platform_device_register(&pxa168_device_u2oehci);
+ /* for usb2 phy */
+ usb_bind_phy(pxa910_device_u2oehci.drv_name, MV_USB2_PHY_INDEX,
+ pxa910_device_u2ophy.drv_name);
+#ifdef CONFIG_USB_MV_OTG
+ /* for usb2 otg phy */
+ usb_bind_phy(pxa910_device_u2oehci.drv_name, MV_USB2_OTG_PHY_INDEX,
+ pxa910_device_u2ootg.drv_name);
+#endif
+ pxa_register_device(&pxa910_device_u2oehci, &ttc_usb_pdata,
+ sizeof(ttc_usb_pdata));
#endif
#ifdef CONFIG_USB_MV_OTG
- pxa168_device_u2ootg.dev.platform_data = &ttc_usb_pdata;
- platform_device_register(&pxa168_device_u2ootg);
+ usb_bind_phy(pxa910_device_u2ootg.drv_name, MV_USB2_PHY_INDEX,
+ pxa910_device_u2ophy.drv_name);
+ pxa_register_device(&pxa910_device_u2ootg, &ttc_usb_pdata,
+ sizeof(ttc_usb_pdata));
#endif
#ifdef CONFIG_MMP_DISP
--
1.7.4.1
next prev parent reply other threads:[~2013-04-07 10:29 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-07 10:29 [V9 PATCH 00/12] mv-usb phy driver Chao Xie
2013-04-07 10:29 ` [V9 PATCH 01/12] usb: phy: protect phy init and shutdown for mutiple deivces Chao Xie
2013-04-07 10:29 ` [V9 PATCH 02/12] usb: phy: mv_usb2: add PHY driver for marvell usb2 controller Chao Xie
2013-04-07 10:29 ` [V9 PATCH 03/12] usb: gadget: mv_udc: use PHY driver for udc Chao Xie
2013-04-07 10:29 ` [V9 PATCH 04/12] usb: ehci: ehci-mv: use PHY driver for ehci Chao Xie
2013-04-07 10:29 ` [V9 PATCH 05/12] usb: phy: phy-mv-usb: use USB2 PHY driver for otg Chao Xie
2013-04-07 10:29 ` [V9 PATCH 06/12] usb: mv_u3d: usb phy drivers for phy operation Chao Xie
2013-04-07 10:29 ` [V9 PATCH 07/12] arm: mmp2: change the defintion of usb devices Chao Xie
2013-04-07 10:29 ` [V9 PATCH 08/12] arm: pxa910: " Chao Xie
2013-04-07 10:29 ` Chao Xie [this message]
2013-04-07 10:29 ` [V9 PATCH 10/12] arm: mmp: remove unused " Chao Xie
2013-04-07 10:29 ` [V9 PATCH 11/12] arm: brownstone: add usb support for the board Chao Xie
2013-04-07 10:29 ` [V9 PATCH 12/12] usb: mv_usb: remove the phy callbacks in pdata Chao Xie
[not found] ` <CADApbeg4BSUubbTw8tC-fuQ06JrRtAW9+rOdg=3rP_0Dr=LwkQ@mail.gmail.com>
2013-04-17 1:22 ` [V9 PATCH 00/12] mv-usb phy driver Chao Xie
2013-05-15 14:35 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2013-04-24 6:23 Chao Xie
2013-04-24 6:23 ` [V9 PATCH 09/12] arm: ttc_dkb: modify usb support Chao Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1365330586-649-10-git-send-email-chao.xie@marvell.com \
--to=chao.xie@marvell.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).