
The following changes since commit c4eba6ec5c58083b38340724c006294c7a4fe2eb:
common/usb_kbd.c: fix bug introduced in commit 00b7d6e (2011-12-09 12:09:35 +0100)
are available in the git repository at: git://git.denx.de/u-boot-usb.git master
Lei Wen (1): USB: gadaget: add Marvell controller support
Lukasz Majewski (3): usb:gadget:s5p USB Device Controller (UDC) implementation usb:gadget:s5p Enable the USB Gadget framework at GONI usb:gadget:s5p Enable the USB Gadget framework at C210 Universal
Marek Vasut (5): USB: Add functionality to poll the USB keyboard via control EP USB: Rework usb_kbd.c USB: Drop dead code from usb_kbd.c USB: Fix complaints about strict aliasing in OHCI-HCD USB: Add usb_event_poll() to get keyboards working with EHCI
Stefan Herbrechtsmeier (4): pxa: fix usb host register mismatch pxa: activate the first usb host port on pxa27x by default pxa: convert pxa27x_udc to use read and write functions usbtty: init endpoints prior to startup events
Stefan Kristiansson (1): usb: align usb_endpoint_descriptor to 16-bit boundary
Veli-Pekka Peltola (2): cosmetic: remove excess whitespace from usb command help usb: add help for missing start subcommand
Wolfgang Grandegger (1): ehci-fsl: correct size of ehci caplength
arch/arm/cpu/pxa/usb.c | 6 +- arch/arm/include/asm/arch-pxa/pxa-regs.h | 10 +- arch/arm/include/asm/arch-s5pc1xx/cpu.h | 4 + arch/arm/include/asm/arch-s5pc2xx/cpu.h | 3 + board/samsung/goni/goni.c | 48 +- board/samsung/universal_c210/universal.c | 48 + common/cmd_usb.c | 16 +- common/usb_kbd.c | 928 +++++++------------ drivers/serial/usbtty.c | 4 +- drivers/usb/gadget/Makefile | 5 + drivers/usb/gadget/gadget_chips.h | 7 + drivers/usb/gadget/mv_udc.c | 499 ++++++++++ drivers/usb/gadget/pxa27x_udc.c | 183 ++-- drivers/usb/gadget/regs-otg.h | 271 ++++++ drivers/usb/gadget/s3c_udc_otg.c | 892 ++++++++++++++++++ drivers/usb/gadget/s3c_udc_otg_xfer_dma.c | 1444 +++++++++++++++++++++++++++++ drivers/usb/host/ehci-hcd.c | 33 +- drivers/usb/host/ohci-hcd.c | 75 +- include/configs/s5p_goni.h | 3 + include/configs/s5pc210_universal.h | 4 + include/usb/ehci-fsl.h | 25 +- include/usb/lin_gadget_compat.h | 62 ++ include/usb/mv_udc.h | 151 +++ include/usb/s3c_udc.h | 175 ++++ include/usbdescriptors.h | 2 +- 25 files changed, 4148 insertions(+), 750 deletions(-) create mode 100644 drivers/usb/gadget/mv_udc.c create mode 100644 drivers/usb/gadget/regs-otg.h create mode 100644 drivers/usb/gadget/s3c_udc_otg.c create mode 100644 drivers/usb/gadget/s3c_udc_otg_xfer_dma.c create mode 100644 include/usb/lin_gadget_compat.h create mode 100644 include/usb/mv_udc.h create mode 100644 include/usb/s3c_udc.h

Dear Remy Bohmer,
In message CANqCtQ+6EwsY7kBTc0cd01r38md0gmD8tPvS2A36xwV+8LVBvg@mail.gmail.com you wrote:
The following changes since commit c4eba6ec5c58083b38340724c006294c7a4fe2eb:
common/usb_kbd.c: fix bug introduced in commit 00b7d6e (2011-12-09 12:09:35 +0100)
are available in the git repository at: git://git.denx.de/u-boot-usb.git master
Sorry, this collides with other changes to arch/arm/include/asm/arch-exynos/cpu.h (i. e. the rename of S5PC210 into EXYNOS4).
Most of the conflicts are trivial to resolve, but old S5PC210_PHY_BASE (versus new EXYNOS4_USBPHY_BASE) and old S5PC210_USB_PHY_CONTROL (no new correspondence) may require changes in other parts of the code, too.
Can you please rebase and resubmit?
Sorry for the inconvenience.
Best regards,
Wolfgang Denk
participants (2)
-
Remy Bohmer
-
Wolfgang Denk