* [PATCH v4 1/7] ARM: mxs: ehci: consolidate definitions and structures to share among platforms
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 2/7] ARM: mxs: make ehci-mxc more flexible to be used on different platforms Tony Lin
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
move common definitions and data structures used for mxs and mxc
platforms to fsl_device.h from mxc_ehci.h
so that these definitions and structures could be shared without
duplicated copies.
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/plat-mxc/include/mach/mxc_ehci.h | 19 -------------------
drivers/usb/host/ehci-mxc.c | 4 +---
include/linux/fsl_devices.h | 19 +++++++++++++++++++
3 files changed, 20 insertions(+), 22 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/mxc_ehci.h b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
index 2c159dc..8775807 100644
--- a/arch/arm/plat-mxc/include/mach/mxc_ehci.h
+++ b/arch/arm/plat-mxc/include/mach/mxc_ehci.h
@@ -1,17 +1,6 @@
#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
#define __INCLUDE_ASM_ARCH_MXC_EHCI_H
-/* values for portsc field */
-#define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23)
-#define MXC_EHCI_FORCE_FS (1 << 24)
-#define MXC_EHCI_UTMI_8BIT (0 << 28)
-#define MXC_EHCI_UTMI_16BIT (1 << 28)
-#define MXC_EHCI_SERIAL (1 << 29)
-#define MXC_EHCI_MODE_UTMI (0 << 30)
-#define MXC_EHCI_MODE_PHILIPS (1 << 30)
-#define MXC_EHCI_MODE_ULPI (2 << 30)
-#define MXC_EHCI_MODE_SERIAL (3 << 30)
-
/* values for flags field */
#define MXC_EHCI_INTERFACE_DIFF_UNI (0 << 0)
#define MXC_EHCI_INTERFACE_DIFF_BI (1 << 0)
@@ -39,14 +28,6 @@
#define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK 0x3
#define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT 0
-struct mxc_usbh_platform_data {
- int (*init)(struct platform_device *pdev);
- int (*exit)(struct platform_device *pdev);
-
- unsigned int portsc;
- struct otg_transceiver *otg;
-};
-
int mx51_initialize_usb_hw(int port, unsigned int flags);
int mx25_initialize_usb_hw(int port, unsigned int flags);
int mx31_initialize_usb_hw(int port, unsigned int flags);
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index 0c058be..cbf60a6 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -23,9 +23,7 @@
#include <linux/usb/otg.h>
#include <linux/usb/ulpi.h>
#include <linux/slab.h>
-
-#include <mach/mxc_ehci.h>
-
+#include <linux/fsl_devices.h>
#include <asm/mach-types.h>
#define ULPI_VIEWPORT_OFFSET 0x170
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index fffdf00..cb19260 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -103,6 +103,25 @@ struct fsl_usb2_platform_data {
#define FLS_USB2_WORKAROUND_ENGCM09152 (1 << 0)
+/* values for portsc field */
+#define MXC_EHCI_PHY_LOW_POWER_SUSPEND (1 << 23)
+#define MXC_EHCI_FORCE_FS (1 << 24)
+#define MXC_EHCI_UTMI_8BIT (0 << 28)
+#define MXC_EHCI_UTMI_16BIT (1 << 28)
+#define MXC_EHCI_SERIAL (1 << 29)
+#define MXC_EHCI_MODE_UTMI (0 << 30)
+#define MXC_EHCI_MODE_PHILIPS (1 << 30)
+#define MXC_EHCI_MODE_ULPI (2 << 30)
+#define MXC_EHCI_MODE_SERIAL (3 << 30)
+
+struct mxc_usbh_platform_data {
+ int (*init)(struct platform_device *pdev);
+ int (*exit)(struct platform_device *pdev);
+
+ unsigned int portsc;
+ struct otg_transceiver *otg;
+};
+
struct spi_device;
struct fsl_spi_platform_data {
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 2/7] ARM: mxs: make ehci-mxc more flexible to be used on different platforms
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
2011-08-02 8:39 ` [PATCH v4 1/7] ARM: mxs: ehci: consolidate definitions and structures to share among platforms Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 3/7] ARM: mxs: add usb clocks to clock tree Tony Lin
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
change ehci_irq to mxc_ehci_irq to give chance do some platform specific
actions in irq handler for different platforms.
add void pointer in the last of mxc_usbh_platform_data structure so that
additional information could be added to that field if needed.
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
drivers/usb/host/Kconfig | 2 +-
drivers/usb/host/ehci-mxc.c | 13 ++++++++++++-
include/linux/fsl_devices.h | 2 ++
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index ab085f1..6a5905b 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -139,7 +139,7 @@ config USB_EHCI_FSL
config USB_EHCI_MXC
bool "Support for Freescale on-chip EHCI USB controller"
- depends on USB_EHCI_HCD && ARCH_MXC
+ depends on USB_EHCI_HCD && (ARCH_MXC || ARCH_MXS)
select USB_EHCI_ROOT_HUB_TT
---help---
Variation of ARC USB block used in some Freescale chips.
diff --git a/drivers/usb/host/ehci-mxc.c b/drivers/usb/host/ehci-mxc.c
index cbf60a6..6d3c53c 100644
--- a/drivers/usb/host/ehci-mxc.c
+++ b/drivers/usb/host/ehci-mxc.c
@@ -64,6 +64,17 @@ static int ehci_mxc_setup(struct usb_hcd *hcd)
return 0;
}
+static irqreturn_t mxc_ehci_irq(struct usb_hcd *hcd)
+{
+ struct mxc_usbh_platform_data *pdata;
+
+ pdata = hcd->self.controller->platform_data;
+ if (pdata->plt_irq_handler)
+ pdata->plt_irq_handler(pdata);
+
+ return ehci_irq(hcd);
+}
+
static const struct hc_driver ehci_mxc_hc_driver = {
.description = hcd_name,
.product_desc = "Freescale On-Chip EHCI Host Controller",
@@ -72,7 +83,7 @@ static const struct hc_driver ehci_mxc_hc_driver = {
/*
* generic hardware linkage
*/
- .irq = ehci_irq,
+ .irq = mxc_ehci_irq,
.flags = HCD_USB2 | HCD_MEMORY,
/*
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index cb19260..d94e9e5 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -120,6 +120,8 @@ struct mxc_usbh_platform_data {
unsigned int portsc;
struct otg_transceiver *otg;
+ void (*plt_irq_handler)(struct mxc_usbh_platform_data *pdata);
+ void *priv;
};
struct spi_device;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 3/7] ARM: mxs: add usb clocks to clock tree
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
2011-08-02 8:39 ` [PATCH v4 1/7] ARM: mxs: ehci: consolidate definitions and structures to share among platforms Tony Lin
2011-08-02 8:39 ` [PATCH v4 2/7] ARM: mxs: make ehci-mxc more flexible to be used on different platforms Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 4/7] ARM: mxs: enable usb phy power supply Tony Lin
` (4 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
add usb host clock and usb host phy clock to clock tree
add usb dummy clocks to clock tree to get rid of adding
more cpu_is_mx macros
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/mach-mxs/clock-mx28.c | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mxs/clock-mx28.c b/arch/arm/mach-mxs/clock-mx28.c
index 5dcc59d..3b43c97 100644
--- a/arch/arm/mach-mxs/clock-mx28.c
+++ b/arch/arm/mach-mxs/clock-mx28.c
@@ -554,6 +554,8 @@ static struct clk rtc_clk = {
.parent = &ref_xtal_clk,
};
+static struct clk dummy_clk; /* initial to 0 and NULL */
+
/* usb_clk gate is controlled in DIGCTRL other than CLKCTRL */
static struct clk usb0_clk = {
.enable_reg = DIGCTRL_BASE_ADDR,
@@ -571,6 +573,21 @@ static struct clk usb1_clk = {
.parent = &pll1_clk,
};
+static struct clk usb_phy_clk0 = {
+ .parent = &pll0_clk,
+ .enable = _raw_clk_disable,
+ .disable = _raw_clk_enable,
+ .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_PLL0CTRL0,
+ .enable_shift = 18,
+};
+/* usb phy clock for usb1 */
+static struct clk usb_phy_clk1 = {
+ .parent = &pll1_clk,
+ .enable = _raw_clk_disable,
+ .disable = _raw_clk_enable,
+ .enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_PLL1CTRL0,
+ .enable_shift = 18,
+};
#define _DEFINE_CLOCK(name, er, es, p) \
static struct clk name = { \
.enable_reg = CLKCTRL_BASE_ADDR + HW_CLKCTRL_##er, \
@@ -627,8 +644,12 @@ static struct clk_lookup lookups[] = {
_REGISTER_CLOCK("mxs-mmc.1", NULL, ssp1_clk)
_REGISTER_CLOCK("flexcan.0", NULL, can0_clk)
_REGISTER_CLOCK("flexcan.1", NULL, can1_clk)
- _REGISTER_CLOCK(NULL, "usb0", usb0_clk)
- _REGISTER_CLOCK(NULL, "usb1", usb1_clk)
+ _REGISTER_CLOCK("mxc-ehci.0", "usb", usb0_clk)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb", usb1_clk)
+ _REGISTER_CLOCK(NULL, "usb0_phy", usb_phy_clk0)
+ _REGISTER_CLOCK(NULL, "usb1_phy", usb_phy_clk1)
+ _REGISTER_CLOCK("mxc-ehci.0", "usb_ahb", dummy_clk)
+ _REGISTER_CLOCK("mxc-ehci.1", "usb_ahb", dummy_clk)
_REGISTER_CLOCK("mxs-pwm.0", NULL, pwm_clk)
_REGISTER_CLOCK("mxs-pwm.1", NULL, pwm_clk)
_REGISTER_CLOCK("mxs-pwm.2", NULL, pwm_clk)
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 4/7] ARM: mxs: enable usb phy power supply
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
` (2 preceding siblings ...)
2011-08-02 8:39 ` [PATCH v4 3/7] ARM: mxs: add usb clocks to clock tree Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 5/7] ARM: mxs: add usb platform operations Tony Lin
` (3 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
configure usb1 phy power enable gpio and enable usb1 phy power
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/mach-mxs/mach-mx28evk.c | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index eaaf6ff..680d6e4 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2010 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2010-2011 Freescale Semiconductor, Inc. All Rights Reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -34,6 +34,7 @@
#define MX28EVK_BL_ENABLE MXS_GPIO_NR(3, 18)
#define MX28EVK_LCD_ENABLE MXS_GPIO_NR(3, 30)
#define MX28EVK_FEC_PHY_RESET MXS_GPIO_NR(4, 13)
+#define MX28EVK_USB1_PWR_EN MXS_GPIO_NR(3, 8)
#define MX28EVK_MMC0_WRITE_PROTECT MXS_GPIO_NR(2, 12)
#define MX28EVK_MMC1_WRITE_PROTECT MXS_GPIO_NR(0, 28)
@@ -183,6 +184,8 @@ static const iomux_cfg_t mx28evk_pads[] __initconst = {
/* led */
MX28_PAD_AUART1_TX__GPIO_3_5 | MXS_PAD_CTRL,
+ /* usb1 */
+ MX28_PAD_AUART2_RX__GPIO_3_8 | MXS_PAD_CTRL,
};
/* led */
@@ -405,6 +408,10 @@ static void __init mx28evk_init(void)
pr_warn("failed to request gpio mmc1-slot-power: %d\n", ret);
mx28_add_mxs_mmc(1, &mx28evk_mmc_pdata[1]);
+ ret = gpio_request_one(MX28EVK_USB1_PWR_EN, GPIOF_OUT_INIT_HIGH,
+ "usb1-power-en");
+ if (ret)
+ pr_warn("failed to request gpio usb1-power-en %d\n", ret);
gpio_led_register_device(0, &mx28evk_led_data);
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 5/7] ARM: mxs: add usb platform operations
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
` (3 preceding siblings ...)
2011-08-02 8:39 ` [PATCH v4 4/7] ARM: mxs: enable usb phy power supply Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 6/7] " Tony Lin
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
add usb phy register definitions and functions
usb host driver will use these callback functions
to initialize usb phy and change working mode
These operations are platform specific although the
PHY is integrated into SOC. Integrated SOC will have specific
reset operation for example. Thus put these operations
in platform layer as callback functions.
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/mach-mxs/Makefile | 2 +-
arch/arm/mach-mxs/include/mach/devices-common.h | 18 ++
arch/arm/mach-mxs/regs-usbphy-mxs.h | 240 +++++++++++++++++++++++
arch/arm/mach-mxs/usbh.c | 182 +++++++++++++++++
arch/arm/mach-mxs/usbh.h | 13 ++
5 files changed, 454 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-mxs/Makefile b/arch/arm/mach-mxs/Makefile
index 6c38262..c7645c6 100644
--- a/arch/arm/mach-mxs/Makefile
+++ b/arch/arm/mach-mxs/Makefile
@@ -1,5 +1,5 @@
# Common support
-obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o
+obj-y := clock.o devices.o icoll.o iomux.o system.o timer.o usbh.o
obj-$(CONFIG_MXS_OCOTP) += ocotp.o
obj-$(CONFIG_PM) += pm.o
diff --git a/arch/arm/mach-mxs/include/mach/devices-common.h b/arch/arm/mach-mxs/include/mach/devices-common.h
index 812d7a8..4cbe806 100644
--- a/arch/arm/mach-mxs/include/mach/devices-common.h
+++ b/arch/arm/mach-mxs/include/mach/devices-common.h
@@ -10,6 +10,7 @@
#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/amba/bus.h>
+#include <linux/fsl_devices.h>
extern struct device mxs_apbh_bus;
@@ -42,6 +43,23 @@ struct mxs_auart_data {
struct platform_device *__init mxs_add_auart(
const struct mxs_auart_data *data);
+/* usb host */
+struct mxs_usb_private_date {
+ struct clk *usb_phy_clk;
+ int internal_phy_clk_already_on;
+ void __iomem *phy_regs; /* usb phy register base */
+ void __iomem *ctrl_regs; /* usb controller register base */
+};
+struct mxs_usbh_data {
+ int id;
+ resource_size_t iobase;
+ resource_size_t phy_iobase;
+ resource_size_t irq;
+};
+struct platform_device *__init mxs_add_mxs_usbh(
+ const struct mxs_usbh_data *data,
+ struct mxc_usbh_platform_data *pdata);
+
/* fec */
#include <linux/fec.h>
struct mxs_fec_data {
diff --git a/arch/arm/mach-mxs/regs-usbphy-mxs.h b/arch/arm/mach-mxs/regs-usbphy-mxs.h
new file mode 100644
index 0000000..965afdd
--- /dev/null
+++ b/arch/arm/mach-mxs/regs-usbphy-mxs.h
@@ -0,0 +1,240 @@
+/*
+ * Freescale USBPHY Register Definitions
+ *
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ *
+ * Xml Revision: 1.52
+ * Template revision: 26195
+ */
+
+#ifndef __ARCH_ARM_MXS__USBPHY_H
+#define __ARCH_ARM_MXS__USBPHY_H
+
+
+#define HW_USBPHY_PWD 0x00000000
+#define HW_USBPHY_PWD_SET 0x00000004
+#define HW_USBPHY_PWD_CLR 0x00000008
+#define HW_USBPHY_PWD_TOG 0x0000000c
+
+#define BM_USBPHY_PWD_RXPWDRX 0x00100000
+#define BM_USBPHY_PWD_RXPWDDIFF 0x00080000
+#define BM_USBPHY_PWD_RXPWD1PT1 0x00040000
+#define BM_USBPHY_PWD_RXPWDENV 0x00020000
+
+#define BM_USBPHY_PWD_TXPWDV2I 0x00001000
+#define BM_USBPHY_PWD_TXPWDIBIAS 0x00000800
+#define BM_USBPHY_PWD_TXPWDFS 0x00000400
+
+#define HW_USBPHY_TX 0x00000010
+#define HW_USBPHY_TX_SET 0x00000014
+#define HW_USBPHY_TX_CLR 0x00000018
+#define HW_USBPHY_TX_TOG 0x0000001c
+
+#define BP_USBPHY_TX_USBPHY_TX_EDGECTRL 26
+#define BM_USBPHY_TX_USBPHY_TX_EDGECTRL 0x1C000000
+#define BF_USBPHY_TX_USBPHY_TX_EDGECTRL(v) \
+ (((v) << 26) & BM_USBPHY_TX_USBPHY_TX_EDGECTRL)
+#define BM_USBPHY_TX_USBPHY_TX_SYNC_INVERT 0x02000000
+#define BM_USBPHY_TX_USBPHY_TX_SYNC_MUX 0x01000000
+
+#define BM_USBPHY_TX_TXENCAL45DP 0x00200000
+#define BP_USBPHY_TX_TXCAL45DP 16
+#define BM_USBPHY_TX_TXCAL45DP 0x000F0000
+#define BF_USBPHY_TX_TXCAL45DP(v) \
+ (((v) << 16) & BM_USBPHY_TX_TXCAL45DP)
+#define BM_USBPHY_TX_TXENCAL45DN 0x00002000
+#define BP_USBPHY_TX_TXCAL45DN 8
+#define BM_USBPHY_TX_TXCAL45DN 0x00000F00
+#define BF_USBPHY_TX_TXCAL45DN(v) \
+ (((v) << 8) & BM_USBPHY_TX_TXCAL45DN)
+
+#define BP_USBPHY_TX_D_CAL 0
+#define BM_USBPHY_TX_D_CAL 0x0000000F
+#define BF_USBPHY_TX_D_CAL(v) \
+ (((v) << 0) & BM_USBPHY_TX_D_CAL)
+
+#define HW_USBPHY_RX 0x00000020
+#define HW_USBPHY_RX_SET 0x00000024
+#define HW_USBPHY_RX_CLR 0x00000028
+#define HW_USBPHY_RX_TOG 0x0000002c
+
+#define BM_USBPHY_RX_RXDBYPASS 0x00400000
+#define BP_USBPHY_RX_DISCONADJ 4
+#define BM_USBPHY_RX_DISCONADJ 0x00000070
+#define BF_USBPHY_RX_DISCONADJ(v) \
+ (((v) << 4) & BM_USBPHY_RX_DISCONADJ)
+#define BP_USBPHY_RX_ENVADJ 0
+#define BM_USBPHY_RX_ENVADJ 0x00000007
+#define BF_USBPHY_RX_ENVADJ(v) \
+ (((v) << 0) & BM_USBPHY_RX_ENVADJ)
+
+#define HW_USBPHY_CTRL 0x00000030
+#define HW_USBPHY_CTRL_SET 0x00000034
+#define HW_USBPHY_CTRL_CLR 0x00000038
+#define HW_USBPHY_CTRL_TOG 0x0000003c
+
+#define BM_USBPHY_CTRL_SFTRST 0x80000000
+#define BM_USBPHY_CTRL_CLKGATE 0x40000000
+#define BM_USBPHY_CTRL_UTMI_SUSPENDM 0x20000000
+#define BM_USBPHY_CTRL_HOST_FORCE_LS_SE0 0x10000000
+#define BM_USBPHY_CTRL_ENAUTOSET_USBCLKS 0x04000000
+#define BM_USBPHY_CTRL_ENAUTOCLR_USBCLKGATE 0x02000000
+#define BM_USBPHY_CTRL_FSDLL_RST_EN 0x01000000
+#define BM_USBPHY_CTRL_ENVBUSCHG_WKUP 0x00800000
+#define BM_USBPHY_CTRL_ENIDCHG_WKUP 0x00400000
+#define BM_USBPHY_CTRL_ENDPDMCHG_WKUP 0x00200000
+#define BM_USBPHY_CTRL_ENAUTOCLR_PHY_PWD 0x00100000
+#define BM_USBPHY_CTRL_ENAUTOCLR_CLKGATE 0x00080000
+#define BM_USBPHY_CTRL_ENAUTO_PWRON_PLL 0x00040000
+#define BM_USBPHY_CTRL_WAKEUP_IRQ 0x00020000
+#define BM_USBPHY_CTRL_ENIRQWAKEUP 0x00010000
+#define BM_USBPHY_CTRL_ENUTMILEVEL3 0x00008000
+#define BM_USBPHY_CTRL_ENUTMILEVEL2 0x00004000
+#define BM_USBPHY_CTRL_DATA_ON_LRADC 0x00002000
+#define BM_USBPHY_CTRL_DEVPLUGIN_IRQ 0x00001000
+#define BM_USBPHY_CTRL_ENIRQDEVPLUGIN 0x00000800
+#define BM_USBPHY_CTRL_RESUME_IRQ 0x00000400
+#define BM_USBPHY_CTRL_ENIRQRESUMEDETECT 0x00000200
+#define BM_USBPHY_CTRL_RESUMEIRQSTICKY 0x00000100
+#define BM_USBPHY_CTRL_ENOTGIDDETECT 0x00000080
+#define BM_USBPHY_CTRL_DEVPLUGIN_POLARITY 0x00000020
+#define BM_USBPHY_CTRL_ENDEVPLUGINDETECT 0x00000010
+#define BM_USBPHY_CTRL_HOSTDISCONDETECT_IRQ 0x00000008
+#define BM_USBPHY_CTRL_ENIRQHOSTDISCON 0x00000004
+#define BM_USBPHY_CTRL_ENHOSTDISCONDETECT 0x00000002
+
+#define HW_USBPHY_STATUS 0x00000040
+
+#define BM_USBPHY_STATUS_RESUME_STATUS 0x00000400
+#define BM_USBPHY_STATUS_OTGID_STATUS 0x00000100
+#define BM_USBPHY_STATUS_DEVPLUGIN_STATUS 0x00000040
+#define BM_USBPHY_STATUS_HOSTDISCONDETECT_STATUS 0x00000008
+
+#define HW_USBPHY_DEBUG 0x00000050
+#define HW_USBPHY_DEBUG_SET 0x00000054
+#define HW_USBPHY_DEBUG_CLR 0x00000058
+#define HW_USBPHY_DEBUG_TOG 0x0000005c
+
+#define BM_USBPHY_DEBUG_CLKGATE 0x40000000
+#define BM_USBPHY_DEBUG_HOST_RESUME_DEBUG 0x20000000
+#define BP_USBPHY_DEBUG_SQUELCHRESETLENGTH 25
+#define BM_USBPHY_DEBUG_SQUELCHRESETLENGTH 0x1E000000
+#define BF_USBPHY_DEBUG_SQUELCHRESETLENGTH(v) \
+ (((v) << 25) & BM_USBPHY_DEBUG_SQUELCHRESETLENGTH)
+#define BM_USBPHY_DEBUG_ENSQUELCHRESET 0x01000000
+#define BP_USBPHY_DEBUG_SQUELCHRESETCOUNT 16
+#define BM_USBPHY_DEBUG_SQUELCHRESETCOUNT 0x001F0000
+#define BF_USBPHY_DEBUG_SQUELCHRESETCOUNT(v) \
+ (((v) << 16) & BM_USBPHY_DEBUG_SQUELCHRESETCOUNT)
+#define BM_USBPHY_DEBUG_ENTX2RXCOUNT 0x00001000
+#define BP_USBPHY_DEBUG_TX2RXCOUNT 8
+#define BM_USBPHY_DEBUG_TX2RXCOUNT 0x00000F00
+#define BF_USBPHY_DEBUG_TX2RXCOUNT(v) \
+ (((v) << 8) & BM_USBPHY_DEBUG_TX2RXCOUNT)
+#define BP_USBPHY_DEBUG_ENHSTPULLDOWN 4
+#define BM_USBPHY_DEBUG_ENHSTPULLDOWN 0x00000030
+#define BF_USBPHY_DEBUG_ENHSTPULLDOWN(v) \
+ (((v) << 4) & BM_USBPHY_DEBUG_ENHSTPULLDOWN)
+#define BP_USBPHY_DEBUG_HSTPULLDOWN 2
+#define BM_USBPHY_DEBUG_HSTPULLDOWN 0x0000000C
+#define BF_USBPHY_DEBUG_HSTPULLDOWN(v) \
+ (((v) << 2) & BM_USBPHY_DEBUG_HSTPULLDOWN)
+#define BM_USBPHY_DEBUG_DEBUG_INTERFACE_HOLD 0x00000002
+#define BM_USBPHY_DEBUG_OTGIDPIOLOCK 0x00000001
+
+#define HW_USBPHY_DEBUG0_STATUS 0x00000060
+
+#define BP_USBPHY_DEBUG0_STATUS_SQUELCH_COUNT 26
+#define BM_USBPHY_DEBUG0_STATUS_SQUELCH_COUNT 0xFC000000
+#define BF_USBPHY_DEBUG0_STATUS_SQUELCH_COUNT(v) \
+ (((v) << 26) & BM_USBPHY_DEBUG0_STATUS_SQUELCH_COUNT)
+#define BP_USBPHY_DEBUG0_STATUS_UTMI_RXERROR_FAIL_COUNT 16
+#define BM_USBPHY_DEBUG0_STATUS_UTMI_RXERROR_FAIL_COUNT 0x03FF0000
+#define BF_USBPHY_DEBUG0_STATUS_UTMI_RXERROR_FAIL_COUNT(v) \
+ (((v) << 16) & BM_USBPHY_DEBUG0_STATUS_UTMI_RXERROR_FAIL_COUNT)
+#define BP_USBPHY_DEBUG0_STATUS_LOOP_BACK_FAIL_COUNT 0
+#define BM_USBPHY_DEBUG0_STATUS_LOOP_BACK_FAIL_COUNT 0x0000FFFF
+#define BF_USBPHY_DEBUG0_STATUS_LOOP_BACK_FAIL_COUNT(v) \
+ (((v) << 0) & BM_USBPHY_DEBUG0_STATUS_LOOP_BACK_FAIL_COUNT)
+
+#define HW_USBPHY_DEBUG1 0x00000070
+#define HW_USBPHY_DEBUG1_SET 0x00000074
+#define HW_USBPHY_DEBUG1_CLR 0x00000078
+#define HW_USBPHY_DEBUG1_TOG 0x0000007c
+
+#define BP_USBPHY_DEBUG1_ENTAILADJVD 13
+#define BM_USBPHY_DEBUG1_ENTAILADJVD 0x00006000
+#define BF_USBPHY_DEBUG1_ENTAILADJVD(v) \
+ (((v) << 13) & BM_USBPHY_DEBUG1_ENTAILADJVD)
+#define BM_USBPHY_DEBUG1_ENTX2TX 0x00001000
+#define BP_USBPHY_DEBUG1_DBG_ADDRESS 0
+#define BM_USBPHY_DEBUG1_DBG_ADDRESS 0x0000000F
+#define BF_USBPHY_DEBUG1_DBG_ADDRESS(v) \
+ (((v) << 0) & BM_USBPHY_DEBUG1_DBG_ADDRESS)
+
+#define HW_USBPHY_VERSION 0x00000080
+
+#define BP_USBPHY_VERSION_MAJOR 24
+#define BM_USBPHY_VERSION_MAJOR 0xFF000000
+#define BF_USBPHY_VERSION_MAJOR(v) \
+ (((v) << 24) & BM_USBPHY_VERSION_MAJOR)
+#define BP_USBPHY_VERSION_MINOR 16
+#define BM_USBPHY_VERSION_MINOR 0x00FF0000
+#define BF_USBPHY_VERSION_MINOR(v) \
+ (((v) << 16) & BM_USBPHY_VERSION_MINOR)
+#define BP_USBPHY_VERSION_STEP 0
+#define BM_USBPHY_VERSION_STEP 0x0000FFFF
+#define BF_USBPHY_VERSION_STEP(v) \
+ (((v) << 0) & BM_USBPHY_VERSION_STEP)
+
+#define HW_USBPHY_IP 0x00000090
+#define HW_USBPHY_IP_SET 0x00000094
+#define HW_USBPHY_IP_CLR 0x00000098
+#define HW_USBPHY_IP_TOG 0x0000009c
+
+#define BP_USBPHY_IP_DIV_SEL 23
+#define BM_USBPHY_IP_DIV_SEL 0x01800000
+#define BF_USBPHY_IP_DIV_SEL(v) \
+ (((v) << 23) & BM_USBPHY_IP_DIV_SEL)
+#define BV_USBPHY_IP_DIV_SEL__DEFAULT 0x0
+#define BV_USBPHY_IP_DIV_SEL__LOWER 0x1
+#define BV_USBPHY_IP_DIV_SEL__LOWEST 0x2
+#define BV_USBPHY_IP_DIV_SEL__UNDEFINED 0x3
+#define BP_USBPHY_IP_LFR_SEL 21
+#define BM_USBPHY_IP_LFR_SEL 0x00600000
+#define BF_USBPHY_IP_LFR_SEL(v) \
+ (((v) << 21) & BM_USBPHY_IP_LFR_SEL)
+#define BV_USBPHY_IP_LFR_SEL__DEFAULT 0x0
+#define BV_USBPHY_IP_LFR_SEL__TIMES_2 0x1
+#define BV_USBPHY_IP_LFR_SEL__TIMES_05 0x2
+#define BV_USBPHY_IP_LFR_SEL__UNDEFINED 0x3
+#define BP_USBPHY_IP_CP_SEL 19
+#define BM_USBPHY_IP_CP_SEL 0x00180000
+#define BF_USBPHY_IP_CP_SEL(v) \
+ (((v) << 19) & BM_USBPHY_IP_CP_SEL)
+#define BV_USBPHY_IP_CP_SEL__DEFAULT 0x0
+#define BV_USBPHY_IP_CP_SEL__TIMES_2 0x1
+#define BV_USBPHY_IP_CP_SEL__TIMES_05 0x2
+#define BV_USBPHY_IP_CP_SEL__UNDEFINED 0x3
+#define BM_USBPHY_IP_TSTI_TX_DP 0x00040000
+#define BM_USBPHY_IP_TSTI_TX_DM 0x00020000
+#define BM_USBPHY_IP_ANALOG_TESTMODE 0x00010000
+#define BM_USBPHY_IP_EN_USB_CLKS 0x00000004
+#define BM_USBPHY_IP_PLL_LOCKED 0x00000002
+#define BM_USBPHY_IP_PLL_POWER 0x00000001
+#endif /* __ARCH_ARM_MXS__USBPHY_H */
diff --git a/arch/arm/mach-mxs/usbh.c b/arch/arm/mach-mxs/usbh.c
new file mode 100644
index 0000000..61068bc
--- /dev/null
+++ b/arch/arm/mach-mxs/usbh.c
@@ -0,0 +1,182 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+
+#include <linux/delay.h>
+#include <mach/devices-common.h>
+#include "regs-usbphy-mxs.h"
+
+/* EHCI registers: */
+#define UOG_USBCMD (0x140) /* USB command register */
+#define UOG_USBSTS (0x144) /* USB status register */
+#define UOG_PORTSC1 (0x184) /* port status and control */
+/* x_PORTSCx */
+#define PORTSC_PTS_MASK (3 << 30) /* parallel xcvr mask */
+#define PORTSC_PTS_UTMI (0 << 30) /* UTMI/UTMI+ */
+#define PORTSC_PTW (1 << 28) /* UTMI width */
+/* USBCMD */
+#define UCMD_RUN_STOP (1 << 0) /* controller run/stop */
+#define UCMD_RESET (1 << 1) /* controller reset */
+
+#define HOSTPHY_CONNECT_STATE (1 << 3)
+#define STS_PCD (1 << 2) /* port change detect */
+
+static inline int fsl_platform_get_usb_connect_status
+ (struct mxs_usb_private_date *priv)
+{
+ u32 status;
+
+ status = __raw_readl(priv->phy_regs + HW_USBPHY_STATUS);
+
+ return ((status & HOSTPHY_CONNECT_STATE) == 0);
+}
+
+/* enable/disable high-speed disconnect detector of phy ctrl */
+static inline void fsl_platform_disconnect_detect
+ (struct mxs_usb_private_date *priv, int enable)
+{
+ if (enable) {
+ __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+ priv->phy_regs + HW_USBPHY_CTRL_SET);
+ } else {
+ __raw_writel(BM_USBPHY_CTRL_ENHOSTDISCONDETECT,
+ priv->phy_regs + HW_USBPHY_CTRL_CLR);
+ }
+}
+
+void fsl_plt_usbh_irq_handler(struct mxc_usbh_platform_data *pdata)
+{
+ u32 status;
+ struct mxs_usb_private_date *priv = pdata->priv;
+
+ status = __raw_readl(priv->ctrl_regs + UOG_USBSTS);
+
+ if (status & STS_PCD)
+ fsl_platform_disconnect_detect(priv,
+ fsl_platform_get_usb_connect_status(priv));
+}
+
+static int usb_phy_enable(struct mxs_usb_private_date *priv)
+{
+ u32 tmp;
+ u32 i = 0;
+ void __iomem *usbcmd, *phy_ctrl, *portsc;
+
+ /* Reset USB IP */
+ /* Set run stop bit */
+ /* Send reset command */
+ usbcmd = priv->ctrl_regs + UOG_USBCMD;
+ tmp = __raw_readl(usbcmd); /* usb command */
+ tmp &= ~UCMD_RUN_STOP;
+ __raw_writel(tmp, usbcmd);
+ while (__raw_readl(usbcmd) & UCMD_RUN_STOP) {
+ i++;
+ if (i == 1000)
+ break;
+ mdelay(1);
+ }
+ tmp |= UCMD_RESET;
+ __raw_writel(tmp, usbcmd);
+ i = 0;
+ while (__raw_readl(usbcmd) & UCMD_RESET) {
+ i++;
+ if (i == 1000)
+ break;
+ mdelay(1);
+ }
+ mdelay(10);
+
+ /* Reset USBPHY module, set soft reset bit */
+ phy_ctrl = priv->phy_regs + HW_USBPHY_CTRL;
+ tmp = __raw_readl(phy_ctrl);
+ tmp |= BM_USBPHY_CTRL_SFTRST;
+ __raw_writel(tmp, phy_ctrl);
+ udelay(10);
+
+ /* clear CLKGATE and SFTRST bits to be out of reset mode*/
+ tmp = __raw_readl(phy_ctrl);
+ tmp &= ~(BM_USBPHY_CTRL_CLKGATE | BM_USBPHY_CTRL_SFTRST);
+ __raw_writel(tmp, phy_ctrl);
+ udelay(10);
+
+ /* set UTMI xcvr */
+ /* Workaround an IC issue for ehci driver:
+ * when turn off root hub port power, EHCI set
+ * PORTSC reserved bits to be 0, but PTW with 0
+ * means 8 bits tranceiver width, here change
+ * it back to be 16 bits and do PHY diable and
+ * then enable.
+ */
+ portsc = priv->ctrl_regs + UOG_PORTSC1;
+ tmp = __raw_readl(portsc);
+ tmp &= ~PORTSC_PTS_MASK;
+ tmp |= (PORTSC_PTS_UTMI | PORTSC_PTW);
+ __raw_writel(tmp, portsc);
+
+ /* Power up the PHY */
+ __raw_writel(0, priv->phy_regs + HW_USBPHY_PWD);
+ return 0;
+}
+
+static int fsl_usbh_init(struct platform_device *pdev)
+{
+ struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
+ struct mxs_usb_private_date *priv = pdata->priv;
+ u32 tmp;
+
+ usb_phy_enable(priv);
+ /* enable FS/LS device */
+ tmp = __raw_readl(priv->phy_regs + HW_USBPHY_CTRL);
+ tmp |= (BM_USBPHY_CTRL_ENUTMILEVEL2 | BM_USBPHY_CTRL_ENUTMILEVEL3);
+ __raw_writel(tmp, priv->phy_regs + HW_USBPHY_CTRL);
+
+ return 0;
+}
+
+static void phy_clock_gate(struct mxs_usb_private_date *priv, bool on)
+{
+ u32 tmp;
+
+ if (on) {
+ priv->internal_phy_clk_already_on += 1;
+ if (priv->internal_phy_clk_already_on == 1) {
+ tmp = BM_USBPHY_CTRL_SFTRST | BM_USBPHY_CTRL_CLKGATE;
+ __raw_writel(tmp, priv->phy_regs + HW_USBPHY_CTRL_CLR);
+ }
+ } else {
+ priv->internal_phy_clk_already_on -= 1;
+ if (priv->internal_phy_clk_already_on == 0) {
+ tmp = BM_USBPHY_CTRL_CLKGATE;
+ __raw_writel(tmp, priv->phy_regs + HW_USBPHY_CTRL_SET);
+ }
+ }
+ if (WARN_ON(priv->internal_phy_clk_already_on < 0))
+ printk(KERN_ERR "please check phy clock ON/OFF sequence\n");
+
+}
+
+int fsl_usb_host_init(struct platform_device *pdev)
+{
+ struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
+ struct mxs_usb_private_date *priv = pdata->priv;
+
+ clk_enable(priv->usb_phy_clk);
+ phy_clock_gate(priv, true);
+
+ return fsl_usbh_init(pdev);
+}
+
+int fsl_usb_host_uninit(struct platform_device *pdev)
+{
+ struct mxc_usbh_platform_data *pdata = pdev->dev.platform_data;
+ struct mxs_usb_private_date *priv = pdata->priv;
+
+ phy_clock_gate(priv, false);
+ clk_disable(priv->usb_phy_clk);
+
+ return 0;
+}
diff --git a/arch/arm/mach-mxs/usbh.h b/arch/arm/mach-mxs/usbh.h
new file mode 100644
index 0000000..96ac0b5
--- /dev/null
+++ b/arch/arm/mach-mxs/usbh.h
@@ -0,0 +1,13 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#include <linux/fsl_devices.h>
+#include <linux/platform_device.h>
+
+int fsl_usb_host_init(struct platform_device *pdev);
+int fsl_usb_host_uninit(struct platform_device *pdev);
+void fsl_plt_usbh_irq_handler(struct mxc_usbh_platform_data *pdata);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 6/7] ARM: mxs: add usb platform operations
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
` (4 preceding siblings ...)
2011-08-02 8:39 ` [PATCH v4 5/7] ARM: mxs: add usb platform operations Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-02 8:39 ` [PATCH v4 7/7] ARM: mxs: add usb host function to default config Tony Lin
2011-08-05 7:53 ` [PATCH v4 0/7] ARM: mx28: add usb host function Lin Tony-B19295
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
add usb phy register definitions and functions
usb host driver will use these callback functions
to initialize usb phy and change working mode
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/mach-mxs/Kconfig | 1 +
arch/arm/mach-mxs/devices-mx28.h | 4 +
arch/arm/mach-mxs/devices/Kconfig | 3 +
arch/arm/mach-mxs/devices/Makefile | 1 +
arch/arm/mach-mxs/devices/platform-usb.c | 96 +++++++++++++++++++++++++++++
arch/arm/mach-mxs/include/mach/hardware.h | 2 +
arch/arm/mach-mxs/include/mach/mx23.h | 8 +-
arch/arm/mach-mxs/include/mach/mxs.h | 12 +++-
arch/arm/mach-mxs/mach-mx28evk.c | 11 +++
9 files changed, 133 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 4cd0231..1b11e79 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -48,6 +48,7 @@ config MACH_MX28EVK
select MXS_HAVE_PLATFORM_FLEXCAN
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXSFB
+ select MXS_HAVE_PLATFORM_USB
select MXS_OCOTP
help
Include support for MX28EVK platform. This includes specific
diff --git a/arch/arm/mach-mxs/devices-mx28.h b/arch/arm/mach-mxs/devices-mx28.h
index 79b9452..b4dc758 100644
--- a/arch/arm/mach-mxs/devices-mx28.h
+++ b/arch/arm/mach-mxs/devices-mx28.h
@@ -43,5 +43,9 @@ extern const struct mxs_mxs_mmc_data mx28_mxs_mmc_data[] __initconst;
#define mx28_add_mxs_pwm(id) mxs_add_mxs_pwm(MX28_PWM_BASE_ADDR, id)
+extern const struct mxs_usbh_data mx28_mxs_usbh_data[] __initconst;
+#define mx28_add_mxs_usbh(id, pdata) \
+ mxs_add_mxs_usbh(&mx28_mxs_usbh_data[id], pdata)
+
struct platform_device *__init mx28_add_mxsfb(
const struct mxsfb_platform_data *pdata);
diff --git a/arch/arm/mach-mxs/devices/Kconfig b/arch/arm/mach-mxs/devices/Kconfig
index acf9eea..8c0f6fa 100644
--- a/arch/arm/mach-mxs/devices/Kconfig
+++ b/arch/arm/mach-mxs/devices/Kconfig
@@ -23,3 +23,6 @@ config MXS_HAVE_PLATFORM_MXS_PWM
config MXS_HAVE_PLATFORM_MXSFB
bool
+
+config MXS_HAVE_PLATFORM_USB
+ bool
diff --git a/arch/arm/mach-mxs/devices/Makefile b/arch/arm/mach-mxs/devices/Makefile
index 351915c..a964bc9 100644
--- a/arch/arm/mach-mxs/devices/Makefile
+++ b/arch/arm/mach-mxs/devices/Makefile
@@ -8,3 +8,4 @@ obj-$(CONFIG_MXS_HAVE_PLATFORM_MXS_MMC) += platform-mxs-mmc.o
obj-$(CONFIG_MXS_HAVE_PLATFORM_MXS_PWM) += platform-mxs-pwm.o
obj-y += platform-gpio-mxs.o
obj-$(CONFIG_MXS_HAVE_PLATFORM_MXSFB) += platform-mxsfb.o
+obj-$(CONFIG_MXS_HAVE_PLATFORM_USB) += platform-usb.o
diff --git a/arch/arm/mach-mxs/devices/platform-usb.c b/arch/arm/mach-mxs/devices/platform-usb.c
new file mode 100644
index 0000000..b9119ff
--- /dev/null
+++ b/arch/arm/mach-mxs/devices/platform-usb.c
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2011 Freescale Semiconductor, Inc. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+
+#include <linux/compiler.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/fsl_devices.h>
+
+#include <mach/mx23.h>
+#include <mach/mx28.h>
+#include <mach/devices-common.h>
+
+#define mxs_usbh_data_entry_single(soc, _id, hwid) \
+ { \
+ .id = _id, \
+ .iobase = soc ## _USBCTRL ## hwid ## _BASE_ADDR, \
+ .phy_iobase = soc ## _USBPHY ## hwid ## _BASE_ADDR, \
+ .irq = soc ## _INT_USB ## hwid, \
+ }
+
+#define mxs_usbh_data_entry(soc, _id, hwid) \
+ [_id] = mxs_usbh_data_entry_single(soc, _id, hwid)
+
+#ifdef CONFIG_SOC_IMX23
+const struct mxs_usbh_data mx23_mxs_usbh_data[] __initconst = {
+ mxs_usbh_data_entry(MX23, 0, 0),
+};
+#endif
+
+#ifdef CONFIG_SOC_IMX28
+const struct mxs_usbh_data mx28_mxs_usbh_data[] __initconst = {
+ mxs_usbh_data_entry(MX28, 0, 0),
+ mxs_usbh_data_entry(MX28, 1, 1),
+};
+#endif
+
+struct platform_device *__init mxs_add_mxs_usbh(
+ const struct mxs_usbh_data *data,
+ struct mxc_usbh_platform_data *pdata)
+{
+ struct mxs_usb_private_date *usbh_private;
+ struct platform_device *pdev;
+ struct resource res[] = {
+ {
+ .start = data->iobase,
+ .end = data->iobase + SZ_64K - 1,
+ .flags = IORESOURCE_MEM,
+ }, {
+ .start = data->irq,
+ .end = data->irq,
+ .flags = IORESOURCE_IRQ,
+ },
+ };
+
+ usbh_private = kmalloc(sizeof(*usbh_private), GFP_KERNEL);
+ if (!usbh_private)
+ return NULL;
+
+ usbh_private->phy_regs = ioremap(data->phy_iobase, SZ_8K);
+ usbh_private->ctrl_regs = ioremap(data->iobase, SZ_64K);
+ if (!usbh_private->phy_regs || !usbh_private->ctrl_regs)
+ goto out;
+
+ if (data->id == 0)
+ usbh_private->usb_phy_clk = clk_get(NULL, "usb0_phy");
+ else if (data->id == 1)
+ usbh_private->usb_phy_clk = clk_get(NULL, "usb1_phy");
+ else
+ BUG();
+ if (IS_ERR(usbh_private->usb_phy_clk))
+ goto out;
+
+ pdata->priv = usbh_private;
+
+ pdev = mxs_add_platform_device_dmamask("mxc-ehci", data->id,
+ res, ARRAY_SIZE(res), pdata,
+ sizeof(*pdata), DMA_BIT_MASK(32));
+ if (pdev)
+ return pdev;
+
+out:
+ if (usbh_private->usb_phy_clk)
+ clk_put(usbh_private->usb_phy_clk);
+ if (usbh_private->phy_regs)
+ iounmap(usbh_private->phy_regs);
+ if (usbh_private->ctrl_regs)
+ iounmap(usbh_private->ctrl_regs);
+ kfree(usbh_private);
+
+ return NULL;
+}
diff --git a/arch/arm/mach-mxs/include/mach/hardware.h b/arch/arm/mach-mxs/include/mach/hardware.h
index 53e89a0..affa72b 100644
--- a/arch/arm/mach-mxs/include/mach/hardware.h
+++ b/arch/arm/mach-mxs/include/mach/hardware.h
@@ -26,4 +26,6 @@
#define IOMEM(addr) ((void __force __iomem *)(addr))
#endif
+#include "mxs.h"
+
#endif /* __MACH_MXS_HARDWARE_H__ */
diff --git a/arch/arm/mach-mxs/include/mach/mx23.h b/arch/arm/mach-mxs/include/mach/mx23.h
index 599094b..7955b75 100644
--- a/arch/arm/mach-mxs/include/mach/mx23.h
+++ b/arch/arm/mach-mxs/include/mach/mx23.h
@@ -64,8 +64,8 @@
#define MX23_AUART1_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06c000)
#define MX23_AUART2_BASE_ADDR (MX23_IO_BASE_ADDR + 0x06e000)
#define MX23_DUART_BASE_ADDR (MX23_IO_BASE_ADDR + 0x070000)
-#define MX23_USBPHY_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000)
-#define MX23_USBCTRL_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000)
+#define MX23_USBPHY0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x07c000)
+#define MX23_USBCTRL0_BASE_ADDR (MX23_IO_BASE_ADDR + 0x080000)
#define MX23_DRAM_BASE_ADDR (MX23_IO_BASE_ADDR + 0x0e0000)
#define MX23_IO_P2V(x) MXS_IO_P2V(x)
@@ -89,8 +89,8 @@
#define MX23_INT_SPDIF_ERROR 10
#define MX23_INT_SAIF1_IRQ 10
#define MX23_INT_SAIF2_IRQ 10
-#define MX23_INT_USB_CTRL 11
-#define MX23_INT_USB_WAKEUP 12
+#define MX23_INT_USB0 11
+#define MX23_INT_USB0_WAKEUP 12
#define MX23_INT_GPMI_DMA 13
#define MX23_INT_SSP1_DMA 14
#define MX23_INT_SSP1_ERROR 15
diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h
index 35a89dd..0661e90 100644
--- a/arch/arm/mach-mxs/include/mach/mxs.h
+++ b/arch/arm/mach-mxs/include/mach/mxs.h
@@ -35,7 +35,17 @@
machine_is_mx28evk() || \
machine_is_tx28() || \
0)
-
+#define cpu_is_mx1() 0
+#define cpu_is_mx21() 0
+#define cpu_is_mx25() 0
+#define cpu_is_mx27() 0
+#define cpu_is_mx31() 0
+#define cpu_is_mx35() 0
+#define cpu_is_mx50() 0
+#define cpu_is_mx51() 0
+#define cpu_is_mx53() 0
+#define cpu_is_mx3() (cpu_is_mx31() || cpu_is_mx35())
+#define cpu_is_mx2() (cpu_is_mx21() || cpu_is_mx27())
/*
* IO addresses common to MXS-based
*/
diff --git a/arch/arm/mach-mxs/mach-mx28evk.c b/arch/arm/mach-mxs/mach-mx28evk.c
index 680d6e4..29c2f29 100644
--- a/arch/arm/mach-mxs/mach-mx28evk.c
+++ b/arch/arm/mach-mxs/mach-mx28evk.c
@@ -27,6 +27,7 @@
#include <mach/iomux-mx28.h>
#include "devices-mx28.h"
+#include "usbh.h"
#define MX28EVK_FLEXCAN_SWITCH MXS_GPIO_NR(2, 13)
#define MX28EVK_FEC_PHY_POWER MXS_GPIO_NR(2, 15)
@@ -355,6 +356,14 @@ static struct mxs_mmc_platform_data mx28evk_mmc_pdata[] __initdata = {
},
};
+static struct mxc_usbh_platform_data usbh_pdata __initdata = {
+ .init = fsl_usb_host_init,
+ .exit = fsl_usb_host_uninit,
+ .portsc = MXC_EHCI_MODE_ULPI,
+ .otg = NULL,
+ .plt_irq_handler = fsl_plt_usbh_irq_handler,
+};
+
static void __init mx28evk_init(void)
{
int ret;
@@ -412,6 +421,8 @@ static void __init mx28evk_init(void)
"usb1-power-en");
if (ret)
pr_warn("failed to request gpio usb1-power-en %d\n", ret);
+ mx28_add_mxs_usbh(1, &usbh_pdata);
+
gpio_led_register_device(0, &mx28evk_led_data);
}
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 7/7] ARM: mxs: add usb host function to default config
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
` (5 preceding siblings ...)
2011-08-02 8:39 ` [PATCH v4 6/7] " Tony Lin
@ 2011-08-02 8:39 ` Tony Lin
2011-08-05 7:53 ` [PATCH v4 0/7] ARM: mx28: add usb host function Lin Tony-B19295
7 siblings, 0 replies; 13+ messages in thread
From: Tony Lin @ 2011-08-02 8:39 UTC (permalink / raw)
To: linux-arm-kernel
add usb host to mxs_defconfig
Signed-off-by: Tony Lin <tony.lin@freescale.com>
---
arch/arm/configs/mxs_defconfig | 8 +++++++-
arch/arm/mach-mxs/Kconfig | 1 +
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index db2cb7d..0a187a2 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -87,8 +87,14 @@ CONFIG_GPIO_SYSFS=y
# CONFIG_HWMON is not set
# CONFIG_MFD_SUPPORT is not set
CONFIG_DISPLAY_SUPPORT=m
+CONFIG_USB_ARCH_HAS_EHCI=y
# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
+CONFIG_USB_SUPPORT=y
+CONFIG_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_MXC=y
CONFIG_MMC=y
CONFIG_MMC_MXS=y
CONFIG_RTC_CLASS=y
diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 1b11e79..58d52c5 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -49,6 +49,7 @@ config MACH_MX28EVK
select MXS_HAVE_PLATFORM_MXS_MMC
select MXS_HAVE_PLATFORM_MXSFB
select MXS_HAVE_PLATFORM_USB
+ select USB_ARCH_HAS_EHCI
select MXS_OCOTP
help
Include support for MX28EVK platform. This includes specific
--
1.7.0.4
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH v4 0/7] ARM: mx28: add usb host function
2011-08-02 8:39 [PATCH v4 0/7] ARM: mx28: add usb host function Tony Lin
` (6 preceding siblings ...)
2011-08-02 8:39 ` [PATCH v4 7/7] ARM: mxs: add usb host function to default config Tony Lin
@ 2011-08-05 7:53 ` Lin Tony-B19295
2011-08-05 13:03 ` s.hauer at pengutronix.de
7 siblings, 1 reply; 13+ messages in thread
From: Lin Tony-B19295 @ 2011-08-05 7:53 UTC (permalink / raw)
To: linux-arm-kernel
Any comments for the patch series?
Tony
> -----Original Message-----
> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-arm-
> kernel-bounces at lists.infradead.org] On Behalf Of Tony Lin
> Sent: Tuesday, August 02, 2011 4:40 PM
> To: linux-usb at vger.kernel.org
> Cc: s.hauer at pengutronix.de; stern at rowland.harvard.edu; linux-arm-
> kernel at lists.infradead.org
> Subject: [PATCH v4 0/7] ARM: mx28: add usb host function
>
> this patch series is to add mx28 usb host function.
> the driver only support usb host mode on usb port1.
> the driver reuses ehci-mxc.c under usb/host, but add platform irq handler
> routines if platform wants to do something specific in irq handler.
> the patch also consolidates some macro definitions and structure
> definitions to make ehci-mxc.c better reusable among mxs/mxc platforms.
>
> Code is based on the branch for-next in sascha's tree
> http://git.pengutronix.de/git/imx/linux-2.6.git
>
> Tested on MX28 EVK.
>
> changes since v3:
> * change code to standard framework.
> * avoid changing pdata in driver.
> * pass testing usb0/usb1 on MX28 EVK board.
>
> changes since v2:
> * add error condition clean up code.
> * remove unnecessary initial code.
> * change file name from regs-usbphy-mx28 to regs-usbphy-mxs.h.
>
> changes since v1:
> * add dummy clock to avoid adding cpu judgement in driver for Sascha's
> request.
> * use context in phy functions, so that usb device could share the code.
> * some code consolidation and patch reorgnization.
> * error checking improvement.
> * remove a few unneccesary code.
> Tony Lin (7):
> ARM: mxs: ehci: consolidate definitions and structures to share among
> platforms
> ARM: mxs: make ehci-mxc more flexible to be used on different platforms
> ARM: mxs: add usb clocks to clock tree
> ARM: mxs: enable usb phy power supply
> ARM: mxs: add usb platform operations
> ARM: mxs: add usb platform operations
> ARM: mxs: add usb host function to default config
>
> arch/arm/configs/mxs_defconfig | 8 +-
> arch/arm/mach-mxs/Kconfig | 2 +
> arch/arm/mach-mxs/Makefile | 2 +-
> arch/arm/mach-mxs/clock-mx28.c | 25 +++-
> arch/arm/mach-mxs/devices-mx28.h | 4 +
> arch/arm/mach-mxs/devices/Kconfig | 3 +
> arch/arm/mach-mxs/devices/Makefile | 1 +
> arch/arm/mach-mxs/devices/platform-usb.c | 96 +++++++++
> arch/arm/mach-mxs/include/mach/devices-common.h | 18 ++
> arch/arm/mach-mxs/include/mach/hardware.h | 2 +
> arch/arm/mach-mxs/include/mach/mx23.h | 8 +-
> arch/arm/mach-mxs/include/mach/mxs.h | 12 +-
> arch/arm/mach-mxs/mach-mx28evk.c | 20 ++-
> arch/arm/mach-mxs/regs-usbphy-mxs.h | 240
> +++++++++++++++++++++++
> arch/arm/mach-mxs/usbh.c | 182 +++++++++++++++++
> arch/arm/mach-mxs/usbh.h | 13 ++
> arch/arm/plat-mxc/include/mach/mxc_ehci.h | 19 --
> drivers/usb/host/Kconfig | 2 +-
> drivers/usb/host/ehci-mxc.c | 17 ++-
> include/linux/fsl_devices.h | 21 ++
> 20 files changed, 661 insertions(+), 34 deletions(-) create mode 100644
> arch/arm/mach-mxs/devices/platform-usb.c
> create mode 100644 arch/arm/mach-mxs/regs-usbphy-mxs.h
> create mode 100644 arch/arm/mach-mxs/usbh.c create mode 100644
> arch/arm/mach-mxs/usbh.h
>
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread* [PATCH v4 0/7] ARM: mx28: add usb host function
2011-08-05 7:53 ` [PATCH v4 0/7] ARM: mx28: add usb host function Lin Tony-B19295
@ 2011-08-05 13:03 ` s.hauer at pengutronix.de
2011-08-05 14:22 ` Peter Chen
0 siblings, 1 reply; 13+ messages in thread
From: s.hauer at pengutronix.de @ 2011-08-05 13:03 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 05, 2011 at 07:53:21AM +0000, Lin Tony-B19295 wrote:
> Any comments for the patch series?
Yes. The way you handle the USB phys is totally inacceptable. Please
understand that there are *two* devices, one is the ehci core and the
other is the associated phy.
You need to register the phy as a platform device, the corresponding
driver then has to register the phy using some kind of usb_transceiver_register().
On the ehci side the mxc-ehci driver has to find its phy using
usb_get_transceiver().
Note that the infrastructure needed for this is not in the kernel, but
there are patches recently posted on linux-usb:
http://www.spinics.net/lists/linux-usb/msg50148.html
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v4 0/7] ARM: mx28: add usb host function
2011-08-05 13:03 ` s.hauer at pengutronix.de
@ 2011-08-05 14:22 ` Peter Chen
2011-08-05 16:52 ` s.hauer at pengutronix.de
0 siblings, 1 reply; 13+ messages in thread
From: Peter Chen @ 2011-08-05 14:22 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 05, 2011 at 03:03:01PM +0200, s.hauer at pengutronix.de wrote:
> On Fri, Aug 05, 2011 at 07:53:21AM +0000, Lin Tony-B19295 wrote:
> > Any comments for the patch series?
>
> Yes. The way you handle the USB phys is totally inacceptable. Please
> understand that there are *two* devices, one is the ehci core and the
> other is the associated phy.
>
> You need to register the phy as a platform device, the corresponding
> driver then has to register the phy using some kind of usb_transceiver_register().
> On the ehci side the mxc-ehci driver has to find its phy using
> usb_get_transceiver().
>
> Note that the infrastructure needed for this is not in the kernel, but
> there are patches recently posted on linux-usb:
>
> http://www.spinics.net/lists/linux-usb/msg50148.html
>
> Sascha
>
I have discussed with Heikki, his framework is good, it saperates phys from
otg driver, so phy's utilities can be called at both otg and
device only mode, besides it can support usb charger better.
So, do we pause i.mx28 usb's upstream until Heikki's otg modification in
master, or just do thing like ulpi.c?
> --
> Pengutronix e.K. | |
> Industrial Linux Solutions | http://www.pengutronix.de/ |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
> --
> To unsubscribe from this list: send the line "unsubscribe linux-usb" in
> the body of a message to majordomo at vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
Best Regards,
Peter Chen
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v4 0/7] ARM: mx28: add usb host function
2011-08-05 14:22 ` Peter Chen
@ 2011-08-05 16:52 ` s.hauer at pengutronix.de
2011-08-08 2:03 ` Lin Tony-B19295
0 siblings, 1 reply; 13+ messages in thread
From: s.hauer at pengutronix.de @ 2011-08-05 16:52 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Aug 05, 2011 at 10:22:54PM +0800, Peter Chen wrote:
> On Fri, Aug 05, 2011 at 03:03:01PM +0200, s.hauer at pengutronix.de wrote:
> > On Fri, Aug 05, 2011 at 07:53:21AM +0000, Lin Tony-B19295 wrote:
> > > Any comments for the patch series?
> >
> > Yes. The way you handle the USB phys is totally inacceptable. Please
> > understand that there are *two* devices, one is the ehci core and the
> > other is the associated phy.
> >
> > You need to register the phy as a platform device, the corresponding
> > driver then has to register the phy using some kind of usb_transceiver_register().
> > On the ehci side the mxc-ehci driver has to find its phy using
> > usb_get_transceiver().
> >
> > Note that the infrastructure needed for this is not in the kernel, but
> > there are patches recently posted on linux-usb:
> >
> > http://www.spinics.net/lists/linux-usb/msg50148.html
> >
> > Sascha
> >
> I have discussed with Heikki, his framework is good, it saperates phys from
> otg driver, so phy's utilities can be called at both otg and
> device only mode, besides it can support usb charger better.
>
> So, do we pause i.mx28 usb's upstream until Heikki's otg modification in
> master, or just do thing like ulpi.c?
I think you can use Heikkis patches as a base. They will get updates
before hitting mainline, but the changes to the (phy-) driver side
should be trivial. This way we can also detect possible problems with
Heikkis patches. There's plenty of time before the next merge window to
get the patches into shape.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH v4 0/7] ARM: mx28: add usb host function
2011-08-05 16:52 ` s.hauer at pengutronix.de
@ 2011-08-08 2:03 ` Lin Tony-B19295
0 siblings, 0 replies; 13+ messages in thread
From: Lin Tony-B19295 @ 2011-08-08 2:03 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-arm-kernel-bounces at lists.infradead.org [mailto:linux-arm-
> kernel-bounces at lists.infradead.org] On Behalf Of s.hauer at pengutronix.de
> Sent: Saturday, August 06, 2011 12:53 AM
> To: Chen Peter-B29397
> Cc: heikki.krogerus at linux.intel.com; linux-usb at vger.kernel.org;
> stern at rowland.harvard.edu; Lin Tony-B19295; linux-arm-
> kernel at lists.infradead.org
> Subject: Re: [PATCH v4 0/7] ARM: mx28: add usb host function
>
> On Fri, Aug 05, 2011 at 10:22:54PM +0800, Peter Chen wrote:
> > On Fri, Aug 05, 2011 at 03:03:01PM +0200, s.hauer at pengutronix.de wrote:
> > > On Fri, Aug 05, 2011 at 07:53:21AM +0000, Lin Tony-B19295 wrote:
> > > > Any comments for the patch series?
> > >
> > > Yes. The way you handle the USB phys is totally inacceptable. Please
> > > understand that there are *two* devices, one is the ehci core and
> > > the other is the associated phy.
> > >
> > > You need to register the phy as a platform device, the corresponding
> > > driver then has to register the phy using some kind of
> usb_transceiver_register().
> > > On the ehci side the mxc-ehci driver has to find its phy using
> > > usb_get_transceiver().
> > >
> > > Note that the infrastructure needed for this is not in the kernel,
> > > but there are patches recently posted on linux-usb:
> > >
> > > http://www.spinics.net/lists/linux-usb/msg50148.html
> > >
> > > Sascha
> > >
> > I have discussed with Heikki, his framework is good, it saperates phys
> > from otg driver, so phy's utilities can be called at both otg and
> > device only mode, besides it can support usb charger better.
> >
> > So, do we pause i.mx28 usb's upstream until Heikki's otg modification
> > in master, or just do thing like ulpi.c?
>
> I think you can use Heikkis patches as a base. They will get updates
> before hitting mainline, but the changes to the (phy-) driver side should
> be trivial. This way we can also detect possible problems with Heikkis
> patches. There's plenty of time before the next merge window to get the
> patches into shape.
>
Ok. Thanks for your advice.
Tony
> Sascha
>
> --
> Pengutronix e.K. |
> |
> Industrial Linux Solutions | http://www.pengutronix.de/
> |
> Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0
> |
> Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555
> |
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 13+ messages in thread