All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver
@ 2012-02-13 13:27 Ajay Bhargav
  2012-02-13 13:27 ` [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs Ajay Bhargav
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Ajay Bhargav @ 2012-02-13 13:27 UTC (permalink / raw)
  To: u-boot

This patch adds USB host controller's UTMI PHY interface driver for
Armada100 SOCs.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
---
Changes for v2:
	- Fix: enable only required clock in MPMU
Changes for v3:
	- Added timeout on while loops
	- moved utmi-armada100.h to arch include folder

 arch/arm/include/asm/arch-armada100/armada100.h    |    8 ++
 .../include/asm/arch-armada100/utmi-armada100.h    |   79 ++++++++++++++++
 drivers/usb/host/utmi-armada100.c                  |   96 ++++++++++++++++++++
 3 files changed, 183 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h
 create mode 100644 drivers/usb/host/utmi-armada100.c

diff --git a/arch/arm/include/asm/arch-armada100/armada100.h b/arch/arm/include/asm/arch-armada100/armada100.h
index 0ed3a8e..70fba27 100644
--- a/arch/arm/include/asm/arch-armada100/armada100.h
+++ b/arch/arm/include/asm/arch-armada100/armada100.h
@@ -43,6 +43,14 @@
 #define SSP2_APBCLK		0x01
 #define SSP2_FNCLK		0x02
 
+/* USB Clock/reset control bits */
+#define USB_SPH_AXICLK_EN	0x10
+#define USB_SPH_AXI_RST		0x02
+
+/* MPMU Clocks */
+#define APB2_26M_EN		(1 << 20)
+#define AP_26M			(1 << 4)
+
 /* Register Base Addresses */
 #define ARMD1_DRAM_BASE		0xB0000000
 #define ARMD1_FEC_BASE		0xC0800000
diff --git a/arch/arm/include/asm/arch-armada100/utmi-armada100.h b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
new file mode 100644
index 0000000..dd0ccdb
--- /dev/null
+++ b/arch/arm/include/asm/arch-armada100/utmi-armada100.h
@@ -0,0 +1,79 @@
+/*
+ * (C) Copyright 2012
+ * eInfochips Ltd. <www.einfochips.com>
+ * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
+ *
+ * (C) Copyright 2009
+ * Marvell Semiconductor <www.marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __UTMI_ARMADA100__
+#define __UTMI_ARMADA100__
+
+#define UTMI_PHY_BASE		0xD4206000
+
+/* utmi_ctrl - bits */
+#define INPKT_DELAY_SOF		(1 << 28)
+#define PLL_PWR_UP		2
+#define PHY_PWR_UP		1
+
+/* utmi_pll - bits */
+#define PLL_FBDIV_MASK		0x00000FF0
+#define PLL_FBDIV		4
+#define PLL_REFDIV_MASK		0x0000000F
+#define PLL_REFDIV		0
+#define PLL_READY		0x800000
+#define VCOCAL_START		(1 << 21)
+
+#define N_DIVIDER		0xEE
+#define M_DIVIDER		0x0B
+
+/* utmi_tx - bits */
+#define CK60_PHSEL		17
+#define PHSEL_VAL		0x4
+#define RCAL_START		(1 << 12)
+
+/*
+ * USB PHY registers
+ * Refer Datasheet Appendix A.21
+ */
+struct armd1usb_phy_reg {
+	u32 utmi_rev;	/* USB PHY Revision */
+	u32 utmi_ctrl;	/* USB PHY Control register */
+	u32 utmi_pll;	/* PLL register */
+	u32 utmi_tx;	/* Tx register */
+	u32 utmi_rx;	/* Rx register */
+	u32 utmi_ivref;	/* IVREF register */
+	u32 utmi_tst_g0;	/* Test group 0 register */
+	u32 utmi_tst_g1;	/* Test group 1 register */
+	u32 utmi_tst_g2;	/* Test group 2 register */
+	u32 utmi_tst_g3;	/* Test group 3 register */
+	u32 utmi_tst_g4;	/* Test group 4 register */
+	u32 utmi_tst_g5;	/* Test group 5 register */
+	u32 utmi_reserve;	/* Reserve Register */
+	u32 utmi_usb_int;	/* USB interuppt register */
+	u32 utmi_dbg_ctl;	/* Debug control register */
+	u32 utmi_otg_addon;	/* OTG addon register */
+};
+
+int utmi_init(void);
+
+#endif /* __UTMI_ARMADA100__ */
diff --git a/drivers/usb/host/utmi-armada100.c b/drivers/usb/host/utmi-armada100.c
new file mode 100644
index 0000000..124fa8f
--- /dev/null
+++ b/drivers/usb/host/utmi-armada100.c
@@ -0,0 +1,96 @@
+/*
+ * (C) Copyright 2012
+ * eInfochips Ltd. <www.einfochips.com>
+ * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
+ *
+ * (C) Copyright 2009
+ * Marvell Semiconductor <www.marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <usb.h>
+#include <asm/arch/cpu.h>
+#include <asm/arch/armada100.h>
+#include <asm/arch/utmi-armada100.h>
+
+static int utmi_phy_init(void)
+{
+	struct armd1usb_phy_reg *phy_regs =
+		(struct armd1usb_phy_reg *)UTMI_PHY_BASE;
+	int timeout;
+
+	setbits_le32(&phy_regs->utmi_ctrl, INPKT_DELAY_SOF | PLL_PWR_UP);
+	udelay(1000);
+	setbits_le32(&phy_regs->utmi_ctrl, PHY_PWR_UP);
+
+	clrbits_le32(&phy_regs->utmi_pll, PLL_FBDIV_MASK | PLL_REFDIV_MASK);
+	setbits_le32(&phy_regs->utmi_pll, N_DIVIDER << PLL_FBDIV | M_DIVIDER);
+
+	setbits_le32(&phy_regs->utmi_tx, PHSEL_VAL << CK60_PHSEL);
+
+	/* Calibrate pll */
+	timeout = 10000;
+	while (--timeout && ((readl(&phy_regs->utmi_pll) & PLL_READY) == 0))
+		;
+	if (!timeout)
+		return -1;
+
+	udelay(200);
+	setbits_le32(&phy_regs->utmi_pll, VCOCAL_START);
+	udelay(400);
+	clrbits_le32(&phy_regs->utmi_pll, VCOCAL_START);
+
+	udelay(200);
+	setbits_le32(&phy_regs->utmi_tx, RCAL_START);
+	udelay(400);
+	clrbits_le32(&phy_regs->utmi_tx, RCAL_START);
+
+	timeout = 10000;
+	while (--timeout && ((readl(&phy_regs->utmi_pll) & PLL_READY) == 0))
+		;
+	if (!timeout)
+		return -1;
+
+	return 0;
+}
+
+/*
+ * Initialize USB host controller's UTMI Physical interface
+ */
+int utmi_init(void)
+{
+	struct armd1mpmu_registers *mpmu_regs =
+		(struct armd1mpmu_registers *)ARMD1_MPMU_BASE;
+
+	struct armd1apmu_registers *apmu_regs =
+		(struct armd1apmu_registers *)ARMD1_APMU_BASE;
+
+	/* Turn on 26Mhz ref clock for UTMI PLL */
+	setbits_le32(&mpmu_regs->acgr, APB2_26M_EN | AP_26M);
+
+	/* USB Clock reset */
+	writel(USB_SPH_AXICLK_EN, &apmu_regs->usbcrc);
+	writel(USB_SPH_AXICLK_EN | USB_SPH_AXI_RST, &apmu_regs->usbcrc);
+
+	/* Initialize UTMI transceiver */
+	return utmi_phy_init();
+}
-- 
1.7.7.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
  2012-02-13 13:27 [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
@ 2012-02-13 13:27 ` Ajay Bhargav
  2012-03-02  7:27   ` Prafulla Wadaskar
  2012-02-13 13:27 ` [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support Ajay Bhargav
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Ajay Bhargav @ 2012-02-13 13:27 UTC (permalink / raw)
  To: u-boot

This patch adds support for USB EHCI driver for Armada100 SOCs.

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
---
Changes for v2:
	- Fix typo for SOC name
	- change printf to debug
Changes for v3:
	- Fix type in patch subject
	- header file include updated

 arch/arm/include/asm/arch-armada100/armada100.h |    1 +
 drivers/usb/host/Makefile                       |    1 +
 drivers/usb/host/ehci-armada100.c               |   64 +++++++++++++++++++++++
 3 files changed, 66 insertions(+), 0 deletions(-)
 create mode 100644 drivers/usb/host/ehci-armada100.c

diff --git a/arch/arm/include/asm/arch-armada100/armada100.h b/arch/arm/include/asm/arch-armada100/armada100.h
index 70fba27..614de55 100644
--- a/arch/arm/include/asm/arch-armada100/armada100.h
+++ b/arch/arm/include/asm/arch-armada100/armada100.h
@@ -68,6 +68,7 @@
 #define ARMD1_SSP5_BASE		0xD4021000
 #define ARMD1_UART3_BASE	0xD4026000
 #define ARMD1_MPMU_BASE		0xD4050000
+#define ARMD1_USB_HOST_BASE	0xD4209000
 #define ARMD1_APMU_BASE		0xD4282800
 #define ARMD1_CPU_BASE		0xD4282C00
 
diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
index 7c4df53..5fdc97b 100644
--- a/drivers/usb/host/Makefile
+++ b/drivers/usb/host/Makefile
@@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
 
 # echi
 COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
+COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-armada100.o
 ifdef CONFIG_MPC512X
 COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
 else
diff --git a/drivers/usb/host/ehci-armada100.c b/drivers/usb/host/ehci-armada100.c
new file mode 100644
index 0000000..f3d8aef
--- /dev/null
+++ b/drivers/usb/host/ehci-armada100.c
@@ -0,0 +1,64 @@
+/*
+ * (C) Copyright 2012
+ * eInfochips Ltd. <www.einfochips.com>
+ * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
+ *
+ * This driver is based on Kirkwood echi driver
+ * (C) Copyright 2009
+ * Marvell Semiconductor <www.marvell.com>
+ * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * 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., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include <common.h>
+#include <asm/io.h>
+#include <usb.h>
+#include "ehci.h"
+#include "ehci-core.h"
+#include <asm/arch/cpu.h>
+#include <asm/arch/armada100.h>
+#include <asm/arch/utmi-armada100.h>
+
+/*
+ * EHCI host controller init
+ */
+int ehci_hcd_init(void)
+{
+	if (utmi_init() < 0)
+		return -1;
+
+	hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
+	hcor = (struct ehci_hcor *)((uint32_t) hccr
+			+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+
+	debug("armada100-ehci: init hccr %x and hcor %x hc_length %d\n",
+		(uint32_t)hccr, (uint32_t)hcor,
+		(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
+
+	return 0;
+}
+
+/*
+ * EHCI host controller stop
+ */
+int ehci_hcd_stop(void)
+{
+	return 0;
+}
-- 
1.7.7.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support
  2012-02-13 13:27 [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
  2012-02-13 13:27 ` [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs Ajay Bhargav
@ 2012-02-13 13:27 ` Ajay Bhargav
  2012-03-02  7:28   ` Prafulla Wadaskar
  2012-02-20  9:28 ` [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
  2012-03-02  7:27 ` Prafulla Wadaskar
  3 siblings, 1 reply; 10+ messages in thread
From: Ajay Bhargav @ 2012-02-13 13:27 UTC (permalink / raw)
  To: u-boot

This patch adds support for USB commands and USB storage device for
Marvell gplugD

Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
---
Changes for v2:
	- removed unwanted ifdef
	- fat and ext2 command support moved to new patch
Changes for v3:
	- Not changed

 include/configs/gplugd.h |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
index 9813309..061ebe6 100644
--- a/include/configs/gplugd.h
+++ b/include/configs/gplugd.h
@@ -72,6 +72,7 @@
 #define CONFIG_CMD_I2C
 #define CONFIG_CMD_AUTOSCRIPT
 #undef CONFIG_CMD_FPGA
+#define CONFIG_CMD_USB
 
 /* Disable DCACHE */
 #define CONFIG_SYS_DCACHE_OFF
@@ -134,4 +135,15 @@
 #define CONFIG_CMD_EDITENV
 #define CONFIG_CMD_SAVEENV
 
+#ifdef CONFIG_CMD_USB
+#define CONFIG_USB_EHCI
+#define CONFIG_USB_EHCI_ARMADA100
+#define CONFIG_EHCI_IS_TDI
+#define CONFIG_USB_STORAGE
+#endif /* CONFIG_CMD_USB */
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_ISO_PARTITION
+#define CONFIG_SUPPORT_VFAT
+
 #endif	/* __CONFIG_GPLUGD_H */
-- 
1.7.7.2

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver
  2012-02-13 13:27 [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
  2012-02-13 13:27 ` [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs Ajay Bhargav
  2012-02-13 13:27 ` [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support Ajay Bhargav
@ 2012-02-20  9:28 ` Ajay Bhargav
  2012-03-02  7:27 ` Prafulla Wadaskar
  3 siblings, 0 replies; 10+ messages in thread
From: Ajay Bhargav @ 2012-02-20  9:28 UTC (permalink / raw)
  To: u-boot

On Monday 13 February 2012 06:57 PM, Ajay Bhargav wrote:
> This patch adds USB host controller's UTMI PHY interface driver for
> Armada100 SOCs.
>
> Signed-off-by: Ajay Bhargav<ajay.bhargav@einfochips.com>
> ---
> Changes for v2:
> 	- Fix: enable only required clock in MPMU
> Changes for v3:
> 	- Added timeout on while loops
> 	- moved utmi-armada100.h to arch include folder
>
>   arch/arm/include/asm/arch-armada100/armada100.h    |    8 ++
>   .../include/asm/arch-armada100/utmi-armada100.h    |   79 ++++++++++++++++
>   drivers/usb/host/utmi-armada100.c                  |   96 ++++++++++++++++++++
>   3 files changed, 183 insertions(+), 0 deletions(-)
>   create mode 100644 arch/arm/include/asm/arch-armada100/utmi-armada100.h
>   create mode 100644 drivers/usb/host/utmi-armada100.c
>
any comments on these patches?

Regards,
Ajay Bhargav

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver
  2012-02-13 13:27 [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
                   ` (2 preceding siblings ...)
  2012-02-20  9:28 ` [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
@ 2012-03-02  7:27 ` Prafulla Wadaskar
  3 siblings, 0 replies; 10+ messages in thread
From: Prafulla Wadaskar @ 2012-03-02  7:27 UTC (permalink / raw)
  To: u-boot



> -----Original Message-----
> From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> Sent: 13 February 2012 18:58
> To: linux at bohmer.net
> Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-boot at lists.denx.de;
> Ajay Bhargav
> Subject: [v3 1/3] USB: Armada100: Add UTMI PHY interface driver
> 
> This patch adds USB host controller's UTMI PHY interface driver for
> Armada100 SOCs.
> 
> Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> ---
> Changes for v2:
> 	- Fix: enable only required clock in MPMU
> Changes for v3:
> 	- Added timeout on while loops
> 	- moved utmi-armada100.h to arch include folder
> 
>  arch/arm/include/asm/arch-armada100/armada100.h    |    8 ++
>  .../include/asm/arch-armada100/utmi-armada100.h    |   79
> ++++++++++++++++
>  drivers/usb/host/utmi-armada100.c                  |   96
> ++++++++++++++++++++
>  3 files changed, 183 insertions(+), 0 deletions(-)
>  create mode 100644 arch/arm/include/asm/arch-armada100/utmi-
> armada100.h
>  create mode 100644 drivers/usb/host/utmi-armada100.c
> 

Applied to u-boot-marvell.git next branch

Regards..
Prafulla . . .

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
  2012-02-13 13:27 ` [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs Ajay Bhargav
@ 2012-03-02  7:27   ` Prafulla Wadaskar
  2012-03-02 10:36     ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Prafulla Wadaskar @ 2012-03-02  7:27 UTC (permalink / raw)
  To: u-boot



> -----Original Message-----
> From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> Sent: 13 February 2012 18:58
> To: linux at bohmer.net
> Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-boot at lists.denx.de;
> Ajay Bhargav
> Subject: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> 
> This patch adds support for USB EHCI driver for Armada100 SOCs.
> 
> Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> ---
> Changes for v2:
> 	- Fix typo for SOC name
> 	- change printf to debug
> Changes for v3:
> 	- Fix type in patch subject
> 	- header file include updated
> 
>  arch/arm/include/asm/arch-armada100/armada100.h |    1 +
>  drivers/usb/host/Makefile                       |    1 +
>  drivers/usb/host/ehci-armada100.c               |   64
> +++++++++++++++++++++++
>  3 files changed, 66 insertions(+), 0 deletions(-)
>  create mode 100644 drivers/usb/host/ehci-armada100.c
> 
> diff --git a/arch/arm/include/asm/arch-armada100/armada100.h
> b/arch/arm/include/asm/arch-armada100/armada100.h
> index 70fba27..614de55 100644
> --- a/arch/arm/include/asm/arch-armada100/armada100.h
> +++ b/arch/arm/include/asm/arch-armada100/armada100.h
> @@ -68,6 +68,7 @@
>  #define ARMD1_SSP5_BASE		0xD4021000
>  #define ARMD1_UART3_BASE	0xD4026000
>  #define ARMD1_MPMU_BASE		0xD4050000
> +#define ARMD1_USB_HOST_BASE	0xD4209000
>  #define ARMD1_APMU_BASE		0xD4282800
>  #define ARMD1_CPU_BASE		0xD4282C00
> 
> diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> index 7c4df53..5fdc97b 100644
> --- a/drivers/usb/host/Makefile
> +++ b/drivers/usb/host/Makefile
> @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
> 
>  # echi
>  COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
> +COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-
> armada100.o
>  ifdef CONFIG_MPC512X
>  COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
>  else
> diff --git a/drivers/usb/host/ehci-armada100.c
> b/drivers/usb/host/ehci-armada100.c
> new file mode 100644
> index 0000000..f3d8aef
> --- /dev/null
> +++ b/drivers/usb/host/ehci-armada100.c
> @@ -0,0 +1,64 @@
> +/*
> + * (C) Copyright 2012
> + * eInfochips Ltd. <www.einfochips.com>
> + * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> + *
> + * This driver is based on Kirkwood echi driver
> + * (C) Copyright 2009
> + * Marvell Semiconductor <www.marvell.com>
> + * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> + *
> + * See file CREDITS for list of people who contributed to this
> + * project.
> + *
> + * 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., 51 Franklin Street, Fifth Floor, Boston,
> + * MA 02110-1301 USA
> + */
> +
> +#include <common.h>
> +#include <asm/io.h>
> +#include <usb.h>
> +#include "ehci.h"
> +#include "ehci-core.h"
> +#include <asm/arch/cpu.h>
> +#include <asm/arch/armada100.h>
> +#include <asm/arch/utmi-armada100.h>
> +
> +/*
> + * EHCI host controller init
> + */
> +int ehci_hcd_init(void)
> +{
> +	if (utmi_init() < 0)
> +		return -1;
> +
> +	hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
> +	hcor = (struct ehci_hcor *)((uint32_t) hccr
> +			+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> +
> +	debug("armada100-ehci: init hccr %x and hcor %x hc_length %d\n",
> +		(uint32_t)hccr, (uint32_t)hcor,
> +		(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> +
> +	return 0;
> +}
> +
> +/*
> + * EHCI host controller stop
> + */
> +int ehci_hcd_stop(void)
> +{
> +	return 0;
> +}
> --
> 1.7.7.2


Applied to u-boot-marvell.git next branch

Regards..
Prafulla . . .

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support
  2012-02-13 13:27 ` [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support Ajay Bhargav
@ 2012-03-02  7:28   ` Prafulla Wadaskar
  0 siblings, 0 replies; 10+ messages in thread
From: Prafulla Wadaskar @ 2012-03-02  7:28 UTC (permalink / raw)
  To: u-boot



> -----Original Message-----
> From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> Sent: 13 February 2012 18:58
> To: linux at bohmer.net
> Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-boot at lists.denx.de;
> Ajay Bhargav
> Subject: [v3 3/3] Armada100: gplugD: Add USB command support
> 
> This patch adds support for USB commands and USB storage device for
> Marvell gplugD
> 
> Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> ---
> Changes for v2:
> 	- removed unwanted ifdef
> 	- fat and ext2 command support moved to new patch
> Changes for v3:
> 	- Not changed
> 
>  include/configs/gplugd.h |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h
> index 9813309..061ebe6 100644
> --- a/include/configs/gplugd.h
> +++ b/include/configs/gplugd.h
> @@ -72,6 +72,7 @@
>  #define CONFIG_CMD_I2C
>  #define CONFIG_CMD_AUTOSCRIPT
>  #undef CONFIG_CMD_FPGA
> +#define CONFIG_CMD_USB
> 
>  /* Disable DCACHE */
>  #define CONFIG_SYS_DCACHE_OFF
> @@ -134,4 +135,15 @@
>  #define CONFIG_CMD_EDITENV
>  #define CONFIG_CMD_SAVEENV
> 
> +#ifdef CONFIG_CMD_USB
> +#define CONFIG_USB_EHCI
> +#define CONFIG_USB_EHCI_ARMADA100
> +#define CONFIG_EHCI_IS_TDI
> +#define CONFIG_USB_STORAGE
> +#endif /* CONFIG_CMD_USB */
> +
> +#define CONFIG_DOS_PARTITION
> +#define CONFIG_ISO_PARTITION
> +#define CONFIG_SUPPORT_VFAT
> +
>  #endif	/* __CONFIG_GPLUGD_H */
> --
> 1.7.7.2


Applied to u-boot-marvell.git next branch

Regards..
Prafulla . . .

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
  2012-03-02  7:27   ` Prafulla Wadaskar
@ 2012-03-02 10:36     ` Marek Vasut
  2012-03-03  3:12       ` Prafulla Wadaskar
  0 siblings, 1 reply; 10+ messages in thread
From: Marek Vasut @ 2012-03-02 10:36 UTC (permalink / raw)
  To: u-boot

> > -----Original Message-----
> > From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> > Sent: 13 February 2012 18:58
> > To: linux at bohmer.net
> > Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-boot at lists.denx.de;
> > Ajay Bhargav
> > Subject: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> > 
> > This patch adds support for USB EHCI driver for Armada100 SOCs.
> > 
> > Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > ---
> > 
> > Changes for v2:
> > 	- Fix typo for SOC name
> > 	- change printf to debug
> > 
> > Changes for v3:
> > 	- Fix type in patch subject
> > 	- header file include updated
> > 	
> >  arch/arm/include/asm/arch-armada100/armada100.h |    1 +
> >  drivers/usb/host/Makefile                       |    1 +
> >  drivers/usb/host/ehci-armada100.c               |   64
> > 
> > +++++++++++++++++++++++
> > 
> >  3 files changed, 66 insertions(+), 0 deletions(-)
> >  create mode 100644 drivers/usb/host/ehci-armada100.c
> > 
> > diff --git a/arch/arm/include/asm/arch-armada100/armada100.h
> > b/arch/arm/include/asm/arch-armada100/armada100.h
> > index 70fba27..614de55 100644
> > --- a/arch/arm/include/asm/arch-armada100/armada100.h
> > +++ b/arch/arm/include/asm/arch-armada100/armada100.h
> > @@ -68,6 +68,7 @@
> > 
> >  #define ARMD1_SSP5_BASE		0xD4021000
> >  #define ARMD1_UART3_BASE	0xD4026000
> >  #define ARMD1_MPMU_BASE		0xD4050000
> > 
> > +#define ARMD1_USB_HOST_BASE	0xD4209000
> > 
> >  #define ARMD1_APMU_BASE		0xD4282800
> >  #define ARMD1_CPU_BASE		0xD4282C00
> > 
> > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> > index 7c4df53..5fdc97b 100644
> > --- a/drivers/usb/host/Makefile
> > +++ b/drivers/usb/host/Makefile
> > @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
> > 
> >  # echi
> >  COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
> > 
> > +COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-
> > armada100.o
> > 
> >  ifdef CONFIG_MPC512X
> >  COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
> >  else
> > 
> > diff --git a/drivers/usb/host/ehci-armada100.c
> > b/drivers/usb/host/ehci-armada100.c
> > new file mode 100644
> > index 0000000..f3d8aef
> > --- /dev/null
> > +++ b/drivers/usb/host/ehci-armada100.c
> > @@ -0,0 +1,64 @@
> > +/*
> > + * (C) Copyright 2012
> > + * eInfochips Ltd. <www.einfochips.com>
> > + * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > + *
> > + * This driver is based on Kirkwood echi driver
> > + * (C) Copyright 2009
> > + * Marvell Semiconductor <www.marvell.com>
> > + * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> > + *
> > + * See file CREDITS for list of people who contributed to this
> > + * project.
> > + *
> > + * 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., 51 Franklin Street, Fifth Floor, Boston,
> > + * MA 02110-1301 USA
> > + */
> > +
> > +#include <common.h>
> > +#include <asm/io.h>
> > +#include <usb.h>
> > +#include "ehci.h"
> > +#include "ehci-core.h"
> > +#include <asm/arch/cpu.h>
> > +#include <asm/arch/armada100.h>
> > +#include <asm/arch/utmi-armada100.h>
> > +
> > +/*
> > + * EHCI host controller init
> > + */
> > +int ehci_hcd_init(void)
> > +{
> > +	if (utmi_init() < 0)
> > +		return -1;
> > +
> > +	hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
> > +	hcor = (struct ehci_hcor *)((uint32_t) hccr
> > +			+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > +
> > +	debug("armada100-ehci: init hccr %x and hcor %x hc_length %d\n",
> > +		(uint32_t)hccr, (uint32_t)hcor,
> > +		(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > +
> > +	return 0;
> > +}
> > +
> > +/*
> > + * EHCI host controller stop
> > + */
> > +int ehci_hcd_stop(void)
> > +{
> > +	return 0;
> > +}
> > --
> > 1.7.7.2

Oh dang, I picked them into -usb too. Shall I drop them ?

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
  2012-03-02 10:36     ` Marek Vasut
@ 2012-03-03  3:12       ` Prafulla Wadaskar
  2012-03-03  6:46         ` Marek Vasut
  0 siblings, 1 reply; 10+ messages in thread
From: Prafulla Wadaskar @ 2012-03-03  3:12 UTC (permalink / raw)
  To: u-boot



> -----Original Message-----
> From: Marek Vasut [mailto:marex at denx.de]
> Sent: 02 March 2012 16:07
> To: Prafulla Wadaskar
> Cc: Ajay Bhargav; linux at bohmer.net; u-boot at lists.denx.de
> Subject: Re: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> 
> > > -----Original Message-----
> > > From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> > > Sent: 13 February 2012 18:58
> > > To: linux at bohmer.net
> > > Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-
> boot at lists.denx.de;
> > > Ajay Bhargav
> > > Subject: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> > >
> > > This patch adds support for USB EHCI driver for Armada100 SOCs.
> > >
> > > Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > > ---
> > >
> > > Changes for v2:
> > > 	- Fix typo for SOC name
> > > 	- change printf to debug
> > >
> > > Changes for v3:
> > > 	- Fix type in patch subject
> > > 	- header file include updated
> > >
> > >  arch/arm/include/asm/arch-armada100/armada100.h |    1 +
> > >  drivers/usb/host/Makefile                       |    1 +
> > >  drivers/usb/host/ehci-armada100.c               |   64
> > >
> > > +++++++++++++++++++++++
> > >
> > >  3 files changed, 66 insertions(+), 0 deletions(-)
> > >  create mode 100644 drivers/usb/host/ehci-armada100.c
> > >
> > > diff --git a/arch/arm/include/asm/arch-armada100/armada100.h
> > > b/arch/arm/include/asm/arch-armada100/armada100.h
> > > index 70fba27..614de55 100644
> > > --- a/arch/arm/include/asm/arch-armada100/armada100.h
> > > +++ b/arch/arm/include/asm/arch-armada100/armada100.h
> > > @@ -68,6 +68,7 @@
> > >
> > >  #define ARMD1_SSP5_BASE		0xD4021000
> > >  #define ARMD1_UART3_BASE	0xD4026000
> > >  #define ARMD1_MPMU_BASE		0xD4050000
> > >
> > > +#define ARMD1_USB_HOST_BASE	0xD4209000
> > >
> > >  #define ARMD1_APMU_BASE		0xD4282800
> > >  #define ARMD1_CPU_BASE		0xD4282C00
> > >
> > > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> > > index 7c4df53..5fdc97b 100644
> > > --- a/drivers/usb/host/Makefile
> > > +++ b/drivers/usb/host/Makefile
> > > @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
> > >
> > >  # echi
> > >  COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
> > >
> > > +COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-
> > > armada100.o
> > >
> > >  ifdef CONFIG_MPC512X
> > >  COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
> > >  else
> > >
> > > diff --git a/drivers/usb/host/ehci-armada100.c
> > > b/drivers/usb/host/ehci-armada100.c
> > > new file mode 100644
> > > index 0000000..f3d8aef
> > > --- /dev/null
> > > +++ b/drivers/usb/host/ehci-armada100.c
> > > @@ -0,0 +1,64 @@
> > > +/*
> > > + * (C) Copyright 2012
> > > + * eInfochips Ltd. <www.einfochips.com>
> > > + * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > > + *
> > > + * This driver is based on Kirkwood echi driver
> > > + * (C) Copyright 2009
> > > + * Marvell Semiconductor <www.marvell.com>
> > > + * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> > > + *
> > > + * See file CREDITS for list of people who contributed to this
> > > + * project.
> > > + *
> > > + * 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., 51 Franklin Street, Fifth Floor, Boston,
> > > + * MA 02110-1301 USA
> > > + */
> > > +
> > > +#include <common.h>
> > > +#include <asm/io.h>
> > > +#include <usb.h>
> > > +#include "ehci.h"
> > > +#include "ehci-core.h"
> > > +#include <asm/arch/cpu.h>
> > > +#include <asm/arch/armada100.h>
> > > +#include <asm/arch/utmi-armada100.h>
> > > +
> > > +/*
> > > + * EHCI host controller init
> > > + */
> > > +int ehci_hcd_init(void)
> > > +{
> > > +	if (utmi_init() < 0)
> > > +		return -1;
> > > +
> > > +	hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
> > > +	hcor = (struct ehci_hcor *)((uint32_t) hccr
> > > +			+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > > +
> > > +	debug("armada100-ehci: init hccr %x and hcor %x hc_length
> %d\n",
> > > +		(uint32_t)hccr, (uint32_t)hcor,
> > > +		(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > > +
> > > +	return 0;
> > > +}
> > > +
> > > +/*
> > > + * EHCI host controller stop
> > > + */
> > > +int ehci_hcd_stop(void)
> > > +{
> > > +	return 0;
> > > +}
> > > --
> > > 1.7.7.2
> 
> Oh dang, I picked them into -usb too. Shall I drop them ?

Ideally USB-custodian should pick them up :-). I am sorry but I did it with pre-discussion with Wolfgang.

May be Wolfgang can suggest something on this.

Regards..
Prafulla . . .

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
  2012-03-03  3:12       ` Prafulla Wadaskar
@ 2012-03-03  6:46         ` Marek Vasut
  0 siblings, 0 replies; 10+ messages in thread
From: Marek Vasut @ 2012-03-03  6:46 UTC (permalink / raw)
  To: u-boot

> > -----Original Message-----
> > From: Marek Vasut [mailto:marex at denx.de]
> > Sent: 02 March 2012 16:07
> > To: Prafulla Wadaskar
> > Cc: Ajay Bhargav; linux at bohmer.net; u-boot at lists.denx.de
> > Subject: Re: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> > 
> > > > -----Original Message-----
> > > > From: Ajay Bhargav [mailto:ajay.bhargav at einfochips.com]
> > > > Sent: 13 February 2012 18:58
> > > > To: linux at bohmer.net
> > > > Cc: Prafulla Wadaskar; marek.vasut at gmail.com; u-
> > 
> > boot at lists.denx.de;
> > 
> > > > Ajay Bhargav
> > > > Subject: [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs
> > > > 
> > > > This patch adds support for USB EHCI driver for Armada100 SOCs.
> > > > 
> > > > Signed-off-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > > > ---
> > > > 
> > > > Changes for v2:
> > > > 	- Fix typo for SOC name
> > > > 	- change printf to debug
> > > > 
> > > > Changes for v3:
> > > > 	- Fix type in patch subject
> > > > 	- header file include updated
> > > > 	
> > > >  arch/arm/include/asm/arch-armada100/armada100.h |    1 +
> > > >  drivers/usb/host/Makefile                       |    1 +
> > > >  drivers/usb/host/ehci-armada100.c               |   64
> > > > 
> > > > +++++++++++++++++++++++
> > > > 
> > > >  3 files changed, 66 insertions(+), 0 deletions(-)
> > > >  create mode 100644 drivers/usb/host/ehci-armada100.c
> > > > 
> > > > diff --git a/arch/arm/include/asm/arch-armada100/armada100.h
> > > > b/arch/arm/include/asm/arch-armada100/armada100.h
> > > > index 70fba27..614de55 100644
> > > > --- a/arch/arm/include/asm/arch-armada100/armada100.h
> > > > +++ b/arch/arm/include/asm/arch-armada100/armada100.h
> > > > @@ -68,6 +68,7 @@
> > > > 
> > > >  #define ARMD1_SSP5_BASE		0xD4021000
> > > >  #define ARMD1_UART3_BASE	0xD4026000
> > > >  #define ARMD1_MPMU_BASE		0xD4050000
> > > > 
> > > > +#define ARMD1_USB_HOST_BASE	0xD4209000
> > > > 
> > > >  #define ARMD1_APMU_BASE		0xD4282800
> > > >  #define ARMD1_CPU_BASE		0xD4282C00
> > > > 
> > > > diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile
> > > > index 7c4df53..5fdc97b 100644
> > > > --- a/drivers/usb/host/Makefile
> > > > +++ b/drivers/usb/host/Makefile
> > > > @@ -35,6 +35,7 @@ COBJS-$(CONFIG_USB_SL811HS) += sl811-hcd.o
> > > > 
> > > >  # echi
> > > >  COBJS-$(CONFIG_USB_EHCI) += ehci-hcd.o
> > > > 
> > > > +COBJS-$(CONFIG_USB_EHCI_ARMADA100) += ehci-armada100.o utmi-
> > > > armada100.o
> > > > 
> > > >  ifdef CONFIG_MPC512X
> > > >  COBJS-$(CONFIG_USB_EHCI_FSL) += ehci-mpc512x.o
> > > >  else
> > > > 
> > > > diff --git a/drivers/usb/host/ehci-armada100.c
> > > > b/drivers/usb/host/ehci-armada100.c
> > > > new file mode 100644
> > > > index 0000000..f3d8aef
> > > > --- /dev/null
> > > > +++ b/drivers/usb/host/ehci-armada100.c
> > > > @@ -0,0 +1,64 @@
> > > > +/*
> > > > + * (C) Copyright 2012
> > > > + * eInfochips Ltd. <www.einfochips.com>
> > > > + * Written-by: Ajay Bhargav <ajay.bhargav@einfochips.com>
> > > > + *
> > > > + * This driver is based on Kirkwood echi driver
> > > > + * (C) Copyright 2009
> > > > + * Marvell Semiconductor <www.marvell.com>
> > > > + * Written-by: Prafulla Wadaskar <prafulla@marvell.com>
> > > > + *
> > > > + * See file CREDITS for list of people who contributed to this
> > > > + * project.
> > > > + *
> > > > + * 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., 51 Franklin Street, Fifth Floor, Boston,
> > > > + * MA 02110-1301 USA
> > > > + */
> > > > +
> > > > +#include <common.h>
> > > > +#include <asm/io.h>
> > > > +#include <usb.h>
> > > > +#include "ehci.h"
> > > > +#include "ehci-core.h"
> > > > +#include <asm/arch/cpu.h>
> > > > +#include <asm/arch/armada100.h>
> > > > +#include <asm/arch/utmi-armada100.h>
> > > > +
> > > > +/*
> > > > + * EHCI host controller init
> > > > + */
> > > > +int ehci_hcd_init(void)
> > > > +{
> > > > +	if (utmi_init() < 0)
> > > > +		return -1;
> > > > +
> > > > +	hccr = (struct ehci_hccr *)(ARMD1_USB_HOST_BASE + 0x100);
> > > > +	hcor = (struct ehci_hcor *)((uint32_t) hccr
> > > > +			+ HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > > > +
> > > > +	debug("armada100-ehci: init hccr %x and hcor %x hc_length
> > 
> > %d\n",
> > 
> > > > +		(uint32_t)hccr, (uint32_t)hcor,
> > > > +		(uint32_t)HC_LENGTH(ehci_readl(&hccr->cr_capbase)));
> > > > +
> > > > +	return 0;
> > > > +}
> > > > +
> > > > +/*
> > > > + * EHCI host controller stop
> > > > + */
> > > > +int ehci_hcd_stop(void)
> > > > +{
> > > > +	return 0;
> > > > +}
> > > > --
> > > > 1.7.7.2
> > 
> > Oh dang, I picked them into -usb too. Shall I drop them ?
> 
> Ideally USB-custodian should pick them up :-). I am sorry but I did it with
> pre-discussion with Wolfgang.
> 
> May be Wolfgang can suggest something on this.


Hey, you pick it this time, I already dropped them from my tree :)

Cheers!
M

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2012-03-03  6:46 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-02-13 13:27 [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
2012-02-13 13:27 ` [U-Boot] [v3 2/3] USB: Armada100: EHCI Driver for Armada100 SOCs Ajay Bhargav
2012-03-02  7:27   ` Prafulla Wadaskar
2012-03-02 10:36     ` Marek Vasut
2012-03-03  3:12       ` Prafulla Wadaskar
2012-03-03  6:46         ` Marek Vasut
2012-02-13 13:27 ` [U-Boot] [v3 3/3] Armada100: gplugD: Add USB command support Ajay Bhargav
2012-03-02  7:28   ` Prafulla Wadaskar
2012-02-20  9:28 ` [U-Boot] [v3 1/3] USB: Armada100: Add UTMI PHY interface driver Ajay Bhargav
2012-03-02  7:27 ` Prafulla Wadaskar

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.