* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
@ 2015-06-15 12:42 Heiko Schocher
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
` (3 more replies)
0 siblings, 4 replies; 15+ messages in thread
From: Heiko Schocher @ 2015-06-15 12:42 UTC (permalink / raw)
To: u-boot
add dfu supprt for at91 sam9260 based boards. The USB
gadget driver is ported from linux:
b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process context
it drops a lot of checkpatch warnings/errors:
checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
but for further updates I did not fix them.
The errors are all from this sort:
error: drivers/usb/gadget/at91_udc.c,87: space prohibited before open square bracket '['
a lot of "line over 80 characters" warnings ...
Heiko Schocher (3):
ARM: at91: add cpu.h
usb: gadget: at91_udc: add support for at91_udc
at91, taurus, smartweb: add dfu support
arch/arm/mach-at91/include/mach/cpu.h | 149 +++
board/siemens/smartweb/smartweb.c | 29 +
board/siemens/taurus/taurus.c | 27 +
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/at91_udc.c | 2203 +++++++++++++++++++++++++++++++++
drivers/usb/gadget/at91_udc.h | 171 +++
include/configs/smartweb.h | 34 +-
include/configs/taurus.h | 28 +-
include/linux/usb/at91_udc.h | 20 +
9 files changed, 2657 insertions(+), 5 deletions(-)
create mode 100644 arch/arm/mach-at91/include/mach/cpu.h
create mode 100644 drivers/usb/gadget/at91_udc.c
create mode 100644 drivers/usb/gadget/at91_udc.h
create mode 100644 include/linux/usb/at91_udc.h
--
2.1.0
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h
2015-06-15 12:42 [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Heiko Schocher
@ 2015-06-15 12:42 ` Heiko Schocher
2015-07-21 1:59 ` Marek Vasut
2015-07-22 14:40 ` Alexandre Belloni
2015-06-15 12:43 ` [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc Heiko Schocher
` (2 subsequent siblings)
3 siblings, 2 replies; 15+ messages in thread
From: Heiko Schocher @ 2015-06-15 12:42 UTC (permalink / raw)
To: u-boot
add cpu.h from linux:
7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
so it is easier to port linux code, which is based on it.
Signed-off-by: Heiko Schocher <hs@denx.de>
---
arch/arm/mach-at91/include/mach/cpu.h | 149 ++++++++++++++++++++++++++++++++++
1 file changed, 149 insertions(+)
create mode 100644 arch/arm/mach-at91/include/mach/cpu.h
diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h
new file mode 100644
index 0000000..a5e698d
--- /dev/null
+++ b/arch/arm/mach-at91/include/mach/cpu.h
@@ -0,0 +1,149 @@
+/*
+ * from linux:
+ * 7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
+ *
+ * arch/arm/mach-at91/include/mach/cpu.h
+ *
+ * Copyright (C) 2006 SAN People
+ * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ *
+ */
+
+#ifndef __AT91_MACH_CPU_H__
+#define __AT91_MACH_CPU_H__
+
+#ifdef CONFIG_AT91RM9200
+#define cpu_is_at91rm9200() (1)
+#else
+#define cpu_is_at91rm9200() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9260
+#define cpu_is_at91sam9260() (1)
+#else
+#define cpu_is_at91sam9260() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G20
+#define cpu_is_at91sam9g20() (1)
+#else
+#define cpu_is_at91sam9g20() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9XE
+#define cpu_is_at91sam9xe() (1)
+#else
+#define cpu_is_at91sam9xe() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9261
+#define cpu_is_at91sam9261() (1)
+#else
+#define cpu_is_at91sam9261() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G10
+#define cpu_is_at91sam9g10() (1)
+#else
+#define cpu_is_at91sam9g10() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9263
+#define cpu_is_at91sam9263() (1)
+#else
+#define cpu_is_at91sam9263() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9RL
+#define cpu_is_at91sam9rl() (1)
+#else
+#define cpu_is_at91sam9rl() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G45
+#define cpu_is_at91sam9g45() (1)
+#else
+#define cpu_is_at91sam9g45() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G45ES
+#define cpu_is_at91sam9g45es() (1)
+#else
+#define cpu_is_at91sam9g45es() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9M10
+#define cpu_is_at91sam9m10() (1)
+#else
+#define cpu_is_at91sam9m10() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G46
+#define cpu_is_at91sam9g46() (1)
+#else
+#define cpu_is_at91sam9g46() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9M11
+#define cpu_is_at91sam9m11() (1)
+#else
+#define cpu_is_at91sam9m11() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9X5
+#define cpu_is_at91sam9x5() (1)
+#else
+#define cpu_is_at91sam9x5() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G15
+#define cpu_is_at91sam9g15() (1)
+#else
+#define cpu_is_at91sam9g15() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G35
+#define cpu_is_at91sam9g35() (1)
+#else
+#define cpu_is_at91sam9g35() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9X35
+#define cpu_is_at91sam9x35() (1)
+#else
+#define cpu_is_at91sam9x35() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9G25
+#define cpu_is_at91sam9g25() (1)
+#else
+#define cpu_is_at91sam9g25() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9X25
+#define cpu_is_at91sam9x25() (1)
+#else
+#define cpu_is_at91sam9x25() (0)
+#endif
+
+#ifdef CONFIG_AT91SAM9N12
+#define cpu_is_at91sam9n12() (1)
+#else
+#define cpu_is_at91sam9n12() (0)
+#endif
+
+#ifdef CONFIG_SAMA5D3
+#define cpu_is_sama5d3() (1)
+#else
+#define cpu_is_sama5d3() (0)
+#endif
+
+#ifdef CONFIG_SAMA5D4
+#define cpu_is_sama5d4() (1)
+#else
+#define cpu_is_sama5d4() (0)
+#endif
+
+#endif
--
2.1.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc
2015-06-15 12:42 [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Heiko Schocher
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
@ 2015-06-15 12:43 ` Heiko Schocher
2015-07-21 6:59 ` Lukasz Majewski
2015-06-15 12:43 ` [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support Heiko Schocher
2015-07-20 14:03 ` [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Lukasz Majewski
3 siblings, 1 reply; 15+ messages in thread
From: Heiko Schocher @ 2015-06-15 12:43 UTC (permalink / raw)
To: u-boot
ported from linux:
b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process context
Signed-off-by: Heiko Schocher <hs@denx.de>
---
checkpatch detects a lot of errors, but as this code is copied
from linux, I tend to not fix them, so later updates with
linux code is easier.
drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/at91_udc.c | 2203 +++++++++++++++++++++++++++++++++++++++++
drivers/usb/gadget/at91_udc.h | 171 ++++
include/linux/usb/at91_udc.h | 20 +
4 files changed, 2395 insertions(+)
create mode 100644 drivers/usb/gadget/at91_udc.c
create mode 100644 drivers/usb/gadget/at91_udc.h
create mode 100644 include/linux/usb/at91_udc.h
diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
index 70bb550..22323fa 100644
--- a/drivers/usb/gadget/Makefile
+++ b/drivers/usb/gadget/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o usbstring.o
# new USB gadget layer dependencies
ifdef CONFIG_USB_GADGET
+obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o
obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o
obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o
diff --git a/drivers/usb/gadget/at91_udc.c b/drivers/usb/gadget/at91_udc.c
new file mode 100644
index 0000000..f4ae13b
--- /dev/null
+++ b/drivers/usb/gadget/at91_udc.c
@@ -0,0 +1,2203 @@
+/*
+ * from linux:
+ * b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process context
+ *
+ * at91_udc -- driver for at91-series USB peripheral controller
+ *
+ * Copyright (C) 2004 by Thomas Rathbone
+ * Copyright (C) 2005 by HP Labs
+ * Copyright (C) 2005 by David Brownell
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#undef VERBOSE_DEBUG
+#undef PACKET_TRACE
+
+#ifndef __UBOOT__
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/delay.h>
+#include <linux/ioport.h>
+#include <linux/slab.h>
+#include <linux/errno.h>
+#include <linux/list.h>
+#include <linux/interrupt.h>
+#include <linux/proc_fs.h>
+#include <linux/prefetch.h>
+#include <linux/clk.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/of.h>
+#include <linux/of_gpio.h>
+#include <linux/platform_data/atmel.h>
+
+#include <asm/byteorder.h>
+#include <mach/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/gpio.h>
+
+#include <mach/cpu.h>
+#include <mach/at91sam9261_matrix.h>
+#include <mach/at91_matrix.h>
+#else
+#include <common.h>
+#include <asm/errno.h>
+#include <asm/io.h>
+#include <asm/gpio.h>
+#include <mach/cpu.h>
+#include <asm/hardware.h>
+#if defined(CONFIG_AT91SAM9261)
+#include <asm/arch/at91sam9260_matrix.h>
+#endif
+/* #include <linux/compat.h> */
+#include <linux/list.h>
+#include <linux/usb/ch9.h>
+#include <linux/usb/gadget.h>
+#include <linux/usb/at91_udc.h>
+#include <malloc.h>
+#include <usb/lin_gadget_compat.h>
+#endif
+
+#include "at91_udc.h"
+
+
+/*
+ * This controller is simple and PIO-only. It's used in many AT91-series
+ * full speed USB controllers, including the at91rm9200 (arm920T, with MMU),
+ * at91sam926x (arm926ejs, with MMU), and several no-mmu versions.
+ *
+ * This driver expects the board has been wired with two GPIOs supporting
+ * a VBUS sensing IRQ, and a D+ pullup. (They may be omitted, but the
+ * testing hasn't covered such cases.)
+ *
+ * The pullup is most important (so it's integrated on sam926x parts). It
+ * provides software control over whether the host enumerates the device.
+ *
+ * The VBUS sensing helps during enumeration, and allows both USB clocks
+ * (and the transceiver) to stay gated off until they're necessary, saving
+ * power. During USB suspend, the 48 MHz clock is gated off in hardware;
+ * it may also be gated off by software during some Linux sleep states.
+ */
+
+#define DRIVER_VERSION "3 May 2006"
+
+static const char driver_name [] = "at91_udc";
+static const char ep0name[] = "ep0";
+
+#define VBUS_POLL_TIMEOUT msecs_to_jiffies(1000)
+
+#define at91_udp_read(udc, reg) \
+ __raw_readl((udc)->udp_baseaddr + (reg))
+#define at91_udp_write(udc, reg, val) \
+ __raw_writel((val), (udc)->udp_baseaddr + (reg))
+
+/*-------------------------------------------------------------------------*/
+
+#ifdef CONFIG_USB_GADGET_DEBUG_FILES
+
+#include <linux/seq_file.h>
+
+static const char debug_filename[] = "driver/udc";
+
+#define FOURBITS "%s%s%s%s"
+#define EIGHTBITS FOURBITS FOURBITS
+
+static void proc_ep_show(struct seq_file *s, struct at91_ep *ep)
+{
+ static char *types[] = {
+ "control", "out-iso", "out-bulk", "out-int",
+ "BOGUS", "in-iso", "in-bulk", "in-int"};
+
+ u32 csr;
+ struct at91_request *req;
+ unsigned long flags;
+ struct at91_udc *udc = ep->udc;
+
+ spin_lock_irqsave(&udc->lock, flags);
+
+ csr = __raw_readl(ep->creg);
+
+ /* NOTE: not collecting per-endpoint irq statistics... */
+
+ seq_printf(s, "\n");
+ seq_printf(s, "%s, maxpacket %d %s%s %s%s\n",
+ ep->ep.name, ep->ep.maxpacket,
+ ep->is_in ? "in" : "out",
+ ep->is_iso ? " iso" : "",
+ ep->is_pingpong
+ ? (ep->fifo_bank ? "pong" : "ping")
+ : "",
+ ep->stopped ? " stopped" : "");
+ seq_printf(s, "csr %08x rxbytes=%d %s %s %s" EIGHTBITS "\n",
+ csr,
+ (csr & 0x07ff0000) >> 16,
+ (csr & (1 << 15)) ? "enabled" : "disabled",
+ (csr & (1 << 11)) ? "DATA1" : "DATA0",
+ types[(csr & 0x700) >> 8],
+
+ /* iff type is control then print current direction */
+ (!(csr & 0x700))
+ ? ((csr & (1 << 7)) ? " IN" : " OUT")
+ : "",
+ (csr & (1 << 6)) ? " rxdatabk1" : "",
+ (csr & (1 << 5)) ? " forcestall" : "",
+ (csr & (1 << 4)) ? " txpktrdy" : "",
+
+ (csr & (1 << 3)) ? " stallsent" : "",
+ (csr & (1 << 2)) ? " rxsetup" : "",
+ (csr & (1 << 1)) ? " rxdatabk0" : "",
+ (csr & (1 << 0)) ? " txcomp" : "");
+ if (list_empty (&ep->queue))
+ seq_printf(s, "\t(queue empty)\n");
+
+ else list_for_each_entry (req, &ep->queue, queue) {
+ unsigned length = req->req.actual;
+
+ seq_printf(s, "\treq %p len %d/%d buf %p\n",
+ &req->req, length,
+ req->req.length, req->req.buf);
+ }
+ spin_unlock_irqrestore(&udc->lock, flags);
+}
+
+static void proc_irq_show(struct seq_file *s, const char *label, u32 mask)
+{
+ int i;
+
+ seq_printf(s, "%s %04x:%s%s" FOURBITS, label, mask,
+ (mask & (1 << 13)) ? " wakeup" : "",
+ (mask & (1 << 12)) ? " endbusres" : "",
+
+ (mask & (1 << 11)) ? " sofint" : "",
+ (mask & (1 << 10)) ? " extrsm" : "",
+ (mask & (1 << 9)) ? " rxrsm" : "",
+ (mask & (1 << 8)) ? " rxsusp" : "");
+ for (i = 0; i < 8; i++) {
+ if (mask & (1 << i))
+ seq_printf(s, " ep%d", i);
+ }
+ seq_printf(s, "\n");
+}
+
+static int proc_udc_show(struct seq_file *s, void *unused)
+{
+ struct at91_udc *udc = s->private;
+ struct at91_ep *ep;
+ u32 tmp;
+
+ seq_printf(s, "%s: version %s\n", driver_name, DRIVER_VERSION);
+
+ seq_printf(s, "vbus %s, pullup %s, %s powered%s, gadget %s\n\n",
+ udc->vbus ? "present" : "off",
+ udc->enabled
+ ? (udc->vbus ? "active" : "enabled")
+ : "disabled",
+ udc->selfpowered ? "self" : "VBUS",
+ udc->suspended ? ", suspended" : "",
+ udc->driver ? udc->driver->driver.name : "(none)");
+
+ /* don't access registers when interface isn't clocked */
+ if (!udc->clocked) {
+ seq_printf(s, "(not clocked)\n");
+ return 0;
+ }
+
+ tmp = at91_udp_read(udc, AT91_UDP_FRM_NUM);
+ seq_printf(s, "frame %05x:%s%s frame=%d\n", tmp,
+ (tmp & AT91_UDP_FRM_OK) ? " ok" : "",
+ (tmp & AT91_UDP_FRM_ERR) ? " err" : "",
+ (tmp & AT91_UDP_NUM));
+
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ seq_printf(s, "glbstate %02x:%s" FOURBITS "\n", tmp,
+ (tmp & AT91_UDP_RMWUPE) ? " rmwupe" : "",
+ (tmp & AT91_UDP_RSMINPR) ? " rsminpr" : "",
+ (tmp & AT91_UDP_ESR) ? " esr" : "",
+ (tmp & AT91_UDP_CONFG) ? " confg" : "",
+ (tmp & AT91_UDP_FADDEN) ? " fadden" : "");
+
+ tmp = at91_udp_read(udc, AT91_UDP_FADDR);
+ seq_printf(s, "faddr %03x:%s fadd=%d\n", tmp,
+ (tmp & AT91_UDP_FEN) ? " fen" : "",
+ (tmp & AT91_UDP_FADD));
+
+ proc_irq_show(s, "imr ", at91_udp_read(udc, AT91_UDP_IMR));
+ proc_irq_show(s, "isr ", at91_udp_read(udc, AT91_UDP_ISR));
+
+ if (udc->enabled && udc->vbus) {
+ proc_ep_show(s, &udc->ep[0]);
+ list_for_each_entry (ep, &udc->gadget.ep_list, ep.ep_list) {
+ if (ep->ep.desc)
+ proc_ep_show(s, ep);
+ }
+ }
+ return 0;
+}
+
+static int proc_udc_open(struct inode *inode, struct file *file)
+{
+ return single_open(file, proc_udc_show, PDE_DATA(inode));
+}
+
+static const struct file_operations proc_ops = {
+ .owner = THIS_MODULE,
+ .open = proc_udc_open,
+ .read = seq_read,
+ .llseek = seq_lseek,
+ .release = single_release,
+};
+
+static void create_debug_file(struct at91_udc *udc)
+{
+ udc->pde = proc_create_data(debug_filename, 0, NULL, &proc_ops, udc);
+}
+
+static void remove_debug_file(struct at91_udc *udc)
+{
+ if (udc->pde)
+ remove_proc_entry(debug_filename, NULL);
+}
+
+#else
+
+static inline void create_debug_file(struct at91_udc *udc) {}
+static inline void remove_debug_file(struct at91_udc *udc) {}
+
+#endif
+
+
+/*-------------------------------------------------------------------------*/
+
+static void done(struct at91_ep *ep, struct at91_request *req, int status)
+{
+ unsigned stopped = ep->stopped;
+ struct at91_udc *udc = ep->udc;
+
+ list_del_init(&req->queue);
+ if (req->req.status == -EINPROGRESS)
+ req->req.status = status;
+ else
+ status = req->req.status;
+ if (status && status != -ESHUTDOWN)
+ VDBG("%s done %p, status %d\n", ep->ep.name, req, status);
+
+ ep->stopped = 1;
+ spin_unlock(&udc->lock);
+#ifndef __UBOOT__
+ usb_gadget_giveback_request(&ep->ep, &req->req);
+#else
+ req->req.complete(&ep->ep, &req->req);
+#endif
+ spin_lock(&udc->lock);
+ ep->stopped = stopped;
+
+ /* ep0 is always ready; other endpoints need a non-empty queue */
+ if (list_empty(&ep->queue) && ep->int_mask != (1 << 0))
+ at91_udp_write(udc, AT91_UDP_IDR, ep->int_mask);
+}
+
+/*-------------------------------------------------------------------------*/
+
+/* bits indicating OUT fifo has data ready */
+#define RX_DATA_READY (AT91_UDP_RX_DATA_BK0 | AT91_UDP_RX_DATA_BK1)
+
+/*
+ * Endpoint FIFO CSR bits have a mix of bits, making it unsafe to just write
+ * back most of the value you just read (because of side effects, including
+ * bits that may change after reading and before writing).
+ *
+ * Except when changing a specific bit, always write values which:
+ * - clear SET_FX bits (setting them could change something)
+ * - set CLR_FX bits (clearing them could change something)
+ *
+ * There are also state bits like FORCESTALL, EPEDS, DIR, and EPTYPE
+ * that shouldn't normally be changed.
+ *
+ * NOTE at91sam9260 docs mention synch between UDPCK and MCK clock domains,
+ * implying a need to wait for one write to complete (test relevant bits)
+ * before starting the next write. This shouldn't be an issue given how
+ * infrequently we write, except maybe for write-then-read idioms.
+ */
+#define SET_FX (AT91_UDP_TXPKTRDY)
+#define CLR_FX (RX_DATA_READY | AT91_UDP_RXSETUP \
+ | AT91_UDP_STALLSENT | AT91_UDP_TXCOMP)
+
+/* pull OUT packet data from the endpoint's fifo */
+static int read_fifo (struct at91_ep *ep, struct at91_request *req)
+{
+ u32 __iomem *creg = ep->creg;
+ u8 __iomem *dreg = ep->creg + (AT91_UDP_FDR(0) - AT91_UDP_CSR(0));
+ u32 csr;
+ u8 *buf;
+ unsigned int count, bufferspace, is_done;
+
+ buf = req->req.buf + req->req.actual;
+ bufferspace = req->req.length - req->req.actual;
+
+ /*
+ * there might be nothing to read if ep_queue() calls us,
+ * or if we already emptied both pingpong buffers
+ */
+rescan:
+ csr = __raw_readl(creg);
+ if ((csr & RX_DATA_READY) == 0)
+ return 0;
+
+ count = (csr & AT91_UDP_RXBYTECNT) >> 16;
+ if (count > ep->ep.maxpacket)
+ count = ep->ep.maxpacket;
+ if (count > bufferspace) {
+ DBG("%s buffer overflow\n", ep->ep.name);
+ req->req.status = -EOVERFLOW;
+ count = bufferspace;
+ }
+ __raw_readsb((unsigned long)dreg, buf, count);
+
+ /* release and swap pingpong mem bank */
+ csr |= CLR_FX;
+ if (ep->is_pingpong) {
+ if (ep->fifo_bank == 0) {
+ csr &= ~(SET_FX | AT91_UDP_RX_DATA_BK0);
+ ep->fifo_bank = 1;
+ } else {
+ csr &= ~(SET_FX | AT91_UDP_RX_DATA_BK1);
+ ep->fifo_bank = 0;
+ }
+ } else
+ csr &= ~(SET_FX | AT91_UDP_RX_DATA_BK0);
+ __raw_writel(csr, creg);
+
+ req->req.actual += count;
+ is_done = (count < ep->ep.maxpacket);
+ if (count == bufferspace)
+ is_done = 1;
+
+ PACKET("%s %p out/%d%s\n", ep->ep.name, &req->req, count,
+ is_done ? " (done)" : "");
+
+ /*
+ * avoid extra trips through IRQ logic for packets already in
+ * the fifo ... maybe preventing an extra (expensive) OUT-NAK
+ */
+ if (is_done)
+ done(ep, req, 0);
+ else if (ep->is_pingpong) {
+ /*
+ * One dummy read to delay the code because of a HW glitch:
+ * CSR returns bad RXCOUNT when read too soon after updating
+ * RX_DATA_BK flags.
+ */
+ csr = __raw_readl(creg);
+
+ bufferspace -= count;
+ buf += count;
+ goto rescan;
+ }
+
+ return is_done;
+}
+
+/* load fifo for an IN packet */
+static int write_fifo(struct at91_ep *ep, struct at91_request *req)
+{
+ u32 __iomem *creg = ep->creg;
+ u32 csr = __raw_readl(creg);
+ u8 __iomem *dreg = ep->creg + (AT91_UDP_FDR(0) - AT91_UDP_CSR(0));
+ unsigned total, count, is_last;
+ u8 *buf;
+
+ /*
+ * TODO: allow for writing two packets to the fifo ... that'll
+ * reduce the amount of IN-NAKing, but probably won't affect
+ * throughput much. (Unlike preventing OUT-NAKing!)
+ */
+
+ /*
+ * If ep_queue() calls us, the queue is empty and possibly in
+ * odd states like TXCOMP not yet cleared (we do it, saving at
+ * least one IRQ) or the fifo not yet being free. Those aren't
+ * issues normally (IRQ handler fast path).
+ */
+ if (unlikely(csr & (AT91_UDP_TXCOMP | AT91_UDP_TXPKTRDY))) {
+ if (csr & AT91_UDP_TXCOMP) {
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_TXCOMP);
+ __raw_writel(csr, creg);
+ csr = __raw_readl(creg);
+ }
+ if (csr & AT91_UDP_TXPKTRDY)
+ return 0;
+ }
+
+ buf = req->req.buf + req->req.actual;
+ prefetch(buf);
+ total = req->req.length - req->req.actual;
+ if (ep->ep.maxpacket < total) {
+ count = ep->ep.maxpacket;
+ is_last = 0;
+ } else {
+ count = total;
+ is_last = (count < ep->ep.maxpacket) || !req->req.zero;
+ }
+
+ /*
+ * Write the packet, maybe it's a ZLP.
+ *
+ * NOTE: incrementing req->actual before we receive the ACK means
+ * gadget driver IN bytecounts can be wrong in fault cases. That's
+ * fixable with PIO drivers like this one (save "count" here, and
+ * do the increment later on TX irq), but not for most DMA hardware.
+ *
+ * So all gadget drivers must accept that potential error. Some
+ * hardware supports precise fifo status reporting, letting them
+ * recover when the actual bytecount matters (e.g. for USB Test
+ * and Measurement Class devices).
+ */
+ __raw_writesb((unsigned long)dreg, buf, count);
+ csr &= ~SET_FX;
+ csr |= CLR_FX | AT91_UDP_TXPKTRDY;
+ __raw_writel(csr, creg);
+ req->req.actual += count;
+
+ PACKET("%s %p in/%d%s\n", ep->ep.name, &req->req, count,
+ is_last ? " (done)" : "");
+ if (is_last)
+ done(ep, req, 0);
+ return is_last;
+}
+
+static void nuke(struct at91_ep *ep, int status)
+{
+ struct at91_request *req;
+
+ /* terminate any request in the queue */
+ ep->stopped = 1;
+ if (list_empty(&ep->queue))
+ return;
+
+ VDBG("%s %s\n", __func__, ep->ep.name);
+ while (!list_empty(&ep->queue)) {
+ req = list_entry(ep->queue.next, struct at91_request, queue);
+ done(ep, req, status);
+ }
+}
+
+/*-------------------------------------------------------------------------*/
+
+static int at91_ep_enable(struct usb_ep *_ep,
+ const struct usb_endpoint_descriptor *desc)
+{
+ struct at91_ep *ep = container_of(_ep, struct at91_ep, ep);
+ struct at91_udc *udc;
+ u16 maxpacket;
+ u32 tmp;
+ unsigned long flags;
+
+ if (!_ep || !ep
+ || !desc || _ep->name == ep0name
+ || desc->bDescriptorType != USB_DT_ENDPOINT
+ || (maxpacket = usb_endpoint_maxp(desc)) == 0
+ || maxpacket > ep->maxpacket) {
+ DBG("bad ep or descriptor\n");
+ return -EINVAL;
+ }
+
+ udc = ep->udc;
+ if (!udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN) {
+ DBG("bogus device state\n");
+ return -ESHUTDOWN;
+ }
+
+ tmp = usb_endpoint_type(desc);
+ switch (tmp) {
+ case USB_ENDPOINT_XFER_CONTROL:
+ DBG("only one control endpoint\n");
+ return -EINVAL;
+ case USB_ENDPOINT_XFER_INT:
+ if (maxpacket > 64)
+ goto bogus_max;
+ break;
+ case USB_ENDPOINT_XFER_BULK:
+ switch (maxpacket) {
+ case 8:
+ case 16:
+ case 32:
+ case 64:
+ goto ok;
+ }
+bogus_max:
+ DBG("bogus maxpacket %d\n", maxpacket);
+ return -EINVAL;
+ case USB_ENDPOINT_XFER_ISOC:
+ if (!ep->is_pingpong) {
+ DBG("iso requires double buffering\n");
+ return -EINVAL;
+ }
+ break;
+ }
+
+ok:
+ spin_lock_irqsave(&udc->lock, flags);
+
+ /* initialize endpoint to match this descriptor */
+ ep->is_in = usb_endpoint_dir_in(desc);
+ ep->is_iso = (tmp == USB_ENDPOINT_XFER_ISOC);
+ ep->stopped = 0;
+ if (ep->is_in)
+ tmp |= 0x04;
+ tmp <<= 8;
+ tmp |= AT91_UDP_EPEDS;
+ __raw_writel(tmp, ep->creg);
+
+ ep->ep.maxpacket = maxpacket;
+
+ /*
+ * reset/init endpoint fifo. NOTE: leaves fifo_bank alone,
+ * since endpoint resets don't reset hw pingpong state.
+ */
+ at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+ at91_udp_write(udc, AT91_UDP_RST_EP, 0);
+
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+static int at91_ep_disable (struct usb_ep * _ep)
+{
+ struct at91_ep *ep = container_of(_ep, struct at91_ep, ep);
+ struct at91_udc *udc = ep->udc;
+ unsigned long flags;
+
+ if (ep == &ep->udc->ep[0])
+ return -EINVAL;
+
+ spin_lock_irqsave(&udc->lock, flags);
+
+ nuke(ep, -ESHUTDOWN);
+
+ /* restore the endpoint's pristine config */
+ ep->ep.desc = NULL;
+ ep->ep.maxpacket = ep->maxpacket;
+
+ /* reset fifos and endpoint */
+ if (ep->udc->clocked) {
+ at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+ at91_udp_write(udc, AT91_UDP_RST_EP, 0);
+ __raw_writel(0, ep->creg);
+ }
+
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+/*
+ * this is a PIO-only driver, so there's nothing
+ * interesting for request or buffer allocation.
+ */
+
+static struct usb_request *
+at91_ep_alloc_request(struct usb_ep *_ep, gfp_t gfp_flags)
+{
+ struct at91_request *req;
+
+ req = kzalloc(sizeof (struct at91_request), gfp_flags);
+ if (!req)
+ return NULL;
+
+ INIT_LIST_HEAD(&req->queue);
+ return &req->req;
+}
+
+static void at91_ep_free_request(struct usb_ep *_ep, struct usb_request *_req)
+{
+ struct at91_request *req;
+
+ req = container_of(_req, struct at91_request, req);
+ BUG_ON(!list_empty(&req->queue));
+ kfree(req);
+}
+
+static int at91_ep_queue(struct usb_ep *_ep,
+ struct usb_request *_req, gfp_t gfp_flags)
+{
+ struct at91_request *req;
+ struct at91_ep *ep;
+ struct at91_udc *udc;
+ int status;
+ unsigned long flags;
+
+ req = container_of(_req, struct at91_request, req);
+ ep = container_of(_ep, struct at91_ep, ep);
+
+ if (!_req || !_req->complete
+ || !_req->buf || !list_empty(&req->queue)) {
+ DBG("invalid request\n");
+ return -EINVAL;
+ }
+
+ if (!_ep || (!ep->ep.desc && ep->ep.name != ep0name)) {
+ DBG("invalid ep\n");
+ return -EINVAL;
+ }
+
+ udc = ep->udc;
+
+ if (!udc || !udc->driver || udc->gadget.speed == USB_SPEED_UNKNOWN) {
+ DBG("invalid device\n");
+ return -EINVAL;
+ }
+
+ _req->status = -EINPROGRESS;
+ _req->actual = 0;
+
+ spin_lock_irqsave(&udc->lock, flags);
+
+ /* try to kickstart any empty and idle queue */
+ if (list_empty(&ep->queue) && !ep->stopped) {
+ int is_ep0;
+
+ /*
+ * If this control request has a non-empty DATA stage, this
+ * will start that stage. It works just like a non-control
+ * request (until the status stage starts, maybe early).
+ *
+ * If the data stage is empty, then this starts a successful
+ * IN/STATUS stage. (Unsuccessful ones use set_halt.)
+ */
+ is_ep0 = (ep->ep.name == ep0name);
+ if (is_ep0) {
+ u32 tmp;
+
+ if (!udc->req_pending) {
+ status = -EINVAL;
+ goto done;
+ }
+
+ /*
+ * defer changing CONFG until after the gadget driver
+ * reconfigures the endpoints.
+ */
+ if (udc->wait_for_config_ack) {
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ tmp ^= AT91_UDP_CONFG;
+ VDBG("toggle config\n");
+ at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
+ }
+ if (req->req.length == 0) {
+ep0_in_status:
+ PACKET("ep0 in/status\n");
+ status = 0;
+ tmp = __raw_readl(ep->creg);
+ tmp &= ~SET_FX;
+ tmp |= CLR_FX | AT91_UDP_TXPKTRDY;
+ __raw_writel(tmp, ep->creg);
+ udc->req_pending = 0;
+ goto done;
+ }
+ }
+
+ if (ep->is_in)
+ status = write_fifo(ep, req);
+ else {
+ status = read_fifo(ep, req);
+
+ /* IN/STATUS stage is otherwise triggered by irq */
+ if (status && is_ep0)
+ goto ep0_in_status;
+ }
+ } else
+ status = 0;
+
+ if (req && !status) {
+ list_add_tail (&req->queue, &ep->queue);
+ at91_udp_write(udc, AT91_UDP_IER, ep->int_mask);
+ }
+done:
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return (status < 0) ? status : 0;
+}
+
+static int at91_ep_dequeue(struct usb_ep *_ep, struct usb_request *_req)
+{
+ struct at91_ep *ep;
+ struct at91_request *req;
+ unsigned long flags;
+#ifndef __UBOOT__
+ struct at91_udc *udc;
+#endif
+
+ ep = container_of(_ep, struct at91_ep, ep);
+ if (!_ep || ep->ep.name == ep0name)
+ return -EINVAL;
+
+#ifndef __UBOOT__
+ udc = ep->udc;
+#endif
+
+ spin_lock_irqsave(&udc->lock, flags);
+
+ /* make sure it's actually queued on this endpoint */
+ list_for_each_entry (req, &ep->queue, queue) {
+ if (&req->req == _req)
+ break;
+ }
+ if (&req->req != _req) {
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return -EINVAL;
+ }
+
+ done(ep, req, -ECONNRESET);
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+static int at91_ep_set_halt(struct usb_ep *_ep, int value)
+{
+ struct at91_ep *ep = container_of(_ep, struct at91_ep, ep);
+ struct at91_udc *udc = ep->udc;
+ u32 __iomem *creg;
+ u32 csr;
+ unsigned long flags;
+ int status = 0;
+
+ if (!_ep || ep->is_iso || !ep->udc->clocked)
+ return -EINVAL;
+
+ creg = ep->creg;
+ spin_lock_irqsave(&udc->lock, flags);
+
+ csr = __raw_readl(creg);
+
+ /*
+ * fail with still-busy IN endpoints, ensuring correct sequencing
+ * of data tx then stall. note that the fifo rx bytecount isn't
+ * completely accurate as a tx bytecount.
+ */
+ if (ep->is_in && (!list_empty(&ep->queue) || (csr >> 16) != 0))
+ status = -EAGAIN;
+ else {
+ csr |= CLR_FX;
+ csr &= ~SET_FX;
+ if (value) {
+ csr |= AT91_UDP_FORCESTALL;
+ VDBG("halt %s\n", ep->ep.name);
+ } else {
+ at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+ at91_udp_write(udc, AT91_UDP_RST_EP, 0);
+ csr &= ~AT91_UDP_FORCESTALL;
+ }
+ __raw_writel(csr, creg);
+ }
+
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return status;
+}
+
+static const struct usb_ep_ops at91_ep_ops = {
+ .enable = at91_ep_enable,
+ .disable = at91_ep_disable,
+ .alloc_request = at91_ep_alloc_request,
+ .free_request = at91_ep_free_request,
+ .queue = at91_ep_queue,
+ .dequeue = at91_ep_dequeue,
+ .set_halt = at91_ep_set_halt,
+ /* there's only imprecise fifo status reporting */
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int at91_get_frame(struct usb_gadget *gadget)
+{
+ struct at91_udc *udc = to_udc(gadget);
+
+ if (!to_udc(gadget)->clocked)
+ return -EINVAL;
+ return at91_udp_read(udc, AT91_UDP_FRM_NUM) & AT91_UDP_NUM;
+}
+
+static int at91_wakeup(struct usb_gadget *gadget)
+{
+ struct at91_udc *udc = to_udc(gadget);
+ u32 glbstate;
+ int status = -EINVAL;
+ unsigned long flags;
+
+ DBG("%s\n", __func__ );
+ spin_lock_irqsave(&udc->lock, flags);
+
+ if (!udc->clocked || !udc->suspended)
+ goto done;
+
+ /* NOTE: some "early versions" handle ESR differently ... */
+
+ glbstate = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ if (!(glbstate & AT91_UDP_ESR))
+ goto done;
+ glbstate |= AT91_UDP_ESR;
+ at91_udp_write(udc, AT91_UDP_GLB_STAT, glbstate);
+
+done:
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return status;
+}
+
+/* reinit == restore initial software state */
+static void udc_reinit(struct at91_udc *udc)
+{
+ u32 i;
+
+ INIT_LIST_HEAD(&udc->gadget.ep_list);
+ INIT_LIST_HEAD(&udc->gadget.ep0->ep_list);
+
+ for (i = 0; i < NUM_ENDPOINTS; i++) {
+ struct at91_ep *ep = &udc->ep[i];
+
+ if (i != 0)
+ list_add_tail(&ep->ep.ep_list, &udc->gadget.ep_list);
+ ep->ep.desc = NULL;
+ ep->stopped = 0;
+ ep->fifo_bank = 0;
+ usb_ep_set_maxpacket_limit(&ep->ep, ep->maxpacket);
+ ep->creg = (void __iomem *) udc->udp_baseaddr + AT91_UDP_CSR(i);
+ /* initialize one queue per endpoint */
+ INIT_LIST_HEAD(&ep->queue);
+ }
+}
+
+static void reset_gadget(struct at91_udc *udc)
+{
+ struct usb_gadget_driver *driver = udc->driver;
+ int i;
+
+ if (udc->gadget.speed == USB_SPEED_UNKNOWN)
+ driver = NULL;
+ udc->gadget.speed = USB_SPEED_UNKNOWN;
+ udc->suspended = 0;
+
+ for (i = 0; i < NUM_ENDPOINTS; i++) {
+ struct at91_ep *ep = &udc->ep[i];
+
+ ep->stopped = 1;
+ nuke(ep, -ESHUTDOWN);
+ }
+ if (driver) {
+ spin_unlock(&udc->lock);
+#ifndef __UBOOT__
+ usb_gadget_udc_reset(&udc->gadget, driver);
+#else
+ udc->driver->disconnect(&udc->gadget);
+#endif
+ spin_lock(&udc->lock);
+ }
+
+ udc_reinit(udc);
+}
+
+static void stop_activity(struct at91_udc *udc)
+{
+ struct usb_gadget_driver *driver = udc->driver;
+ int i;
+
+ if (udc->gadget.speed == USB_SPEED_UNKNOWN)
+ driver = NULL;
+ udc->gadget.speed = USB_SPEED_UNKNOWN;
+ udc->suspended = 0;
+
+ for (i = 0; i < NUM_ENDPOINTS; i++) {
+ struct at91_ep *ep = &udc->ep[i];
+ ep->stopped = 1;
+ nuke(ep, -ESHUTDOWN);
+ }
+ if (driver) {
+ spin_unlock(&udc->lock);
+ driver->disconnect(&udc->gadget);
+ spin_lock(&udc->lock);
+ }
+
+ udc_reinit(udc);
+}
+
+static void clk_on(struct at91_udc *udc)
+{
+ if (udc->clocked)
+ return;
+ udc->clocked = 1;
+
+#ifndef __UBOOT__
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ clk_enable(udc->uclk);
+ clk_enable(udc->iclk);
+ clk_enable(udc->fclk);
+#endif
+}
+
+static void clk_off(struct at91_udc *udc)
+{
+ if (!udc->clocked)
+ return;
+ udc->clocked = 0;
+ udc->gadget.speed = USB_SPEED_UNKNOWN;
+#ifndef __UBOOT__
+ clk_disable(udc->fclk);
+ clk_disable(udc->iclk);
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ clk_disable(udc->uclk);
+#endif
+}
+
+#if defined(__UBOOT__)
+#if defined(CONFIG_AT91SAM9261)
+static int at91_usb_pud(int on)
+{
+ struct at91_matrix *matrix = (struct at91_matrix *)ATMEL_BASE_MATRIX;
+ unsigned long pucr;
+
+ pucr = readl(&matrix->pucr);
+ if (on)
+ pucr |= AT91_MATRIX_USBPUCR_PUON;
+ else
+ pucr &= ~AT91_MATRIX_USBPUCR_PUON;
+ writel(pucr, &matrix->pucr);
+
+ return 0;
+}
+#else
+static int at91_usb_pud(int on)
+{
+ return 0;
+}
+#endif
+#endif
+
+/*
+ * activate/deactivate link with host; minimize power usage for
+ * inactive links by cutting clocks and transceiver power.
+ */
+static void pullup(struct at91_udc *udc, int is_on)
+{
+ int active = !udc->board.pullup_active_low;
+
+ if (!udc->enabled || !udc->vbus)
+ is_on = 0;
+ DBG("%sactive\n", is_on ? "" : "in");
+
+ if (is_on) {
+ clk_on(udc);
+ at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXRSM);
+ at91_udp_write(udc, AT91_UDP_TXVC, 0);
+ if (cpu_is_at91rm9200())
+ gpio_set_value(udc->board.pullup_pin, active);
+ else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
+ u32 txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+
+ txvc |= AT91_UDP_TXVC_PUON;
+ at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+ } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
+#ifndef __UBOOT__
+ u32 usbpucr;
+
+ usbpucr = at91_matrix_read(AT91_MATRIX_USBPUCR);
+ usbpucr |= AT91_MATRIX_USBPUCR_PUON;
+ at91_matrix_write(AT91_MATRIX_USBPUCR, usbpucr);
+#else
+ at91_usb_pud(1);
+#endif
+ }
+ } else {
+ stop_activity(udc);
+ at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXRSM);
+ at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+ if (cpu_is_at91rm9200())
+ gpio_set_value(udc->board.pullup_pin, !active);
+ else if (cpu_is_at91sam9260() || cpu_is_at91sam9263() || cpu_is_at91sam9g20()) {
+ u32 txvc = at91_udp_read(udc, AT91_UDP_TXVC);
+
+ txvc &= ~AT91_UDP_TXVC_PUON;
+ at91_udp_write(udc, AT91_UDP_TXVC, txvc);
+ } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
+#ifndef __UBOOT__
+ u32 usbpucr;
+
+ usbpucr = at91_matrix_read(AT91_MATRIX_USBPUCR);
+ usbpucr &= ~AT91_MATRIX_USBPUCR_PUON;
+ at91_matrix_write(AT91_MATRIX_USBPUCR, usbpucr);
+#else
+ at91_usb_pud(0);
+#endif
+ }
+ clk_off(udc);
+ }
+}
+
+/* vbus is here! turn everything on that's ready */
+static int at91_vbus_session(struct usb_gadget *gadget, int is_active)
+{
+ struct at91_udc *udc = to_udc(gadget);
+ unsigned long flags;
+
+ /* VDBG("vbus %s\n", is_active ? "on" : "off"); */
+ spin_lock_irqsave(&udc->lock, flags);
+ udc->vbus = (is_active != 0);
+ if (udc->driver)
+ pullup(udc, is_active);
+ else
+ pullup(udc, 0);
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+static int at91_pullup(struct usb_gadget *gadget, int is_on)
+{
+ struct at91_udc *udc = to_udc(gadget);
+ unsigned long flags;
+
+ spin_lock_irqsave(&udc->lock, flags);
+ udc->enabled = is_on = !!is_on;
+ pullup(udc, is_on);
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+static int at91_set_selfpowered(struct usb_gadget *gadget, int is_on)
+{
+ struct at91_udc *udc = to_udc(gadget);
+ unsigned long flags;
+
+ spin_lock_irqsave(&udc->lock, flags);
+ udc->selfpowered = (is_on != 0);
+ spin_unlock_irqrestore(&udc->lock, flags);
+ return 0;
+}
+
+static int at91_start(struct usb_gadget *gadget,
+ struct usb_gadget_driver *driver);
+static int at91_stop(struct usb_gadget *gadget);
+
+static const struct usb_gadget_ops at91_udc_ops = {
+ .get_frame = at91_get_frame,
+ .wakeup = at91_wakeup,
+ .set_selfpowered = at91_set_selfpowered,
+ .vbus_session = at91_vbus_session,
+ .pullup = at91_pullup,
+ .udc_start = at91_start,
+ .udc_stop = at91_stop,
+
+ /*
+ * VBUS-powered devices may also also want to support bigger
+ * power budgets after an appropriate SET_CONFIGURATION.
+ */
+ /* .vbus_power = at91_vbus_power, */
+};
+
+/*-------------------------------------------------------------------------*/
+
+static int handle_ep(struct at91_ep *ep)
+{
+ struct at91_request *req;
+ u32 __iomem *creg = ep->creg;
+ u32 csr = __raw_readl(creg);
+
+ if (!list_empty(&ep->queue))
+ req = list_entry(ep->queue.next,
+ struct at91_request, queue);
+ else
+ req = NULL;
+
+ if (ep->is_in) {
+ if (csr & (AT91_UDP_STALLSENT | AT91_UDP_TXCOMP)) {
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_STALLSENT | AT91_UDP_TXCOMP);
+ __raw_writel(csr, creg);
+ }
+ if (req)
+ return write_fifo(ep, req);
+
+ } else {
+ if (csr & AT91_UDP_STALLSENT) {
+ /* STALLSENT bit == ISOERR */
+ if (ep->is_iso && req)
+ req->req.status = -EILSEQ;
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_STALLSENT);
+ __raw_writel(csr, creg);
+ csr = __raw_readl(creg);
+ }
+ if (req && (csr & RX_DATA_READY))
+ return read_fifo(ep, req);
+ }
+ return 0;
+}
+
+union setup {
+ u8 raw[8];
+ struct usb_ctrlrequest r;
+};
+
+static void handle_setup(struct at91_udc *udc, struct at91_ep *ep, u32 csr)
+{
+ u32 __iomem *creg = ep->creg;
+ u8 __iomem *dreg = ep->creg + (AT91_UDP_FDR(0) - AT91_UDP_CSR(0));
+ unsigned rxcount, i = 0;
+ u32 tmp;
+ union setup pkt;
+ int status = 0;
+
+ /* read and ack SETUP; hard-fail for bogus packets */
+ rxcount = (csr & AT91_UDP_RXBYTECNT) >> 16;
+ if (likely(rxcount == 8)) {
+ while (rxcount--)
+ pkt.raw[i++] = __raw_readb(dreg);
+ if (pkt.r.bRequestType & USB_DIR_IN) {
+ csr |= AT91_UDP_DIR;
+ ep->is_in = 1;
+ } else {
+ csr &= ~AT91_UDP_DIR;
+ ep->is_in = 0;
+ }
+ } else {
+ /* REVISIT this happens sometimes under load; why?? */
+ ERR("SETUP len %d, csr %08x\n", rxcount, csr);
+ status = -EINVAL;
+ }
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_RXSETUP);
+ __raw_writel(csr, creg);
+ udc->wait_for_addr_ack = 0;
+ udc->wait_for_config_ack = 0;
+ ep->stopped = 0;
+ if (unlikely(status != 0))
+ goto stall;
+
+#define w_index le16_to_cpu(pkt.r.wIndex)
+#define w_value le16_to_cpu(pkt.r.wValue)
+#define w_length le16_to_cpu(pkt.r.wLength)
+
+ VDBG("SETUP %02x.%02x v%04x i%04x l%04x\n",
+ pkt.r.bRequestType, pkt.r.bRequest,
+ w_value, w_index, w_length);
+
+ /*
+ * A few standard requests get handled here, ones that touch
+ * hardware ... notably for device and endpoint features.
+ */
+ udc->req_pending = 1;
+ csr = __raw_readl(creg);
+ csr |= CLR_FX;
+ csr &= ~SET_FX;
+ switch ((pkt.r.bRequestType << 8) | pkt.r.bRequest) {
+
+ case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
+ | USB_REQ_SET_ADDRESS:
+ __raw_writel(csr | AT91_UDP_TXPKTRDY, creg);
+ udc->addr = w_value;
+ udc->wait_for_addr_ack = 1;
+ udc->req_pending = 0;
+ /* FADDR is set later, when we ack host STATUS */
+ return;
+
+ case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
+ | USB_REQ_SET_CONFIGURATION:
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_CONFG;
+ if (pkt.r.wValue)
+ udc->wait_for_config_ack = (tmp == 0);
+ else
+ udc->wait_for_config_ack = (tmp != 0);
+ if (udc->wait_for_config_ack)
+ VDBG("wait for config\n");
+ /* CONFG is toggled later, if gadget driver succeeds */
+ break;
+
+ /*
+ * Hosts may set or clear remote wakeup status, and
+ * devices may report they're VBUS powered.
+ */
+ case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
+ | USB_REQ_GET_STATUS:
+ tmp = (udc->selfpowered << USB_DEVICE_SELF_POWERED);
+ if (at91_udp_read(udc, AT91_UDP_GLB_STAT) & AT91_UDP_ESR)
+ tmp |= (1 << USB_DEVICE_REMOTE_WAKEUP);
+ PACKET("get device status\n");
+ __raw_writeb(tmp, dreg);
+ __raw_writeb(0, dreg);
+ goto write_in;
+ /* then STATUS starts later, automatically */
+ case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
+ | USB_REQ_SET_FEATURE:
+ if (w_value != USB_DEVICE_REMOTE_WAKEUP)
+ goto stall;
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ tmp |= AT91_UDP_ESR;
+ at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
+ goto succeed;
+ case ((USB_TYPE_STANDARD|USB_RECIP_DEVICE) << 8)
+ | USB_REQ_CLEAR_FEATURE:
+ if (w_value != USB_DEVICE_REMOTE_WAKEUP)
+ goto stall;
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ tmp &= ~AT91_UDP_ESR;
+ at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
+ goto succeed;
+
+ /*
+ * Interfaces have no feature settings; this is pretty useless.
+ * we won't even insist the interface exists...
+ */
+ case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_INTERFACE) << 8)
+ | USB_REQ_GET_STATUS:
+ PACKET("get interface status\n");
+ __raw_writeb(0, dreg);
+ __raw_writeb(0, dreg);
+ goto write_in;
+ /* then STATUS starts later, automatically */
+ case ((USB_TYPE_STANDARD|USB_RECIP_INTERFACE) << 8)
+ | USB_REQ_SET_FEATURE:
+ case ((USB_TYPE_STANDARD|USB_RECIP_INTERFACE) << 8)
+ | USB_REQ_CLEAR_FEATURE:
+ goto stall;
+
+ /*
+ * Hosts may clear bulk/intr endpoint halt after the gadget
+ * driver sets it (not widely used); or set it (for testing)
+ */
+ case ((USB_DIR_IN|USB_TYPE_STANDARD|USB_RECIP_ENDPOINT) << 8)
+ | USB_REQ_GET_STATUS:
+ tmp = w_index & USB_ENDPOINT_NUMBER_MASK;
+ ep = &udc->ep[tmp];
+ if (tmp >= NUM_ENDPOINTS || (tmp && !ep->ep.desc))
+ goto stall;
+
+ if (tmp) {
+ if ((w_index & USB_DIR_IN)) {
+ if (!ep->is_in)
+ goto stall;
+ } else if (ep->is_in)
+ goto stall;
+ }
+ PACKET("get %s status\n", ep->ep.name);
+ if (__raw_readl(ep->creg) & AT91_UDP_FORCESTALL)
+ tmp = (1 << USB_ENDPOINT_HALT);
+ else
+ tmp = 0;
+ __raw_writeb(tmp, dreg);
+ __raw_writeb(0, dreg);
+ goto write_in;
+ /* then STATUS starts later, automatically */
+ case ((USB_TYPE_STANDARD|USB_RECIP_ENDPOINT) << 8)
+ | USB_REQ_SET_FEATURE:
+ tmp = w_index & USB_ENDPOINT_NUMBER_MASK;
+ ep = &udc->ep[tmp];
+ if (w_value != USB_ENDPOINT_HALT || tmp >= NUM_ENDPOINTS)
+ goto stall;
+ if (!ep->ep.desc || ep->is_iso)
+ goto stall;
+ if ((w_index & USB_DIR_IN)) {
+ if (!ep->is_in)
+ goto stall;
+ } else if (ep->is_in)
+ goto stall;
+
+ tmp = __raw_readl(ep->creg);
+ tmp &= ~SET_FX;
+ tmp |= CLR_FX | AT91_UDP_FORCESTALL;
+ __raw_writel(tmp, ep->creg);
+ goto succeed;
+ case ((USB_TYPE_STANDARD|USB_RECIP_ENDPOINT) << 8)
+ | USB_REQ_CLEAR_FEATURE:
+ tmp = w_index & USB_ENDPOINT_NUMBER_MASK;
+ ep = &udc->ep[tmp];
+ if (w_value != USB_ENDPOINT_HALT || tmp >= NUM_ENDPOINTS)
+ goto stall;
+ if (tmp == 0)
+ goto succeed;
+ if (!ep->ep.desc || ep->is_iso)
+ goto stall;
+ if ((w_index & USB_DIR_IN)) {
+ if (!ep->is_in)
+ goto stall;
+ } else if (ep->is_in)
+ goto stall;
+
+ at91_udp_write(udc, AT91_UDP_RST_EP, ep->int_mask);
+ at91_udp_write(udc, AT91_UDP_RST_EP, 0);
+ tmp = __raw_readl(ep->creg);
+ tmp |= CLR_FX;
+ tmp &= ~(SET_FX | AT91_UDP_FORCESTALL);
+ __raw_writel(tmp, ep->creg);
+ if (!list_empty(&ep->queue))
+ handle_ep(ep);
+ goto succeed;
+ }
+
+#undef w_value
+#undef w_index
+#undef w_length
+
+ /* pass request up to the gadget driver */
+ if (udc->driver) {
+ spin_unlock(&udc->lock);
+ status = udc->driver->setup(&udc->gadget, &pkt.r);
+ spin_lock(&udc->lock);
+ }
+ else
+ status = -ENODEV;
+ if (status < 0) {
+stall:
+ VDBG("req %02x.%02x protocol STALL; stat %d\n",
+ pkt.r.bRequestType, pkt.r.bRequest, status);
+ csr |= AT91_UDP_FORCESTALL;
+ __raw_writel(csr, creg);
+ udc->req_pending = 0;
+ }
+ return;
+
+succeed:
+ /* immediate successful (IN) STATUS after zero length DATA */
+ PACKET("ep0 in/status\n");
+write_in:
+ csr |= AT91_UDP_TXPKTRDY;
+ __raw_writel(csr, creg);
+ udc->req_pending = 0;
+}
+
+static void handle_ep0(struct at91_udc *udc)
+{
+ struct at91_ep *ep0 = &udc->ep[0];
+ u32 __iomem *creg = ep0->creg;
+ u32 csr = __raw_readl(creg);
+ struct at91_request *req;
+
+ if (unlikely(csr & AT91_UDP_STALLSENT)) {
+ nuke(ep0, -EPROTO);
+ udc->req_pending = 0;
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_STALLSENT | AT91_UDP_FORCESTALL);
+ __raw_writel(csr, creg);
+ VDBG("ep0 stalled\n");
+ csr = __raw_readl(creg);
+ }
+ if (csr & AT91_UDP_RXSETUP) {
+ nuke(ep0, 0);
+ udc->req_pending = 0;
+ handle_setup(udc, ep0, csr);
+ return;
+ }
+
+ if (list_empty(&ep0->queue))
+ req = NULL;
+ else
+ req = list_entry(ep0->queue.next, struct at91_request, queue);
+
+ /* host ACKed an IN packet that we sent */
+ if (csr & AT91_UDP_TXCOMP) {
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_TXCOMP);
+
+ /* write more IN DATA? */
+ if (req && ep0->is_in) {
+ if (handle_ep(ep0))
+ udc->req_pending = 0;
+
+ /*
+ * Ack after:
+ * - last IN DATA packet (including GET_STATUS)
+ * - IN/STATUS for OUT DATA
+ * - IN/STATUS for any zero-length DATA stage
+ * except for the IN DATA case, the host should send
+ * an OUT status later, which we'll ack.
+ */
+ } else {
+ udc->req_pending = 0;
+ __raw_writel(csr, creg);
+
+ /*
+ * SET_ADDRESS takes effect only after the STATUS
+ * (to the original address) gets acked.
+ */
+ if (udc->wait_for_addr_ack) {
+ u32 tmp;
+
+ at91_udp_write(udc, AT91_UDP_FADDR,
+ AT91_UDP_FEN | udc->addr);
+ tmp = at91_udp_read(udc, AT91_UDP_GLB_STAT);
+ tmp &= ~AT91_UDP_FADDEN;
+ if (udc->addr)
+ tmp |= AT91_UDP_FADDEN;
+ at91_udp_write(udc, AT91_UDP_GLB_STAT, tmp);
+
+ udc->wait_for_addr_ack = 0;
+ VDBG("address %d\n", udc->addr);
+ }
+ }
+ }
+
+ /* OUT packet arrived ... */
+ else if (csr & AT91_UDP_RX_DATA_BK0) {
+ csr |= CLR_FX;
+ csr &= ~(SET_FX | AT91_UDP_RX_DATA_BK0);
+
+ /* OUT DATA stage */
+ if (!ep0->is_in) {
+ if (req) {
+ if (handle_ep(ep0)) {
+ /* send IN/STATUS */
+ PACKET("ep0 in/status\n");
+ csr = __raw_readl(creg);
+ csr &= ~SET_FX;
+ csr |= CLR_FX | AT91_UDP_TXPKTRDY;
+ __raw_writel(csr, creg);
+ udc->req_pending = 0;
+ }
+ } else if (udc->req_pending) {
+ /*
+ * AT91 hardware has a hard time with this
+ * "deferred response" mode for control-OUT
+ * transfers. (For control-IN it's fine.)
+ *
+ * The normal solution leaves OUT data in the
+ * fifo until the gadget driver is ready.
+ * We couldn't do that here without disabling
+ * the IRQ that tells about SETUP packets,
+ * e.g. when the host gets impatient...
+ *
+ * Working around it by copying into a buffer
+ * would almost be a non-deferred response,
+ * except that it wouldn't permit reliable
+ * stalling of the request. Instead, demand
+ * that gadget drivers not use this mode.
+ */
+ DBG("no control-OUT deferred responses!\n");
+ __raw_writel(csr | AT91_UDP_FORCESTALL, creg);
+ udc->req_pending = 0;
+ }
+
+ /* STATUS stage for control-IN; ack. */
+ } else {
+ PACKET("ep0 out/status ACK\n");
+ __raw_writel(csr, creg);
+
+ /* "early" status stage */
+ if (req)
+ done(ep0, req, 0);
+ }
+ }
+}
+
+#ifndef __UBOOT__
+static irqreturn_t at91_udc_irq (int irq, void *_udc)
+#else
+static irqreturn_t at91_udc_irq (struct at91_udc *udc)
+#endif
+{
+#ifndef __UBOOT__
+ struct at91_udc *udc = _udc;
+#endif
+ u32 rescans = 5;
+ int disable_clock = 0;
+ unsigned long flags;
+
+ spin_lock_irqsave(&udc->lock, flags);
+
+ if (!udc->clocked) {
+ clk_on(udc);
+ disable_clock = 1;
+ }
+
+ while (rescans--) {
+ u32 status;
+
+ status = at91_udp_read(udc, AT91_UDP_ISR)
+ & at91_udp_read(udc, AT91_UDP_IMR);
+ if (!status)
+ break;
+
+ /* USB reset irq: not maskable */
+ if (status & AT91_UDP_ENDBUSRES) {
+ at91_udp_write(udc, AT91_UDP_IDR, ~MINIMUS_INTERRUPTUS);
+ at91_udp_write(udc, AT91_UDP_IER, MINIMUS_INTERRUPTUS);
+ /* Atmel code clears this irq twice */
+ at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+ at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_ENDBUSRES);
+ VDBG("end bus reset\n");
+ udc->addr = 0;
+ reset_gadget(udc);
+
+ /* enable ep0 */
+ at91_udp_write(udc, AT91_UDP_CSR(0),
+ AT91_UDP_EPEDS | AT91_UDP_EPTYPE_CTRL);
+ udc->gadget.speed = USB_SPEED_FULL;
+ udc->suspended = 0;
+ at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_EP(0));
+
+ /*
+ * NOTE: this driver keeps clocks off unless the
+ * USB host is present. That saves power, but for
+ * boards that don't support VBUS detection, both
+ * clocks need to be active most of the time.
+ */
+
+ /* host initiated suspend (3+ms bus idle) */
+ } else if (status & AT91_UDP_RXSUSP) {
+ at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXSUSP);
+ at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXRSM);
+ at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXSUSP);
+ /* VDBG("bus suspend\n"); */
+ if (udc->suspended)
+ continue;
+ udc->suspended = 1;
+
+ /*
+ * NOTE: when suspending a VBUS-powered device, the
+ * gadget driver should switch into slow clock mode
+ * and then into standby to avoid drawing more than
+ * 500uA power (2500uA for some high-power configs).
+ */
+ if (udc->driver && udc->driver->suspend) {
+ spin_unlock(&udc->lock);
+ udc->driver->suspend(&udc->gadget);
+ spin_lock(&udc->lock);
+ }
+
+ /* host initiated resume */
+ } else if (status & AT91_UDP_RXRSM) {
+ at91_udp_write(udc, AT91_UDP_IDR, AT91_UDP_RXRSM);
+ at91_udp_write(udc, AT91_UDP_IER, AT91_UDP_RXSUSP);
+ at91_udp_write(udc, AT91_UDP_ICR, AT91_UDP_RXRSM);
+ /* VDBG("bus resume\n"); */
+ if (!udc->suspended)
+ continue;
+ udc->suspended = 0;
+
+ /*
+ * NOTE: for a VBUS-powered device, the gadget driver
+ * would normally want to switch out of slow clock
+ * mode into normal mode.
+ */
+ if (udc->driver && udc->driver->resume) {
+ spin_unlock(&udc->lock);
+ udc->driver->resume(&udc->gadget);
+ spin_lock(&udc->lock);
+ }
+
+ /* endpoint IRQs are cleared by handling them */
+ } else {
+ int i;
+ unsigned mask = 1;
+ struct at91_ep *ep = &udc->ep[1];
+
+ if (status & mask)
+ handle_ep0(udc);
+ for (i = 1; i < NUM_ENDPOINTS; i++) {
+ mask <<= 1;
+ if (status & mask)
+ handle_ep(ep);
+ ep++;
+ }
+ }
+ }
+
+ if (disable_clock)
+ clk_off(udc);
+
+ spin_unlock_irqrestore(&udc->lock, flags);
+
+ return IRQ_HANDLED;
+}
+
+/*-------------------------------------------------------------------------*/
+
+static struct at91_udc controller = {
+ .gadget = {
+ .ops = &at91_udc_ops,
+ .ep0 = &controller.ep[0].ep,
+ .name = driver_name,
+ },
+ .ep[0] = {
+ .ep = {
+ .name = ep0name,
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .maxpacket = 8,
+ .int_mask = 1 << 0,
+ },
+ .ep[1] = {
+ .ep = {
+ .name = "ep1",
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .is_pingpong = 1,
+ .maxpacket = 64,
+ .int_mask = 1 << 1,
+ },
+ .ep[2] = {
+ .ep = {
+ .name = "ep2",
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .is_pingpong = 1,
+ .maxpacket = 64,
+ .int_mask = 1 << 2,
+ },
+ .ep[3] = {
+ .ep = {
+ /* could actually do bulk too */
+ .name = "ep3-int",
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .maxpacket = 8,
+ .int_mask = 1 << 3,
+ },
+ .ep[4] = {
+ .ep = {
+ .name = "ep4",
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .is_pingpong = 1,
+ .maxpacket = 256,
+ .int_mask = 1 << 4,
+ },
+ .ep[5] = {
+ .ep = {
+ .name = "ep5",
+ .ops = &at91_ep_ops,
+ },
+ .udc = &controller,
+ .is_pingpong = 1,
+ .maxpacket = 256,
+ .int_mask = 1 << 5,
+ },
+ /* ep6 and ep7 are also reserved (custom silicon might use them) */
+};
+
+#ifndef __UBOOT__
+static void at91_vbus_update(struct at91_udc *udc, unsigned value)
+{
+ value ^= udc->board.vbus_active_low;
+ if (value != udc->vbus)
+ at91_vbus_session(&udc->gadget, value);
+}
+
+static irqreturn_t at91_vbus_irq(int irq, void *_udc)
+{
+ struct at91_udc *udc = _udc;
+
+ /* vbus needs at least brief debouncing */
+ udelay(10);
+ at91_vbus_update(udc, gpio_get_value(udc->board.vbus_pin));
+
+ return IRQ_HANDLED;
+}
+
+static void at91_vbus_timer_work(struct work_struct *work)
+{
+ struct at91_udc *udc = container_of(work, struct at91_udc,
+ vbus_timer_work);
+
+ at91_vbus_update(udc, gpio_get_value_cansleep(udc->board.vbus_pin));
+
+ if (!timer_pending(&udc->vbus_timer))
+ mod_timer(&udc->vbus_timer, jiffies + VBUS_POLL_TIMEOUT);
+}
+
+static void at91_vbus_timer(unsigned long data)
+{
+ struct at91_udc *udc = (struct at91_udc *)data;
+
+ /*
+ * If we are polling vbus it is likely that the gpio is on an
+ * bus such as i2c or spi which may sleep, so schedule some work
+ * to read the vbus gpio
+ */
+ schedule_work(&udc->vbus_timer_work);
+}
+#endif
+
+static int at91_start(struct usb_gadget *gadget,
+ struct usb_gadget_driver *driver)
+{
+ struct at91_udc *udc = &controller;
+
+ udc->enabled = 1;
+ udc->selfpowered = 1;
+
+ return 0;
+}
+
+static int at91_stop(struct usb_gadget *gadget)
+{
+ struct at91_udc *udc;
+ unsigned long flags;
+
+ udc = container_of(gadget, struct at91_udc, gadget);
+
+ spin_lock_irqsave(&udc->lock, flags);
+ udc->enabled = 0;
+ at91_udp_write(udc, AT91_UDP_IDR, ~0);
+ spin_unlock_irqrestore(&udc->lock, flags);
+
+ udc->driver = NULL;
+
+ return 0;
+}
+
+/*-------------------------------------------------------------------------*/
+
+#ifndef __UBOOT__
+static void at91udc_shutdown(struct platform_device *dev)
+{
+ struct at91_udc *udc = platform_get_drvdata(dev);
+ unsigned long flags;
+
+ /* force disconnect on reboot */
+ spin_lock_irqsave(&udc->lock, flags);
+ pullup(platform_get_drvdata(dev), 0);
+ spin_unlock_irqrestore(&udc->lock, flags);
+}
+
+static void at91udc_of_init(struct at91_udc *udc,
+ struct device_node *np)
+{
+ struct at91_udc_data *board = &udc->board;
+ u32 val;
+ enum of_gpio_flags flags;
+
+ if (of_property_read_u32(np, "atmel,vbus-polled", &val) == 0)
+ board->vbus_polled = 1;
+
+ board->vbus_pin = of_get_named_gpio_flags(np, "atmel,vbus-gpio", 0,
+ &flags);
+ board->vbus_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
+
+ board->pullup_pin = of_get_named_gpio_flags(np, "atmel,pullup-gpio", 0,
+ &flags);
+
+ board->pullup_active_low = (flags & OF_GPIO_ACTIVE_LOW) ? 1 : 0;
+}
+
+static int at91udc_probe(struct platform_device *pdev)
+{
+ struct device *dev = &pdev->dev;
+ struct at91_udc *udc;
+ int retval;
+ struct resource *res;
+
+ if (!dev_get_platdata(dev) && !pdev->dev.of_node) {
+ /* small (so we copy it) but critical! */
+ DBG("missing platform_data\n");
+ return -ENODEV;
+ }
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -ENXIO;
+
+ if (!request_mem_region(res->start, resource_size(res), driver_name)) {
+ DBG("someone's using UDC memory\n");
+ return -EBUSY;
+ }
+
+ /* init software state */
+ udc = &controller;
+ udc->gadget.dev.parent = dev;
+ if (IS_ENABLED(CONFIG_OF) && pdev->dev.of_node)
+ at91udc_of_init(udc, pdev->dev.of_node);
+ else
+ memcpy(&udc->board, dev_get_platdata(dev),
+ sizeof(struct at91_udc_data));
+ udc->pdev = pdev;
+ udc->enabled = 0;
+ spin_lock_init(&udc->lock);
+
+ /* rm9200 needs manual D+ pullup; off by default */
+ if (cpu_is_at91rm9200()) {
+ if (!gpio_is_valid(udc->board.pullup_pin)) {
+ DBG("no D+ pullup?\n");
+ retval = -ENODEV;
+ goto fail0;
+ }
+ retval = gpio_request(udc->board.pullup_pin, "udc_pullup");
+ if (retval) {
+ DBG("D+ pullup is busy\n");
+ goto fail0;
+ }
+ gpio_direction_output(udc->board.pullup_pin,
+ udc->board.pullup_active_low);
+ }
+
+ /* newer chips have more FIFO memory than rm9200 */
+ if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) {
+ udc->ep[0].maxpacket = 64;
+ udc->ep[3].maxpacket = 64;
+ udc->ep[4].maxpacket = 512;
+ udc->ep[5].maxpacket = 512;
+ } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
+ udc->ep[3].maxpacket = 64;
+ } else if (cpu_is_at91sam9263()) {
+ udc->ep[0].maxpacket = 64;
+ udc->ep[3].maxpacket = 64;
+ }
+
+ udc->udp_baseaddr = ioremap(res->start, resource_size(res));
+ if (!udc->udp_baseaddr) {
+ retval = -ENOMEM;
+ goto fail0a;
+ }
+
+ udc_reinit(udc);
+
+ /* get interface and function clocks */
+ udc->iclk = clk_get(dev, "udc_clk");
+ udc->fclk = clk_get(dev, "udpck");
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ udc->uclk = clk_get(dev, "usb_clk");
+ if (IS_ERR(udc->iclk) || IS_ERR(udc->fclk) ||
+ (IS_ENABLED(CONFIG_COMMON_CLK) && IS_ERR(udc->uclk))) {
+ DBG("clocks missing\n");
+ retval = -ENODEV;
+ goto fail1;
+ }
+
+ /* don't do anything until we have both gadget driver and VBUS */
+ if (IS_ENABLED(CONFIG_COMMON_CLK)) {
+ clk_set_rate(udc->uclk, 48000000);
+ retval = clk_prepare(udc->uclk);
+ if (retval)
+ goto fail1;
+ }
+ retval = clk_prepare(udc->fclk);
+ if (retval)
+ goto fail1a;
+
+ retval = clk_prepare_enable(udc->iclk);
+ if (retval)
+ goto fail1b;
+ at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+ at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);
+ /* Clear all pending interrupts - UDP may be used by bootloader. */
+ at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);
+ clk_disable(udc->iclk);
+
+ /* request UDC and maybe VBUS irqs */
+ udc->udp_irq = platform_get_irq(pdev, 0);
+ retval = request_irq(udc->udp_irq, at91_udc_irq,
+ 0, driver_name, udc);
+ if (retval < 0) {
+ DBG("request irq %d failed\n", udc->udp_irq);
+ goto fail1c;
+ }
+ if (gpio_is_valid(udc->board.vbus_pin)) {
+ retval = gpio_request(udc->board.vbus_pin, "udc_vbus");
+ if (retval < 0) {
+ DBG("request vbus pin failed\n");
+ goto fail2;
+ }
+ gpio_direction_input(udc->board.vbus_pin);
+
+ /*
+ * Get the initial state of VBUS - we cannot expect
+ * a pending interrupt.
+ */
+ udc->vbus = gpio_get_value_cansleep(udc->board.vbus_pin) ^
+ udc->board.vbus_active_low;
+
+ if (udc->board.vbus_polled) {
+ INIT_WORK(&udc->vbus_timer_work, at91_vbus_timer_work);
+ setup_timer(&udc->vbus_timer, at91_vbus_timer,
+ (unsigned long)udc);
+ mod_timer(&udc->vbus_timer,
+ jiffies + VBUS_POLL_TIMEOUT);
+ } else {
+ if (request_irq(gpio_to_irq(udc->board.vbus_pin),
+ at91_vbus_irq, 0, driver_name, udc)) {
+ DBG("request vbus irq %d failed\n",
+ udc->board.vbus_pin);
+ retval = -EBUSY;
+ goto fail3;
+ }
+ }
+ } else {
+ DBG("no VBUS detection, assuming always-on\n");
+ udc->vbus = 1;
+ }
+ retval = usb_add_gadget_udc(dev, &udc->gadget);
+ if (retval)
+ goto fail4;
+ dev_set_drvdata(dev, udc);
+ device_init_wakeup(dev, 1);
+ create_debug_file(udc);
+
+ INFO("%s version %s\n", driver_name, DRIVER_VERSION);
+ return 0;
+fail4:
+ if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled)
+ free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
+fail3:
+ if (gpio_is_valid(udc->board.vbus_pin))
+ gpio_free(udc->board.vbus_pin);
+fail2:
+ free_irq(udc->udp_irq, udc);
+fail1c:
+ clk_unprepare(udc->iclk);
+fail1b:
+ clk_unprepare(udc->fclk);
+fail1a:
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ clk_unprepare(udc->uclk);
+fail1:
+ if (IS_ENABLED(CONFIG_COMMON_CLK) && !IS_ERR(udc->uclk))
+ clk_put(udc->uclk);
+ if (!IS_ERR(udc->fclk))
+ clk_put(udc->fclk);
+ if (!IS_ERR(udc->iclk))
+ clk_put(udc->iclk);
+ iounmap(udc->udp_baseaddr);
+fail0a:
+ if (cpu_is_at91rm9200())
+ gpio_free(udc->board.pullup_pin);
+fail0:
+ release_mem_region(res->start, resource_size(res));
+ DBG("%s probe failed, %d\n", driver_name, retval);
+ return retval;
+}
+
+static int __exit at91udc_remove(struct platform_device *pdev)
+{
+ struct at91_udc *udc = platform_get_drvdata(pdev);
+ struct resource *res;
+ unsigned long flags;
+
+ DBG("remove\n");
+
+ usb_del_gadget_udc(&udc->gadget);
+ if (udc->driver)
+ return -EBUSY;
+
+ spin_lock_irqsave(&udc->lock, flags);
+ pullup(udc, 0);
+ spin_unlock_irqrestore(&udc->lock, flags);
+
+ device_init_wakeup(&pdev->dev, 0);
+ remove_debug_file(udc);
+ if (gpio_is_valid(udc->board.vbus_pin)) {
+ free_irq(gpio_to_irq(udc->board.vbus_pin), udc);
+ gpio_free(udc->board.vbus_pin);
+ }
+ free_irq(udc->udp_irq, udc);
+ iounmap(udc->udp_baseaddr);
+
+ if (cpu_is_at91rm9200())
+ gpio_free(udc->board.pullup_pin);
+
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ release_mem_region(res->start, resource_size(res));
+
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ clk_unprepare(udc->uclk);
+ clk_unprepare(udc->fclk);
+ clk_unprepare(udc->iclk);
+
+ clk_put(udc->iclk);
+ clk_put(udc->fclk);
+ if (IS_ENABLED(CONFIG_COMMON_CLK))
+ clk_put(udc->uclk);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+static int at91udc_suspend(struct platform_device *pdev, pm_message_t mesg)
+{
+ struct at91_udc *udc = platform_get_drvdata(pdev);
+ int wake = udc->driver && device_may_wakeup(&pdev->dev);
+ unsigned long flags;
+
+ /* Unless we can act normally to the host (letting it wake us up
+ * whenever it has work for us) force disconnect. Wakeup requires
+ * PLLB for USB events (signaling for reset, wakeup, or incoming
+ * tokens) and VBUS irqs (on systems which support them).
+ */
+ if ((!udc->suspended && udc->addr)
+ || !wake
+ || at91_suspend_entering_slow_clock()) {
+ spin_lock_irqsave(&udc->lock, flags);
+ pullup(udc, 0);
+ wake = 0;
+ spin_unlock_irqrestore(&udc->lock, flags);
+ } else
+ enable_irq_wake(udc->udp_irq);
+
+ udc->active_suspend = wake;
+ if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled && wake)
+ enable_irq_wake(udc->board.vbus_pin);
+ return 0;
+}
+
+static int at91udc_resume(struct platform_device *pdev)
+{
+ struct at91_udc *udc = platform_get_drvdata(pdev);
+ unsigned long flags;
+
+ if (gpio_is_valid(udc->board.vbus_pin) && !udc->board.vbus_polled &&
+ udc->active_suspend)
+ disable_irq_wake(udc->board.vbus_pin);
+
+ /* maybe reconnect to host; if so, clocks on */
+ if (udc->active_suspend)
+ disable_irq_wake(udc->udp_irq);
+ else {
+ spin_lock_irqsave(&udc->lock, flags);
+ pullup(udc, 1);
+ spin_unlock_irqrestore(&udc->lock, flags);
+ }
+ return 0;
+}
+#else
+#define at91udc_suspend NULL
+#define at91udc_resume NULL
+#endif
+
+#if defined(CONFIG_OF)
+static const struct of_device_id at91_udc_dt_ids[] = {
+ { .compatible = "atmel,at91rm9200-udc" },
+ { /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, at91_udc_dt_ids);
+#endif
+
+static struct platform_driver at91_udc_driver = {
+ .remove = __exit_p(at91udc_remove),
+ .shutdown = at91udc_shutdown,
+ .suspend = at91udc_suspend,
+ .resume = at91udc_resume,
+ .driver = {
+ .name = (char *) driver_name,
+ .of_match_table = of_match_ptr(at91_udc_dt_ids),
+ },
+};
+
+module_platform_driver_probe(at91_udc_driver, at91udc_probe);
+
+MODULE_DESCRIPTION("AT91 udc driver");
+MODULE_AUTHOR("Thomas Rathbone, David Brownell");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:at91_udc");
+#else
+
+/* U-Boot init */
+int usb_gadget_handle_interrupts(int index)
+{
+ struct at91_udc *udc = &controller;
+
+ return at91_udc_irq(udc);
+}
+
+int usb_gadget_register_driver(struct usb_gadget_driver *driver)
+{
+ struct at91_udc *udc = &controller;
+ int ret;
+
+ if (!driver || !driver->bind || !driver->setup) {
+ printf("bad paramter\n");
+ return -EINVAL;
+ }
+
+ if (udc->driver) {
+ printf("UDC already has a gadget driver\n");
+ return -EBUSY;
+ }
+
+ at91_start(&udc->gadget, driver);
+
+ udc->driver = driver;
+
+ ret = driver->bind(&udc->gadget);
+ if (ret) {
+ error("driver->bind() returned %d\n", ret);
+ udc->driver = NULL;
+ }
+
+ return ret;
+}
+
+int usb_gadget_unregister_driver(struct usb_gadget_driver *driver)
+{
+ struct at91_udc *udc = &controller;
+
+ if (!driver || !driver->unbind || !driver->disconnect) {
+ error("bad paramter\n");
+ return -EINVAL;
+ }
+
+ driver->disconnect(&udc->gadget);
+ driver->unbind(&udc->gadget);
+ udc->driver = NULL;
+
+ at91_stop(&udc->gadget);
+
+ return 0;
+}
+
+int at91_udc_probe(struct at91_udc_data *pdata)
+{
+ struct at91_udc *udc;
+ int retval;
+
+ udc = &controller;
+ memcpy(&udc->board, pdata, sizeof(struct at91_udc_data));
+ udc->enabled = 0;
+
+ /* rm9200 needs manual D+ pullup; off by default */
+ if (cpu_is_at91rm9200()) {
+ retval = gpio_request(udc->board.pullup_pin, "udc_pullup");
+ if (retval) {
+ DBG("D+ pullup is busy\n");
+ return retval;
+ }
+ gpio_direction_output(udc->board.pullup_pin,
+ udc->board.pullup_active_low);
+ }
+
+ /* newer chips have more FIFO memory than rm9200 */
+ if (cpu_is_at91sam9260() || cpu_is_at91sam9g20()) {
+ udc->ep[0].maxpacket = 64;
+ udc->ep[3].maxpacket = 64;
+ udc->ep[4].maxpacket = 512;
+ udc->ep[5].maxpacket = 512;
+ } else if (cpu_is_at91sam9261() || cpu_is_at91sam9g10()) {
+ udc->ep[3].maxpacket = 64;
+ } else if (cpu_is_at91sam9263()) {
+ udc->ep[0].maxpacket = 64;
+ udc->ep[3].maxpacket = 64;
+ }
+
+ udc->udp_baseaddr = (void *)udc->board.baseaddr;
+ udc_reinit(udc);
+
+ /* enable clocks ??? or do this in board code ****/
+
+ /* IRQ setup */
+ at91_udp_write(udc, AT91_UDP_TXVC, AT91_UDP_TXVC_TXVDIS);
+ at91_udp_write(udc, AT91_UDP_IDR, 0xffffffff);
+ /* Clear all pending interrupts - UDP may be used by bootloader. */
+ at91_udp_write(udc, AT91_UDP_ICR, 0xffffffff);
+
+ if (udc->board.vbus_pin) {
+ printf("%s: gpio vbus pin not supported yet.\n", __func__);
+ } else {
+ DBG("no VBUS detection, assuming always-on\n");
+ }
+ udc->vbus = 1;
+
+ INFO("%s version %s\n", driver_name, DRIVER_VERSION);
+
+ return 0;
+}
+#endif
diff --git a/drivers/usb/gadget/at91_udc.h b/drivers/usb/gadget/at91_udc.h
new file mode 100644
index 0000000..405b370
--- /dev/null
+++ b/drivers/usb/gadget/at91_udc.h
@@ -0,0 +1,171 @@
+/*
+ * from linux:
+ * b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process context
+ *
+ * Copyright (C) 2004 by Thomas Rathbone, HP Labs
+ * Copyright (C) 2005 by Ivan Kokshaysky
+ * Copyright (C) 2006 by SAN People
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#ifndef AT91_UDC_H
+#define AT91_UDC_H
+
+/*
+ * USB Device Port (UDP) registers.
+ * Based on AT91RM9200 datasheet revision E.
+ */
+
+#define AT91_UDP_FRM_NUM 0x00 /* Frame Number Register */
+#define AT91_UDP_NUM (0x7ff << 0) /* Frame Number */
+#define AT91_UDP_FRM_ERR (1 << 16) /* Frame Error */
+#define AT91_UDP_FRM_OK (1 << 17) /* Frame OK */
+
+#define AT91_UDP_GLB_STAT 0x04 /* Global State Register */
+#define AT91_UDP_FADDEN (1 << 0) /* Function Address Enable */
+#define AT91_UDP_CONFG (1 << 1) /* Configured */
+#define AT91_UDP_ESR (1 << 2) /* Enable Send Resume */
+#define AT91_UDP_RSMINPR (1 << 3) /* Resume has been sent */
+#define AT91_UDP_RMWUPE (1 << 4) /* Remote Wake Up Enable */
+
+#define AT91_UDP_FADDR 0x08 /* Function Address Register */
+#define AT91_UDP_FADD (0x7f << 0) /* Function Address Value */
+#define AT91_UDP_FEN (1 << 8) /* Function Enable */
+
+#define AT91_UDP_IER 0x10 /* Interrupt Enable Register */
+#define AT91_UDP_IDR 0x14 /* Interrupt Disable Register */
+#define AT91_UDP_IMR 0x18 /* Interrupt Mask Register */
+
+#define AT91_UDP_ISR 0x1c /* Interrupt Status Register */
+#define AT91_UDP_EP(n) (1 << (n)) /* Endpoint Interrupt Status */
+#define AT91_UDP_RXSUSP (1 << 8) /* USB Suspend Interrupt Status */
+#define AT91_UDP_RXRSM (1 << 9) /* USB Resume Interrupt Status */
+#define AT91_UDP_EXTRSM (1 << 10) /* External Resume Interrupt Status [AT91RM9200 only] */
+#define AT91_UDP_SOFINT (1 << 11) /* Start of Frame Interrupt Status */
+#define AT91_UDP_ENDBUSRES (1 << 12) /* End of Bus Reset Interrupt Status */
+#define AT91_UDP_WAKEUP (1 << 13) /* USB Wakeup Interrupt Status [AT91RM9200 only] */
+
+#define AT91_UDP_ICR 0x20 /* Interrupt Clear Register */
+#define AT91_UDP_RST_EP 0x28 /* Reset Endpoint Register */
+
+#define AT91_UDP_CSR(n) (0x30+((n)*4)) /* Endpoint Control/Status Registers 0-7 */
+#define AT91_UDP_TXCOMP (1 << 0) /* Generates IN packet with data previously written in DPR */
+#define AT91_UDP_RX_DATA_BK0 (1 << 1) /* Receive Data Bank 0 */
+#define AT91_UDP_RXSETUP (1 << 2) /* Send STALL to the host */
+#define AT91_UDP_STALLSENT (1 << 3) /* Stall Sent / Isochronous error (Isochronous endpoints) */
+#define AT91_UDP_TXPKTRDY (1 << 4) /* Transmit Packet Ready */
+#define AT91_UDP_FORCESTALL (1 << 5) /* Force Stall */
+#define AT91_UDP_RX_DATA_BK1 (1 << 6) /* Receive Data Bank 1 */
+#define AT91_UDP_DIR (1 << 7) /* Transfer Direction */
+#define AT91_UDP_EPTYPE (7 << 8) /* Endpoint Type */
+#define AT91_UDP_EPTYPE_CTRL (0 << 8)
+#define AT91_UDP_EPTYPE_ISO_OUT (1 << 8)
+#define AT91_UDP_EPTYPE_BULK_OUT (2 << 8)
+#define AT91_UDP_EPTYPE_INT_OUT (3 << 8)
+#define AT91_UDP_EPTYPE_ISO_IN (5 << 8)
+#define AT91_UDP_EPTYPE_BULK_IN (6 << 8)
+#define AT91_UDP_EPTYPE_INT_IN (7 << 8)
+#define AT91_UDP_DTGLE (1 << 11) /* Data Toggle */
+#define AT91_UDP_EPEDS (1 << 15) /* Endpoint Enable/Disable */
+#define AT91_UDP_RXBYTECNT (0x7ff << 16) /* Number of bytes in FIFO */
+
+#define AT91_UDP_FDR(n) (0x50+((n)*4)) /* Endpoint FIFO Data Registers 0-7 */
+
+#define AT91_UDP_TXVC 0x74 /* Transceiver Control Register */
+#define AT91_UDP_TXVC_TXVDIS (1 << 8) /* Transceiver Disable */
+#define AT91_UDP_TXVC_PUON (1 << 9) /* PullUp On [AT91SAM9260 only] */
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * controller driver data structures
+ */
+
+#define NUM_ENDPOINTS 6
+
+/*
+ * hardware won't disable bus reset, or resume while the controller
+ * is suspended ... watching suspend helps keep the logic symmetric.
+ */
+#define MINIMUS_INTERRUPTUS \
+ (AT91_UDP_ENDBUSRES | AT91_UDP_RXRSM | AT91_UDP_RXSUSP)
+
+struct at91_ep {
+ struct usb_ep ep;
+ struct list_head queue;
+ struct at91_udc *udc;
+ void __iomem *creg;
+
+ unsigned maxpacket:16;
+ u8 int_mask;
+ unsigned is_pingpong:1;
+
+ unsigned stopped:1;
+ unsigned is_in:1;
+ unsigned is_iso:1;
+ unsigned fifo_bank:1;
+};
+
+/*
+ * driver is non-SMP, and just blocks IRQs whenever it needs
+ * access protection for chip registers or driver state
+ */
+struct at91_udc {
+ struct usb_gadget gadget;
+ struct at91_ep ep[NUM_ENDPOINTS];
+ struct usb_gadget_driver *driver;
+ unsigned vbus:1;
+ unsigned enabled:1;
+ unsigned clocked:1;
+ unsigned suspended:1;
+ unsigned req_pending:1;
+ unsigned wait_for_addr_ack:1;
+ unsigned wait_for_config_ack:1;
+ unsigned selfpowered:1;
+ unsigned active_suspend:1;
+ u8 addr;
+ struct at91_udc_data board;
+#ifndef __UBOOT__
+ struct clk *iclk, *fclk, *uclk;
+ struct platform_device *pdev;
+ struct proc_dir_entry *pde;
+#endif
+ void __iomem *udp_baseaddr;
+ int udp_irq;
+ spinlock_t lock;
+ struct timer_list vbus_timer;
+ struct work_struct vbus_timer_work;
+};
+
+static inline struct at91_udc *to_udc(struct usb_gadget *g)
+{
+ return container_of(g, struct at91_udc, gadget);
+}
+
+struct at91_request {
+ struct usb_request req;
+ struct list_head queue;
+};
+
+/*-------------------------------------------------------------------------*/
+
+#ifdef VERBOSE_DEBUG
+# define VDBG DBG
+#else
+# define VDBG(stuff...) do{}while(0)
+#endif
+
+#ifdef PACKET_TRACE
+# define PACKET VDBG
+#else
+# define PACKET(stuff...) do{}while(0)
+#endif
+
+#define ERR(stuff...) debug("udc: " stuff)
+#define WARNING(stuff...) debug("udc: " stuff)
+#define INFO(stuff...) debug("udc: " stuff)
+#define DBG(stuff...) debug("udc: " stuff)
+
+#endif
+
diff --git a/include/linux/usb/at91_udc.h b/include/linux/usb/at91_udc.h
new file mode 100644
index 0000000..eb88e1d
--- /dev/null
+++ b/include/linux/usb/at91_udc.h
@@ -0,0 +1,20 @@
+/*
+ * Platform data definitions for Atmel USBA gadget driver
+ * [Original from Linux kernel: include/linux/usb/atmel_usba_udc.h]
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+#ifndef __LINUX_USB_AT91_UDC_H__
+#define __LINUX_USB_AT91_UDC_H__
+
+struct at91_udc_data {
+ int vbus_pin; /* high == host powering us */
+ u8 vbus_active_low; /* vbus polarity */
+ u8 vbus_polled; /* Use polling, not interrupt */
+ int pullup_pin; /* active == D+ pulled up */
+ u8 pullup_active_low; /* true == pullup_pin is active low */
+ unsigned long baseaddr;
+};
+
+extern int at91_udc_probe(struct at91_udc_data *pdata);
+#endif
--
2.1.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support
2015-06-15 12:42 [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Heiko Schocher
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
2015-06-15 12:43 ` [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc Heiko Schocher
@ 2015-06-15 12:43 ` Heiko Schocher
2015-07-21 2:02 ` Marek Vasut
2015-07-21 7:02 ` Lukasz Majewski
2015-07-20 14:03 ` [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Lukasz Majewski
3 siblings, 2 replies; 15+ messages in thread
From: Heiko Schocher @ 2015-06-15 12:43 UTC (permalink / raw)
To: u-boot
[root at pollux dfu-util]# ./src/dfu-util -l
dfu-util 0.8
Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
Copyright 2010-2014 Tormod Volden and Stefan Schmidt
This program is Free Software and has ABSOLUTELY NO WARRANTY
Please report bugs to dfu-util at lists.gnumonks.org
Found DFU: [0908:02d2] ver=0212, devnum=119, cfg=1, intf=0, alt=0, name="Linux", serial="UNKNOWN"
[root at pollux dfu-util]#
Signed-off-by: Heiko Schocher <hs@denx.de>
---
board/siemens/smartweb/smartweb.c | 29 +++++++++++++++++++++++++++++
board/siemens/taurus/taurus.c | 27 +++++++++++++++++++++++++++
include/configs/smartweb.h | 34 ++++++++++++++++++++++++++++++----
include/configs/taurus.h | 28 +++++++++++++++++++++++++++-
4 files changed, 113 insertions(+), 5 deletions(-)
diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c
index cf8a7f5..2d42488 100644
--- a/board/siemens/smartweb/smartweb.c
+++ b/board/siemens/smartweb/smartweb.c
@@ -25,6 +25,7 @@
#include <asm/arch/at91_pmc.h>
#include <asm/arch/at91_spi.h>
#include <spi.h>
+#include <asm/arch/clk.h>
#include <asm/arch/gpio.h>
#include <watchdog.h>
#ifdef CONFIG_MACB
@@ -108,6 +109,29 @@ static void smartweb_macb_hw_init(void)
}
#endif /* CONFIG_MACB */
+#ifdef CONFIG_USB_GADGET_AT91
+#include <linux/usb/at91_udc.h>
+
+void at91_udp_hw_init(void)
+{
+ at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
+
+ /* Enable PLLB */
+ writel(get_pllb_init(), &pmc->pllbr);
+ while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
+ ;
+
+ /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */
+ at91_periph_clk_enable(ATMEL_ID_UDP);
+
+ writel(AT91SAM926x_PMC_UDP, &pmc->scer);
+}
+
+struct at91_udc_data board_udc_data = {
+ .baseaddr = ATMEL_BASE_UDP0,
+};
+#endif
+
int board_early_init_f(void)
{
/* enable this here, as we have SPL without serial support */
@@ -134,6 +158,11 @@ int board_init(void)
at91_set_gpio_output(AT91_PIN_PC10, 0);
at91_set_gpio_output(AT91_PIN_PC11, 1);
+#ifdef CONFIG_USB_GADGET_AT91
+ at91_udp_hw_init();
+ at91_udc_probe(&board_udc_data);
+#endif
+
return 0;
}
diff --git a/board/siemens/taurus/taurus.c b/board/siemens/taurus/taurus.c
index d10411c..54f67da 100644
--- a/board/siemens/taurus/taurus.c
+++ b/board/siemens/taurus/taurus.c
@@ -272,6 +272,29 @@ void spi_cs_deactivate(struct spi_slave *slave)
at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
}
+#ifdef CONFIG_USB_GADGET_AT91
+#include <linux/usb/at91_udc.h>
+
+void at91_udp_hw_init(void)
+{
+ at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
+
+ /* Enable PLLB */
+ writel(get_pllb_init(), &pmc->pllbr);
+ while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
+ ;
+
+ /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */
+ at91_periph_clk_enable(ATMEL_ID_UDP);
+
+ writel(AT91SAM926x_PMC_UDP, &pmc->scer);
+}
+
+struct at91_udc_data board_udc_data = {
+ .baseaddr = ATMEL_BASE_UDP0,
+};
+#endif
+
int board_init(void)
{
/* adress of boot parameters */
@@ -284,6 +307,10 @@ int board_init(void)
taurus_macb_hw_init();
#endif
at91_spi0_hw_init(TAURUS_SPI_MASK);
+#ifdef CONFIG_USB_GADGET_AT91
+ at91_udp_hw_init();
+ at91_udc_probe(&board_udc_data);
+#endif
return 0;
}
diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 9f22139..baec73b 100644
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -75,7 +75,7 @@
/* Size of malloc() pool */
#define CONFIG_SYS_MALLOC_LEN \
- ROUND(3 * CONFIG_ENV_SIZE + (128 << 10), 0x1000)
+ ROUND(3 * CONFIG_ENV_SIZE + 4*1024*1024, 0x1000)
/* NAND flash settings */
#define CONFIG_NAND_ATMEL
@@ -140,15 +140,42 @@
#if !defined(CONFIG_SPL_BUILD)
/* USB configuration */
+#define CONFIG_CMD_USB
#define CONFIG_USB_ATMEL
#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
#define CONFIG_USB_OHCI_NEW
-#define CONFIG_USB_STORAGE
-#define CONFIG_DOS_PARTITION
#define CONFIG_SYS_USB_OHCI_CPU_INIT
#define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_UHP_BASE
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
+
+#define CONFIG_USB_HOST_ETHER
+#define CONFIG_USB_ETHER_ASIX
+#define CONFIG_USB_ETHER_MCS7830
+
+/* USB DFU support */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_AT91
+
+/* DFU class support */
+#define CONFIG_CMD_DFU
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_NAND
+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
+#define DFU_MANIFEST_POLL_TIMEOUT 25000
+
+/* USB DFU IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x0908
+#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
+#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
+
+#define CONFIG_SYS_CACHELINE_SIZE 0x2000
#endif
/* General Boot Parameter */
@@ -195,7 +222,6 @@
#undef CONFIG_CMD_LOADS
#define CONFIG_CMD_NAND
-#define CONFIG_CMD_USB
#define CONFIG_CMD_FAT
#ifdef CONFIG_MACB
diff --git a/include/configs/taurus.h b/include/configs/taurus.h
index dd35a8f..99cf302 100644
--- a/include/configs/taurus.h
+++ b/include/configs/taurus.h
@@ -128,12 +128,38 @@
/* USB */
#if defined(CONFIG_BOARD_TAURUS)
#define CONFIG_USB_ATMEL
+#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
#define CONFIG_USB_OHCI_NEW
#define CONFIG_SYS_USB_OHCI_CPU_INIT
#define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000
#define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260"
#define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
#define CONFIG_USB_STORAGE
+
+/* USB DFU support */
+#define CONFIG_CMD_MTDPARTS
+#define CONFIG_MTD_DEVICE
+#define CONFIG_MTD_PARTITIONS
+
+#define CONFIG_USB_GADGET
+#define CONFIG_USB_GADGET_AT91
+
+/* DFU class support */
+#define CONFIG_CMD_USB
+#define CONFIG_CMD_DFU
+#define CONFIG_DFU_FUNCTION
+#define CONFIG_DFU_NAND
+#define CONFIG_USBDOWNLOAD_GADGET
+#define CONFIG_USB_GADGET_VBUS_DRAW 2
+#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
+#define DFU_MANIFEST_POLL_TIMEOUT 25000
+
+/* USB DFU IDs */
+#define CONFIG_G_DNL_VENDOR_NUM 0x0908
+#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
+#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
+
+#define CONFIG_SYS_CACHELINE_SIZE 0x2000
#endif
/* SPI EEPROM */
@@ -251,7 +277,7 @@
* Size of malloc() pool
*/
#define CONFIG_SYS_MALLOC_LEN \
- ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
+ ROUND(3 * CONFIG_ENV_SIZE + 4*1024*1024, 0x1000)
/* Defines for SPL */
#define CONFIG_SPL_FRAMEWORK
--
2.1.0
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
2015-06-15 12:42 [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Heiko Schocher
` (2 preceding siblings ...)
2015-06-15 12:43 ` [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support Heiko Schocher
@ 2015-07-20 14:03 ` Lukasz Majewski
2015-07-20 15:20 ` Heiko Schocher
2015-07-21 2:03 ` Marek Vasut
3 siblings, 2 replies; 15+ messages in thread
From: Lukasz Majewski @ 2015-07-20 14:03 UTC (permalink / raw)
To: u-boot
Hi Marek,
> add dfu supprt for at91 sam9260 based boards. The USB
> gadget driver is ported from linux:
>
> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
> context
>
> it drops a lot of checkpatch warnings/errors:
>
> checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
>
> but for further updates I did not fix them.
> The errors are all from this sort:
>
> error: drivers/usb/gadget/at91_udc.c,87: space prohibited before open
> square bracket '['
>
> a lot of "line over 80 characters" warnings ...
>
>
> Heiko Schocher (3):
> ARM: at91: add cpu.h
> usb: gadget: at91_udc: add support for at91_udc
> at91, taurus, smartweb: add dfu support
Marek, do you plan to review this patch series?
(I would need at least one review before I pull the code).
>
> arch/arm/mach-at91/include/mach/cpu.h | 149 +++
> board/siemens/smartweb/smartweb.c | 29 +
> board/siemens/taurus/taurus.c | 27 +
> drivers/usb/gadget/Makefile | 1 +
> drivers/usb/gadget/at91_udc.c | 2203
> +++++++++++++++++++++++++++++++++
> drivers/usb/gadget/at91_udc.h | 171 +++
> include/configs/smartweb.h | 34 +-
> include/configs/taurus.h | 28 +-
> include/linux/usb/at91_udc.h | 20 + 9 files changed, 2657
> insertions(+), 5 deletions(-) create mode 100644
> arch/arm/mach-at91/include/mach/cpu.h create mode 100644
> drivers/usb/gadget/at91_udc.c create mode 100644
> drivers/usb/gadget/at91_udc.h create mode 100644
> include/linux/usb/at91_udc.h
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
2015-07-20 14:03 ` [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Lukasz Majewski
@ 2015-07-20 15:20 ` Heiko Schocher
2015-07-21 5:36 ` Lukasz Majewski
2015-07-21 2:03 ` Marek Vasut
1 sibling, 1 reply; 15+ messages in thread
From: Heiko Schocher @ 2015-07-20 15:20 UTC (permalink / raw)
To: u-boot
Hello Lukasz,
Am 20.07.2015 um 16:03 schrieb Lukasz Majewski:
> Hi Marek,
>
>> add dfu supprt for at91 sam9260 based boards. The USB
>> gadget driver is ported from linux:
>>
>> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
>> context
>>
>> it drops a lot of checkpatch warnings/errors:
>>
>> checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
>>
>> but for further updates I did not fix them.
>> The errors are all from this sort:
>>
>> error: drivers/usb/gadget/at91_udc.c,87: space prohibited before open
>> square bracket '['
>>
>> a lot of "line over 80 characters" warnings ...
>>
>>
>> Heiko Schocher (3):
>> ARM: at91: add cpu.h
>> usb: gadget: at91_udc: add support for at91_udc
>> at91, taurus, smartweb: add dfu support
>
> Marek, do you plan to review this patch series?
>
> (I would need at least one review before I pull the code).
Maybe a Reviewed-by or Acked-by from you (and Marek) is enough,
as it is maybe pickedup by Andreas Biessmann (at91 maintainer)
Thanks!
bye,
Heiko
>
>>
>> arch/arm/mach-at91/include/mach/cpu.h | 149 +++
>> board/siemens/smartweb/smartweb.c | 29 +
>> board/siemens/taurus/taurus.c | 27 +
>> drivers/usb/gadget/Makefile | 1 +
>> drivers/usb/gadget/at91_udc.c | 2203
>> +++++++++++++++++++++++++++++++++
>> drivers/usb/gadget/at91_udc.h | 171 +++
>> include/configs/smartweb.h | 34 +-
>> include/configs/taurus.h | 28 +-
>> include/linux/usb/at91_udc.h | 20 + 9 files changed, 2657
>> insertions(+), 5 deletions(-) create mode 100644
>> arch/arm/mach-at91/include/mach/cpu.h create mode 100644
>> drivers/usb/gadget/at91_udc.c create mode 100644
>> drivers/usb/gadget/at91_udc.h create mode 100644
>> include/linux/usb/at91_udc.h
>>
>
>
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
@ 2015-07-21 1:59 ` Marek Vasut
2015-07-22 14:40 ` Alexandre Belloni
1 sibling, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2015-07-21 1:59 UTC (permalink / raw)
To: u-boot
On Monday, June 15, 2015 at 02:42:59 PM, Heiko Schocher wrote:
> add cpu.h from linux:
>
> 7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
>
> so it is easier to port linux code, which is based on it.
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>
> arch/arm/mach-at91/include/mach/cpu.h | 149
> ++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+)
> create mode 100644 arch/arm/mach-at91/include/mach/cpu.h
>
> diff --git a/arch/arm/mach-at91/include/mach/cpu.h
> b/arch/arm/mach-at91/include/mach/cpu.h new file mode 100644
> index 0000000..a5e698d
> --- /dev/null
> +++ b/arch/arm/mach-at91/include/mach/cpu.h
> @@ -0,0 +1,149 @@
> +/*
> + * from linux:
> + * 7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
> + *
> + * arch/arm/mach-at91/include/mach/cpu.h
> + *
> + * Copyright (C) 2006 SAN People
> + * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD
> <plagnioj@jcrosoft.com> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + *
> + */
> +
> +#ifndef __AT91_MACH_CPU_H__
> +#define __AT91_MACH_CPU_H__
> +
> +#ifdef CONFIG_AT91RM9200
> +#define cpu_is_at91rm9200() (1)
> +#else
> +#define cpu_is_at91rm9200() (0)
> +#endif
The () are not needed .
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support
2015-06-15 12:43 ` [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support Heiko Schocher
@ 2015-07-21 2:02 ` Marek Vasut
2015-07-21 7:02 ` Lukasz Majewski
1 sibling, 0 replies; 15+ messages in thread
From: Marek Vasut @ 2015-07-21 2:02 UTC (permalink / raw)
To: u-boot
On Monday, June 15, 2015 at 02:43:01 PM, Heiko Schocher wrote:
> [root at pollux dfu-util]# ./src/dfu-util -l
> dfu-util 0.8
>
> Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
> Copyright 2010-2014 Tormod Volden and Stefan Schmidt
> This program is Free Software and has ABSOLUTELY NO WARRANTY
> Please report bugs to dfu-util at lists.gnumonks.org
>
> Found DFU: [0908:02d2] ver=0212, devnum=119, cfg=1, intf=0, alt=0,
> name="Linux", serial="UNKNOWN" [root at pollux dfu-util]#
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>
> board/siemens/smartweb/smartweb.c | 29 +++++++++++++++++++++++++++++
> board/siemens/taurus/taurus.c | 27 +++++++++++++++++++++++++++
> include/configs/smartweb.h | 34 ++++++++++++++++++++++++++++++----
> include/configs/taurus.h | 28 +++++++++++++++++++++++++++-
> 4 files changed, 113 insertions(+), 5 deletions(-)
>
> diff --git a/board/siemens/smartweb/smartweb.c
> b/board/siemens/smartweb/smartweb.c index cf8a7f5..2d42488 100644
> --- a/board/siemens/smartweb/smartweb.c
> +++ b/board/siemens/smartweb/smartweb.c
> @@ -25,6 +25,7 @@
> #include <asm/arch/at91_pmc.h>
> #include <asm/arch/at91_spi.h>
> #include <spi.h>
> +#include <asm/arch/clk.h>
> #include <asm/arch/gpio.h>
> #include <watchdog.h>
> #ifdef CONFIG_MACB
> @@ -108,6 +109,29 @@ static void smartweb_macb_hw_init(void)
> }
> #endif /* CONFIG_MACB */
>
> +#ifdef CONFIG_USB_GADGET_AT91
> +#include <linux/usb/at91_udc.h>
> +
> +void at91_udp_hw_init(void)
> +{
> + at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +
> + /* Enable PLLB */
> + writel(get_pllb_init(), &pmc->pllbr);
> + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
> + ;
Unbounded loops are no good :-)
> + /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */
> + at91_periph_clk_enable(ATMEL_ID_UDP);
> +
> + writel(AT91SAM926x_PMC_UDP, &pmc->scer);
> +}
[...]
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
2015-07-20 14:03 ` [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Lukasz Majewski
2015-07-20 15:20 ` Heiko Schocher
@ 2015-07-21 2:03 ` Marek Vasut
2015-08-10 5:14 ` Heiko Schocher
1 sibling, 1 reply; 15+ messages in thread
From: Marek Vasut @ 2015-07-21 2:03 UTC (permalink / raw)
To: u-boot
On Monday, July 20, 2015 at 04:03:08 PM, Lukasz Majewski wrote:
> Hi Marek,
>
> > add dfu supprt for at91 sam9260 based boards. The USB
> > gadget driver is ported from linux:
> >
> > b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
> > context
> >
> > it drops a lot of checkpatch warnings/errors:
> >
> > checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
> >
> > but for further updates I did not fix them.
> > The errors are all from this sort:
> >
> > error: drivers/usb/gadget/at91_udc.c,87: space prohibited before open
> > square bracket '['
> >
> > a lot of "line over 80 characters" warnings ...
> >
> > Heiko Schocher (3):
> > ARM: at91: add cpu.h
> > usb: gadget: at91_udc: add support for at91_udc
> > at91, taurus, smartweb: add dfu support
>
> Marek, do you plan to review this patch series?
>
> (I would need at least one review before I pull the code).
I took a brief look. One thing I don't quite like is the omnipresent #ifdef
__UBOOT__ stuff. I'd much rather love to see some kind of a porting layer
so the driver can just be picked from linux as-is, but that might be too much
hassle.
Otherwise, I'm fine with it, though I nitpicked a bit.
Best regards,
Marek Vasut
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
2015-07-20 15:20 ` Heiko Schocher
@ 2015-07-21 5:36 ` Lukasz Majewski
0 siblings, 0 replies; 15+ messages in thread
From: Lukasz Majewski @ 2015-07-21 5:36 UTC (permalink / raw)
To: u-boot
Hi Heiko,
> Hello Lukasz,
>
> Am 20.07.2015 um 16:03 schrieb Lukasz Majewski:
> > Hi Marek,
> >
> >> add dfu supprt for at91 sam9260 based boards. The USB
> >> gadget driver is ported from linux:
> >>
> >> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
> >> context
> >>
> >> it drops a lot of checkpatch warnings/errors:
> >>
> >> checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
> >>
> >> but for further updates I did not fix them.
> >> The errors are all from this sort:
> >>
> >> error: drivers/usb/gadget/at91_udc.c,87: space prohibited before
> >> open square bracket '['
> >>
> >> a lot of "line over 80 characters" warnings ...
> >>
> >>
> >> Heiko Schocher (3):
> >> ARM: at91: add cpu.h
> >> usb: gadget: at91_udc: add support for at91_udc
> >> at91, taurus, smartweb: add dfu support
> >
> > Marek, do you plan to review this patch series?
> >
> > (I would need at least one review before I pull the code).
>
> Maybe a Reviewed-by or Acked-by from you (and Marek) is enough,
> as it is maybe pickedup by Andreas Biessmann (at91 maintainer)
>
No problem. I will review the code.
> Thanks!
>
> bye,
> Heiko
> >
> >>
> >> arch/arm/mach-at91/include/mach/cpu.h | 149 +++
> >> board/siemens/smartweb/smartweb.c | 29 +
> >> board/siemens/taurus/taurus.c | 27 +
> >> drivers/usb/gadget/Makefile | 1 +
> >> drivers/usb/gadget/at91_udc.c | 2203
> >> +++++++++++++++++++++++++++++++++
> >> drivers/usb/gadget/at91_udc.h | 171 +++
> >> include/configs/smartweb.h | 34 +-
> >> include/configs/taurus.h | 28 +-
> >> include/linux/usb/at91_udc.h | 20 + 9 files changed,
> >> 2657 insertions(+), 5 deletions(-) create mode 100644
> >> arch/arm/mach-at91/include/mach/cpu.h create mode 100644
> >> drivers/usb/gadget/at91_udc.c create mode 100644
> >> drivers/usb/gadget/at91_udc.h create mode 100644
> >> include/linux/usb/at91_udc.h
> >>
> >
> >
> >
>
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc
2015-06-15 12:43 ` [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc Heiko Schocher
@ 2015-07-21 6:59 ` Lukasz Majewski
2015-08-10 5:16 ` Heiko Schocher
0 siblings, 1 reply; 15+ messages in thread
From: Lukasz Majewski @ 2015-07-21 6:59 UTC (permalink / raw)
To: u-boot
Hi Heiko,
> ported from linux:
>
> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
> context
>
IMHO, presented above description is not enough. I'd prefer to see one
patch which adds the code from linux - including the exact commit
message.
Then, u-boot specific adjustments should be applied in a separate patch.
In that way you would:
1. Avoid #ifdef __UBOOT__
2. Make the process of updating code easier
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
> checkpatch detects a lot of errors, but as this code is copied
> from linux, I tend to not fix them, so later updates with
> linux code is easier.
>
> drivers/usb/gadget/Makefile | 1 +
> drivers/usb/gadget/at91_udc.c | 2203
> +++++++++++++++++++++++++++++++++++++++++
> drivers/usb/gadget/at91_udc.h | 171 ++++
> include/linux/usb/at91_udc.h | 20 + 4 files changed, 2395
> insertions(+) create mode 100644 drivers/usb/gadget/at91_udc.c
> create mode 100644 drivers/usb/gadget/at91_udc.h
> create mode 100644 include/linux/usb/at91_udc.h
>
> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
> index 70bb550..22323fa 100644
> --- a/drivers/usb/gadget/Makefile
> +++ b/drivers/usb/gadget/Makefile
> @@ -10,6 +10,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o
> usbstring.o
> # new USB gadget layer dependencies
> ifdef CONFIG_USB_GADGET
> +obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o
> obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o
> obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
> obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o
> diff --git a/drivers/usb/gadget/at91_udc.c
> b/drivers/usb/gadget/at91_udc.c new file mode 100644
> index 0000000..f4ae13b
> --- /dev/null
> +++ b/drivers/usb/gadget/at91_udc.c
> @@
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support
2015-06-15 12:43 ` [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support Heiko Schocher
2015-07-21 2:02 ` Marek Vasut
@ 2015-07-21 7:02 ` Lukasz Majewski
1 sibling, 0 replies; 15+ messages in thread
From: Lukasz Majewski @ 2015-07-21 7:02 UTC (permalink / raw)
To: u-boot
Hi Heiko,
> [root at pollux dfu-util]# ./src/dfu-util -l
> dfu-util 0.8
>
> Copyright 2005-2009 Weston Schmidt, Harald Welte and OpenMoko Inc.
> Copyright 2010-2014 Tormod Volden and Stefan Schmidt
> This program is Free Software and has ABSOLUTELY NO WARRANTY
> Please report bugs to dfu-util at lists.gnumonks.org
>
> Found DFU: [0908:02d2] ver=0212, devnum=119, cfg=1, intf=0, alt=0,
> name="Linux", serial="UNKNOWN" [root at pollux dfu-util]#
>
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>
> board/siemens/smartweb/smartweb.c | 29 +++++++++++++++++++++++++++++
> board/siemens/taurus/taurus.c | 27 +++++++++++++++++++++++++++
> include/configs/smartweb.h | 34
> ++++++++++++++++++++++++++++++---- include/configs/taurus.h
> | 28 +++++++++++++++++++++++++++- 4 files changed, 113 insertions(+),
> 5 deletions(-)
>
> diff --git a/board/siemens/smartweb/smartweb.c
> b/board/siemens/smartweb/smartweb.c index cf8a7f5..2d42488 100644
> --- a/board/siemens/smartweb/smartweb.c
> +++ b/board/siemens/smartweb/smartweb.c
> @@ -25,6 +25,7 @@
> #include <asm/arch/at91_pmc.h>
> #include <asm/arch/at91_spi.h>
> #include <spi.h>
> +#include <asm/arch/clk.h>
> #include <asm/arch/gpio.h>
> #include <watchdog.h>
> #ifdef CONFIG_MACB
> @@ -108,6 +109,29 @@ static void smartweb_macb_hw_init(void)
> }
> #endif /* CONFIG_MACB */
>
> +#ifdef CONFIG_USB_GADGET_AT91
> +#include <linux/usb/at91_udc.h>
> +
> +void at91_udp_hw_init(void)
> +{
> + at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +
> + /* Enable PLLB */
> + writel(get_pllb_init(), &pmc->pllbr);
> + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
> + ;
> +
> + /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */
> + at91_periph_clk_enable(ATMEL_ID_UDP);
> +
> + writel(AT91SAM926x_PMC_UDP, &pmc->scer);
> +}
> +
> +struct at91_udc_data board_udc_data = {
> + .baseaddr = ATMEL_BASE_UDP0,
> +};
> +#endif
> +
> int board_early_init_f(void)
> {
> /* enable this here, as we have SPL without serial support */
> @@ -134,6 +158,11 @@ int board_init(void)
> at91_set_gpio_output(AT91_PIN_PC10, 0);
> at91_set_gpio_output(AT91_PIN_PC11, 1);
>
> +#ifdef CONFIG_USB_GADGET_AT91
> + at91_udp_hw_init();
> + at91_udc_probe(&board_udc_data);
> +#endif
> +
> return 0;
> }
>
> diff --git a/board/siemens/taurus/taurus.c
> b/board/siemens/taurus/taurus.c index d10411c..54f67da 100644
> --- a/board/siemens/taurus/taurus.c
> +++ b/board/siemens/taurus/taurus.c
> @@ -272,6 +272,29 @@ void spi_cs_deactivate(struct spi_slave *slave)
> at91_set_gpio_value(TAURUS_SPI_CS_PIN, 1);
> }
>
> +#ifdef CONFIG_USB_GADGET_AT91
> +#include <linux/usb/at91_udc.h>
> +
> +void at91_udp_hw_init(void)
> +{
> + at91_pmc_t *pmc = (at91_pmc_t *)ATMEL_BASE_PMC;
> +
> + /* Enable PLLB */
> + writel(get_pllb_init(), &pmc->pllbr);
> + while ((readl(&pmc->sr) & AT91_PMC_LOCKB) != AT91_PMC_LOCKB)
> + ;
> +
> + /* Enable UDPCK clock, MCK is enabled in at91_clock_init() */
> + at91_periph_clk_enable(ATMEL_ID_UDP);
> +
> + writel(AT91SAM926x_PMC_UDP, &pmc->scer);
> +}
> +
> +struct at91_udc_data board_udc_data = {
> + .baseaddr = ATMEL_BASE_UDP0,
> +};
> +#endif
> +
> int board_init(void)
> {
> /* adress of boot parameters */
> @@ -284,6 +307,10 @@ int board_init(void)
> taurus_macb_hw_init();
> #endif
> at91_spi0_hw_init(TAURUS_SPI_MASK);
> +#ifdef CONFIG_USB_GADGET_AT91
> + at91_udp_hw_init();
> + at91_udc_probe(&board_udc_data);
> +#endif
>
> return 0;
> }
> diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
> index 9f22139..baec73b 100644
> --- a/include/configs/smartweb.h
> +++ b/include/configs/smartweb.h
> @@ -75,7 +75,7 @@
>
> /* Size of malloc() pool */
> #define CONFIG_SYS_MALLOC_LEN \
> - ROUND(3 * CONFIG_ENV_SIZE + (128 << 10), 0x1000)
> + ROUND(3 * CONFIG_ENV_SIZE + 4*1024*1024, 0x1000)
>
> /* NAND flash settings */
> #define CONFIG_NAND_ATMEL
> @@ -140,15 +140,42 @@
>
> #if !defined(CONFIG_SPL_BUILD)
> /* USB configuration */
> +#define CONFIG_CMD_USB
> #define CONFIG_USB_ATMEL
> #define CONFIG_USB_ATMEL_CLK_SEL_PLLB
> #define CONFIG_USB_OHCI_NEW
> -#define CONFIG_USB_STORAGE
> -#define CONFIG_DOS_PARTITION
> #define CONFIG_SYS_USB_OHCI_CPU_INIT
> #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_UHP_BASE
> #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260"
> #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
> +
> +#define CONFIG_USB_HOST_ETHER
> +#define CONFIG_USB_ETHER_ASIX
> +#define CONFIG_USB_ETHER_MCS7830
> +
> +/* USB DFU support */
> +#define CONFIG_CMD_MTDPARTS
> +#define CONFIG_MTD_DEVICE
> +#define CONFIG_MTD_PARTITIONS
> +
> +#define CONFIG_USB_GADGET
> +#define CONFIG_USB_GADGET_AT91
> +
> +/* DFU class support */
> +#define CONFIG_CMD_DFU
> +#define CONFIG_DFU_FUNCTION
> +#define CONFIG_DFU_NAND
> +#define CONFIG_USBDOWNLOAD_GADGET
> +#define CONFIG_USB_GADGET_VBUS_DRAW 2
> +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
> +#define DFU_MANIFEST_POLL_TIMEOUT 25000
> +
> +/* USB DFU IDs */
> +#define CONFIG_G_DNL_VENDOR_NUM 0x0908
> +#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
> +#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
> +
> +#define CONFIG_SYS_CACHELINE_SIZE 0x2000
> #endif
>
> /* General Boot Parameter */
> @@ -195,7 +222,6 @@
> #undef CONFIG_CMD_LOADS
>
> #define CONFIG_CMD_NAND
> -#define CONFIG_CMD_USB
> #define CONFIG_CMD_FAT
>
> #ifdef CONFIG_MACB
> diff --git a/include/configs/taurus.h b/include/configs/taurus.h
> index dd35a8f..99cf302 100644
> --- a/include/configs/taurus.h
> +++ b/include/configs/taurus.h
> @@ -128,12 +128,38 @@
> /* USB */
> #if defined(CONFIG_BOARD_TAURUS)
> #define CONFIG_USB_ATMEL
> +#define CONFIG_USB_ATMEL_CLK_SEL_PLLB
> #define CONFIG_USB_OHCI_NEW
> #define CONFIG_SYS_USB_OHCI_CPU_INIT
> #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000
> #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260"
> #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2
> #define CONFIG_USB_STORAGE
> +
> +/* USB DFU support */
> +#define CONFIG_CMD_MTDPARTS
> +#define CONFIG_MTD_DEVICE
> +#define CONFIG_MTD_PARTITIONS
> +
> +#define CONFIG_USB_GADGET
> +#define CONFIG_USB_GADGET_AT91
> +
> +/* DFU class support */
> +#define CONFIG_CMD_USB
> +#define CONFIG_CMD_DFU
> +#define CONFIG_DFU_FUNCTION
> +#define CONFIG_DFU_NAND
> +#define CONFIG_USBDOWNLOAD_GADGET
> +#define CONFIG_USB_GADGET_VBUS_DRAW 2
> +#define CONFIG_SYS_DFU_DATA_BUF_SIZE (1 << 20)
^^^^^^^^^ Here you can use SZ_1M
Please correct other places where you can replace (1 << X) with
SZ_X.
> +#define DFU_MANIFEST_POLL_TIMEOUT 25000
> +
> +/* USB DFU IDs */
> +#define CONFIG_G_DNL_VENDOR_NUM 0x0908
> +#define CONFIG_G_DNL_PRODUCT_NUM 0x02d2
> +#define CONFIG_G_DNL_MANUFACTURER "Siemens AG"
> +
> +#define CONFIG_SYS_CACHELINE_SIZE 0x2000
> #endif
>
> /* SPI EEPROM */
> @@ -251,7 +277,7 @@
> * Size of malloc() pool
> */
> #define CONFIG_SYS_MALLOC_LEN \
> - ROUND(3 * CONFIG_ENV_SIZE + 128*1024, 0x1000)
> + ROUND(3 * CONFIG_ENV_SIZE + 4*1024*1024, 0x1000)
>
> /* Defines for SPL */
> #define CONFIG_SPL_FRAMEWORK
--
Best regards,
Lukasz Majewski
Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
2015-07-21 1:59 ` Marek Vasut
@ 2015-07-22 14:40 ` Alexandre Belloni
1 sibling, 0 replies; 15+ messages in thread
From: Alexandre Belloni @ 2015-07-22 14:40 UTC (permalink / raw)
To: u-boot
Hi,
On 15/06/2015 at 14:42:59 +0200, Heiko Schocher wrote :
> add cpu.h from linux:
>
> 7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
>
> so it is easier to port linux code, which is based on it.
>
That file doesn't exist anymore, see
f56d8f7c29320abe6f923fa1b3cb7adcc3252a24 and I think the cpu_is_xxx removal
was finished a few linux versions ago so you should not need that.
> Signed-off-by: Heiko Schocher <hs@denx.de>
> ---
>
> arch/arm/mach-at91/include/mach/cpu.h | 149 ++++++++++++++++++++++++++++++++++
> 1 file changed, 149 insertions(+)
> create mode 100644 arch/arm/mach-at91/include/mach/cpu.h
>
> diff --git a/arch/arm/mach-at91/include/mach/cpu.h b/arch/arm/mach-at91/include/mach/cpu.h
> new file mode 100644
> index 0000000..a5e698d
> --- /dev/null
> +++ b/arch/arm/mach-at91/include/mach/cpu.h
> @@ -0,0 +1,149 @@
> +/*
> + * from linux:
> + * 7538ec7d1e5: ARM: at91: remove no-MMU at91x40 support
> + *
> + * arch/arm/mach-at91/include/mach/cpu.h
> + *
> + * Copyright (C) 2006 SAN People
> + * Copyright (C) 2011 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> + *
> + * SPDX-License-Identifier: GPL-2.0+
> + *
> + */
> +
> +#ifndef __AT91_MACH_CPU_H__
> +#define __AT91_MACH_CPU_H__
> +
> +#ifdef CONFIG_AT91RM9200
> +#define cpu_is_at91rm9200() (1)
> +#else
> +#define cpu_is_at91rm9200() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9260
> +#define cpu_is_at91sam9260() (1)
> +#else
> +#define cpu_is_at91sam9260() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G20
> +#define cpu_is_at91sam9g20() (1)
> +#else
> +#define cpu_is_at91sam9g20() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9XE
> +#define cpu_is_at91sam9xe() (1)
> +#else
> +#define cpu_is_at91sam9xe() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9261
> +#define cpu_is_at91sam9261() (1)
> +#else
> +#define cpu_is_at91sam9261() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G10
> +#define cpu_is_at91sam9g10() (1)
> +#else
> +#define cpu_is_at91sam9g10() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9263
> +#define cpu_is_at91sam9263() (1)
> +#else
> +#define cpu_is_at91sam9263() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9RL
> +#define cpu_is_at91sam9rl() (1)
> +#else
> +#define cpu_is_at91sam9rl() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G45
> +#define cpu_is_at91sam9g45() (1)
> +#else
> +#define cpu_is_at91sam9g45() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G45ES
> +#define cpu_is_at91sam9g45es() (1)
> +#else
> +#define cpu_is_at91sam9g45es() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9M10
> +#define cpu_is_at91sam9m10() (1)
> +#else
> +#define cpu_is_at91sam9m10() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G46
> +#define cpu_is_at91sam9g46() (1)
> +#else
> +#define cpu_is_at91sam9g46() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9M11
> +#define cpu_is_at91sam9m11() (1)
> +#else
> +#define cpu_is_at91sam9m11() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9X5
> +#define cpu_is_at91sam9x5() (1)
> +#else
> +#define cpu_is_at91sam9x5() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G15
> +#define cpu_is_at91sam9g15() (1)
> +#else
> +#define cpu_is_at91sam9g15() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G35
> +#define cpu_is_at91sam9g35() (1)
> +#else
> +#define cpu_is_at91sam9g35() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9X35
> +#define cpu_is_at91sam9x35() (1)
> +#else
> +#define cpu_is_at91sam9x35() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9G25
> +#define cpu_is_at91sam9g25() (1)
> +#else
> +#define cpu_is_at91sam9g25() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9X25
> +#define cpu_is_at91sam9x25() (1)
> +#else
> +#define cpu_is_at91sam9x25() (0)
> +#endif
> +
> +#ifdef CONFIG_AT91SAM9N12
> +#define cpu_is_at91sam9n12() (1)
> +#else
> +#define cpu_is_at91sam9n12() (0)
> +#endif
> +
> +#ifdef CONFIG_SAMA5D3
> +#define cpu_is_sama5d3() (1)
> +#else
> +#define cpu_is_sama5d3() (0)
> +#endif
> +
> +#ifdef CONFIG_SAMA5D4
> +#define cpu_is_sama5d4() (1)
> +#else
> +#define cpu_is_sama5d4() (0)
> +#endif
> +
> +#endif
> --
> 2.1.0
>
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>
--
Alexandre Belloni
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards
2015-07-21 2:03 ` Marek Vasut
@ 2015-08-10 5:14 ` Heiko Schocher
0 siblings, 0 replies; 15+ messages in thread
From: Heiko Schocher @ 2015-08-10 5:14 UTC (permalink / raw)
To: u-boot
Hello Marek,
Am 21.07.2015 um 04:03 schrieb Marek Vasut:
> On Monday, July 20, 2015 at 04:03:08 PM, Lukasz Majewski wrote:
>> Hi Marek,
>>
>>> add dfu supprt for at91 sam9260 based boards. The USB
>>> gadget driver is ported from linux:
>>>
>>> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
>>> context
>>>
>>> it drops a lot of checkpatch warnings/errors:
>>>
>>> checkpatch.pl found 12 error(s), 31 warning(s), 43 checks(s)
>>>
>>> but for further updates I did not fix them.
>>> The errors are all from this sort:
>>>
>>> error: drivers/usb/gadget/at91_udc.c,87: space prohibited before open
>>> square bracket '['
>>>
>>> a lot of "line over 80 characters" warnings ...
>>>
>>> Heiko Schocher (3):
>>> ARM: at91: add cpu.h
>>> usb: gadget: at91_udc: add support for at91_udc
>>> at91, taurus, smartweb: add dfu support
>>
>> Marek, do you plan to review this patch series?
>>
>> (I would need at least one review before I pull the code).
>
> I took a brief look. One thing I don't quite like is the omnipresent #ifdef
> __UBOOT__ stuff. I'd much rather love to see some kind of a porting layer
> so the driver can just be picked from linux as-is, but that might be too much
> hassle.
Yes, such a layer would be beautiful, but it is possible? We have
no processes/task switching in U-Boot ... a lot of board do not use
irqs ...
> Otherwise, I'm fine with it, though I nitpicked a bit.
I just prepare a v2 ...
bye,
Heiko
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 15+ messages in thread
* [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc
2015-07-21 6:59 ` Lukasz Majewski
@ 2015-08-10 5:16 ` Heiko Schocher
0 siblings, 0 replies; 15+ messages in thread
From: Heiko Schocher @ 2015-08-10 5:16 UTC (permalink / raw)
To: u-boot
Hello Luaksz,
Am 21.07.2015 um 08:59 schrieb Lukasz Majewski:
> Hi Heiko,
>
>> ported from linux:
>>
>> b2ba27a5c56ff: usb: gadget: at91_udc: move prepare clk into process
>> context
>>
>
> IMHO, presented above description is not enough. I'd prefer to see one
> patch which adds the code from linux - including the exact commit
> message.
Ok, I change this.
> Then, u-boot specific adjustments should be applied in a separate patch.
>
> In that way you would:
> 1. Avoid #ifdef __UBOOT__
Hmm.. I change this, but I do not hate this define, if I debug in the
Code I immediately see, if it is linux code, or U-Boot specific ...
we had such a discussion also on other places ... maybe we need
here a decision, if we remove this define complete?
> 2. Make the process of updating code easier
I soon post a v2, just did a rebase and found some compile errors
for the smartweb board ...
bye,
Heiko
>
>
>> Signed-off-by: Heiko Schocher <hs@denx.de>
>> ---
>> checkpatch detects a lot of errors, but as this code is copied
>> from linux, I tend to not fix them, so later updates with
>> linux code is easier.
>>
>> drivers/usb/gadget/Makefile | 1 +
>> drivers/usb/gadget/at91_udc.c | 2203
>> +++++++++++++++++++++++++++++++++++++++++
>> drivers/usb/gadget/at91_udc.h | 171 ++++
>> include/linux/usb/at91_udc.h | 20 + 4 files changed, 2395
>> insertions(+) create mode 100644 drivers/usb/gadget/at91_udc.c
>> create mode 100644 drivers/usb/gadget/at91_udc.h
>> create mode 100644 include/linux/usb/at91_udc.h
>>
>> diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile
>> index 70bb550..22323fa 100644
>> --- a/drivers/usb/gadget/Makefile
>> +++ b/drivers/usb/gadget/Makefile
>> @@ -10,6 +10,7 @@ obj-$(CONFIG_USB_ETHER) += epautoconf.o config.o
>> usbstring.o
>> # new USB gadget layer dependencies
>> ifdef CONFIG_USB_GADGET
>> +obj-$(CONFIG_USB_GADGET_AT91) += at91_udc.o
>> obj-$(CONFIG_USB_GADGET_ATMEL_USBA) += atmel_usba_udc.o
>> obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG) += s3c_udc_otg.o
>> obj-$(CONFIG_USB_GADGET_S3C_UDC_OTG_PHY) += s3c_udc_otg_phy.o
>> diff --git a/drivers/usb/gadget/at91_udc.c
>> b/drivers/usb/gadget/at91_udc.c new file mode 100644
>> index 0000000..f4ae13b
>> --- /dev/null
>> +++ b/drivers/usb/gadget/at91_udc.c
>> @@
>
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
^ permalink raw reply [flat|nested] 15+ messages in thread
end of thread, other threads:[~2015-08-10 5:16 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-15 12:42 [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Heiko Schocher
2015-06-15 12:42 ` [U-Boot] [PATCH 1/3] ARM: at91: add cpu.h Heiko Schocher
2015-07-21 1:59 ` Marek Vasut
2015-07-22 14:40 ` Alexandre Belloni
2015-06-15 12:43 ` [U-Boot] [PATCH 2/3] usb: gadget: at91_udc: add support for at91_udc Heiko Schocher
2015-07-21 6:59 ` Lukasz Majewski
2015-08-10 5:16 ` Heiko Schocher
2015-06-15 12:43 ` [U-Boot] [PATCH 3/3] at91, taurus, smartweb: add dfu support Heiko Schocher
2015-07-21 2:02 ` Marek Vasut
2015-07-21 7:02 ` Lukasz Majewski
2015-07-20 14:03 ` [U-Boot] [PATCH 0/3] add dfu support for at91 sam9260 based boards Lukasz Majewski
2015-07-20 15:20 ` Heiko Schocher
2015-07-21 5:36 ` Lukasz Majewski
2015-07-21 2:03 ` Marek Vasut
2015-08-10 5:14 ` Heiko Schocher
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox