From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Tue, 19 May 2015 12:43:43 +0200 Subject: [U-Boot] [PATCH] usb: ohci: enable cache support In-Reply-To: <1432032265-10889-1-git-send-email-josh.wu@atmel.com> References: <1432032265-10889-1-git-send-email-josh.wu@atmel.com> Message-ID: <555B13DF.2040701@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 19-05-15 12:44, Josh Wu wrote: > Remove the CONFIG_DM_USB limitation to enable cache support functions. > Tested on SAMA5D3x-EK board. > > Signed-off-by: Josh Wu Looks good to me: Acked-by: Hans de Goede Regards, Hans > --- > > drivers/usb/host/ohci-hcd.c | 10 +--------- > drivers/usb/host/ohci.h | 2 +- > 2 files changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c > index 494b760..8920b0f 100644 > --- a/drivers/usb/host/ohci-hcd.c > +++ b/drivers/usb/host/ohci-hcd.c > @@ -103,21 +103,13 @@ static struct pci_device_id ehci_pci_ids[] = { > # define m32_swap(x) cpu_to_le32(x) > #endif /* CONFIG_SYS_OHCI_BE_CONTROLLER */ > > -#ifdef CONFIG_DM_USB > -/* > - * We really should do proper cache flushing everywhere, but for now we only > - * do it for new (driver-model) usb code to avoid regressions. > - */ > +/* We really should do proper cache flushing everywhere */ > #define flush_dcache_buffer(addr, size) \ > flush_dcache_range((unsigned long)(addr), \ > ALIGN((unsigned long)(addr) + size, ARCH_DMA_MINALIGN)) > #define invalidate_dcache_buffer(addr, size) \ > invalidate_dcache_range((unsigned long)(addr), \ > ALIGN((unsigned long)(addr) + size, ARCH_DMA_MINALIGN)) > -#else > -#define flush_dcache_buffer(addr, size) > -#define invalidate_dcache_buffer(addr, size) > -#endif > > /* Do not use sizeof(ed / td) as our ed / td structs contain extra members */ > #define flush_dcache_ed(addr) flush_dcache_buffer(addr, 16) > diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h > index f52b4c1..47bd85b 100644 > --- a/drivers/usb/host/ohci.h > +++ b/drivers/usb/host/ohci.h > @@ -18,7 +18,7 @@ > # define ohci_writel(a, b) (*((volatile u32 *)(b)) = ((volatile u32)a)) > #endif /* CONFIG_SYS_OHCI_SWAP_REG_ACCESS */ > > -#if defined CONFIG_DM_USB && ARCH_DMA_MINALIGN > 16 > +#if ARCH_DMA_MINALIGN > 16 > #define ED_ALIGNMENT ARCH_DMA_MINALIGN > #else > #define ED_ALIGNMENT 16 >