| Message ID | 1435582696-30068-9-git-send-email-sr@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Stefan Roese |
| Headers | show |
On Monday, June 29, 2015 at 02:58:15 PM, Stefan Roese wrote: > This patch adds USB EHCI host support for the common mvebu platform. > Including the Armada 38x. > > Tested on DB-88F6280-GP eval board. > > Signed-off-by: Stefan Roese <sr@denx.de> > Cc: Marek Vasut <marex@denx.de> > Cc: Luka Perkov <luka.perkov@sartura.hr> Reviewed-by: Marek Vasut <marex@denx.de> [...] > +static void usb_brg_adrdec_setup(void) > +{ > + const struct mbus_dram_target_info *dram; > + int i; > + > + dram = mvebu_mbus_dram_info(); > + > + for (i = 0; i < 4; i++) { > + wrl(USB_WINDOW_CTRL(i), 0); > + wrl(USB_WINDOW_BASE(i), 0); > + } These wrl() accessors are a bit weird, but maybe there's some marvell magic behind this? Best regards, Marek Vasut
Hi Marek, On 29.06.2015 17:22, Marek Vasut wrote: > On Monday, June 29, 2015 at 02:58:15 PM, Stefan Roese wrote: >> This patch adds USB EHCI host support for the common mvebu platform. >> Including the Armada 38x. >> >> Tested on DB-88F6280-GP eval board. >> >> Signed-off-by: Stefan Roese <sr@denx.de> >> Cc: Marek Vasut <marex@denx.de> >> Cc: Luka Perkov <luka.perkov@sartura.hr> > > Reviewed-by: Marek Vasut <marex@denx.de> Thanks. > [...] > >> +static void usb_brg_adrdec_setup(void) >> +{ >> + const struct mbus_dram_target_info *dram; >> + int i; >> + >> + dram = mvebu_mbus_dram_info(); >> + >> + for (i = 0; i < 4; i++) { >> + wrl(USB_WINDOW_CTRL(i), 0); >> + wrl(USB_WINDOW_BASE(i), 0); >> + } > > These wrl() accessors are a bit weird, but maybe there's some > marvell magic behind this? Not really. They are just adding the controller base address. Its used in the current driver code - so I just used it here as well. I'll send a patch to remove these macros (move to readl/writel) once all this is in mainline. Thanks, Stefan
On Thursday, July 02, 2015 at 01:03:33 PM, Stefan Roese wrote: > Hi Marek, > > On 29.06.2015 17:22, Marek Vasut wrote: > > On Monday, June 29, 2015 at 02:58:15 PM, Stefan Roese wrote: > >> This patch adds USB EHCI host support for the common mvebu platform. > >> Including the Armada 38x. > >> > >> Tested on DB-88F6280-GP eval board. > >> > >> Signed-off-by: Stefan Roese <sr@denx.de> > >> Cc: Marek Vasut <marex@denx.de> > >> Cc: Luka Perkov <luka.perkov@sartura.hr> > > > > Reviewed-by: Marek Vasut <marex@denx.de> > > Thanks. > > > [...] > > > >> +static void usb_brg_adrdec_setup(void) > >> +{ > >> + const struct mbus_dram_target_info *dram; > >> + int i; > >> + > >> + dram = mvebu_mbus_dram_info(); > >> + > >> + for (i = 0; i < 4; i++) { > >> + wrl(USB_WINDOW_CTRL(i), 0); > >> + wrl(USB_WINDOW_BASE(i), 0); > >> + } > > > > These wrl() accessors are a bit weird, but maybe there's some > > marvell magic behind this? > > Not really. They are just adding the controller base address. Its used > in the current driver code - so I just used it here as well. > > I'll send a patch to remove these macros (move to readl/writel) once all > this is in mainline. I guess that makes sense eventually, yeah. Thanks :) Best regards, Marek Vasut
diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index e6bfbc2..1aaea67 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -49,6 +49,7 @@ #define MVEBU_EGIGA2_BASE (MVEBU_REGISTER(0x30000)) #define MVEBU_EGIGA3_BASE (MVEBU_REGISTER(0x34000)) #define MVEBU_REG_PCIE_BASE (MVEBU_REGISTER(0x40000)) +#define MVEBU_USB20_BASE (MVEBU_REGISTER(0x58000)) #define MVEBU_EGIGA0_BASE (MVEBU_REGISTER(0x70000)) #define MVEBU_EGIGA1_BASE (MVEBU_REGISTER(0x74000)) #define MVEBU_SATA0_BASE (MVEBU_REGISTER(0xa8000)) diff --git a/drivers/usb/host/ehci-marvell.c b/drivers/usb/host/ehci-marvell.c index 1a5fd6e..03c489c 100644 --- a/drivers/usb/host/ehci-marvell.c +++ b/drivers/usb/host/ehci-marvell.c @@ -10,6 +10,7 @@ #include <asm/io.h> #include <usb.h> #include "ehci.h" +#include <linux/mbus.h> #include <asm/arch/cpu.h> #if defined(CONFIG_KIRKWOOD) @@ -30,6 +31,40 @@ DECLARE_GLOBAL_DATA_PTR; /* * USB 2.0 Bridge Address Decoding registers setup */ +#ifdef CONFIG_ARMADA_XP + +#define MVUSB0_BASE MVEBU_USB20_BASE + +/* + * Once all the older Marvell SoC's (Orion, Kirkwood) are converted + * to the common mvebu archticture including the mbus setup, this + * will be the only function needed to configure the access windows + */ +static void usb_brg_adrdec_setup(void) +{ + const struct mbus_dram_target_info *dram; + int i; + + dram = mvebu_mbus_dram_info(); + + for (i = 0; i < 4; i++) { + wrl(USB_WINDOW_CTRL(i), 0); + wrl(USB_WINDOW_BASE(i), 0); + } + + for (i = 0; i < dram->num_cs; i++) { + const struct mbus_dram_window *cs = dram->cs + i; + + /* Write size, attributes and target id to control register */ + wrl(USB_WINDOW_CTRL(i), + ((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | + (dram->mbus_dram_target_id << 4) | 1); + + /* Write base address to base register */ + wrl(USB_WINDOW_BASE(i), cs->base); + } +} +#else static void usb_brg_adrdec_setup(void) { int i; @@ -69,6 +104,7 @@ static void usb_brg_adrdec_setup(void) wrl(USB_WINDOW_BASE(i), base); } } +#endif /* * Create the appropriate control structures to manage
This patch adds USB EHCI host support for the common mvebu platform. Including the Armada 38x. Tested on DB-88F6280-GP eval board. Signed-off-by: Stefan Roese <sr@denx.de> Cc: Marek Vasut <marex@denx.de> Cc: Luka Perkov <luka.perkov@sartura.hr> --- arch/arm/mach-mvebu/include/mach/soc.h | 1 + drivers/usb/host/ehci-marvell.c | 36 ++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)