| Message ID | 201211200017.58484.marex@denx.de |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
On Tue, Nov 20, 2012 at 12:17:58AM +0100, Marek Vasut wrote: > Tom, please apply this onto u-boot/master ... I've been waiting for you to > return with this pull. > > The following changes since commit 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1: > > Merge branch 'master' of git://git.denx.de/u-boot-video (2012-11-19 09:28:04 > -0700) > > are available in the git repository at: > > > git://git.denx.de/u-boot-usb.git master > > for you to fetch changes up to 7bae844f2dacd1b75f65e37624778a15e132f5e1: > > usb: r8a6659: Fix build by missing of parenthesis (2012-11-20 00:16:08 +0100) > > ---------------------------------------------------------------- > Allen Martin (4): > USB: make usb_kbd obey USB DMA alignment requirements > tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h > tegra: Enable USB keyboard > USB: add arrow key support to usb_kbd > > Ilya Yanok (13): > linux/usb/ch9.h: update with the version from Linux tree > usb: use linux/usb/ch9.h instead of usbdescriptors.h > musb-new: port of Linux musb driver > musb-new: dsps backend driver > am33xx: init OTG hardware and new musb gadget driver > am335x_evm: enable both musb gadget and host > musb-new: am35x backend driver > OMAP3: am35x_def.h: add USB defines > OMAP3: am35x: add musb functions > am3517_evm: switch to musb-new > musb-new: omap2plus backend driver > omap3_beagle: add musb-new init > omap3_beagle: use new MUSB intstead of the old one > > Jeroen Hofstee (1): > boards: remove the no longer used CONFIG_EHCI_DCACHE > > Nobuhiro Iwamatsu (2): > usb: r8a66597: Switched from variable to only macro > usb: r8a6659: Fix build by missing of parenthesis > > Makefile | 1 + > arch/arm/cpu/armv7/am33xx/board.c | 85 +++ > arch/arm/cpu/armv7/am33xx/clock.c | 8 + > arch/arm/cpu/armv7/omap3/Makefile | 1 + > arch/arm/cpu/armv7/omap3/am35x_musb.c | 75 +++ > arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- > arch/arm/include/asm/arch-am33xx/hardware.h | 4 + > arch/arm/include/asm/arch-omap3/am35x_def.h | 27 + > arch/arm/include/asm/arch-omap3/musb.h | 28 + > arch/arm/include/asm/omap_musb.h | 32 + > arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c | 2 +- > arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 2 +- > arch/powerpc/cpu/ppc4xx/usb_ohci.c | 2 +- > board/logicpd/am3517evm/am3517evm.c | 74 +++ > board/ti/am335x/board.c | 23 +- > board/ti/beagle/beagle.c | 43 ++ > common/cmd_usb.c | 2 +- > common/usb.c | 4 +- > common/usb_kbd.c | 18 +- > drivers/usb/gadget/config.c | 1 - > drivers/usb/gadget/epautoconf.c | 1 - > drivers/usb/gadget/ether.c | 1 - > drivers/usb/gadget/gadget_chips.h | 4 +- > drivers/usb/gadget/s3c_udc_otg.c | 1 - > drivers/usb/gadget/usbstring.c | 1 - > drivers/usb/host/ehci-hcd.c | 16 +- > drivers/usb/host/isp116x-hcd.c | 2 +- > drivers/usb/host/ohci-hcd.c | 2 +- > drivers/usb/host/ohci-s3c24xx.c | 2 +- > drivers/usb/host/r8a66597-hcd.c | 17 +- > drivers/usb/host/sl811-hcd.c | 2 +- > drivers/usb/musb-new/Makefile | 39 ++ > drivers/usb/musb-new/am35x.c | 709 +++++++++++++++++++++ > drivers/usb/musb-new/linux-compat.h | 116 ++++ > drivers/usb/musb-new/musb_core.c | 2497 > ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/usb/musb-new/musb_core.h | 623 +++++++++++++++++++ > drivers/usb/musb-new/musb_debug.h | 58 ++ > drivers/usb/musb-new/musb_dma.h | 186 ++++++ > drivers/usb/musb-new/musb_dsps.c | 771 +++++++++++++++++++++++ > drivers/usb/musb-new/musb_gadget.c | 2333 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/usb/musb-new/musb_gadget.h | 130 ++++ > drivers/usb/musb-new/musb_gadget_ep0.c | 1089 > ++++++++++++++++++++++++++++++++ > drivers/usb/musb-new/musb_host.c | 2400 > +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ > drivers/usb/musb-new/musb_host.h | 114 ++++ > drivers/usb/musb-new/musb_io.h | 146 +++++ > drivers/usb/musb-new/musb_regs.h | 645 +++++++++++++++++++ > drivers/usb/musb-new/musb_uboot.c | 237 +++++++ > drivers/usb/musb-new/omap2430.c | 626 +++++++++++++++++++ > drivers/usb/musb-new/omap2430.h | 56 ++ > drivers/usb/musb-new/usb-compat.h | 88 +++ > drivers/usb/musb/musb_core.h | 3 +- > drivers/usb/musb/musb_hcd.c | 5 +- > include/configs/am335x_evm.h | 27 + > include/configs/am3517_evm.h | 37 +- > include/configs/lwmon5.h | 1 - > include/configs/mcx.h | 1 - > include/configs/omap3_beagle.h | 14 +- > include/configs/seaboard.h | 6 +- > include/configs/sequoia.h | 3 - > include/configs/tam3517-common.h | 2 - > include/configs/tegra-common-post.h | 19 + > include/configs/tegra20-common.h | 5 - > include/configs/vct.h | 1 - > include/configs/ventana.h | 3 + > include/linux/usb/ch9.h | 514 +++++++++++++++- > include/linux/usb/musb.h | 162 +++++ > include/usb.h | 19 +- > include/usb/s3c_udc.h | 1 - > include/usb_defs.h | 6 - > 69 files changed, 14063 insertions(+), 121 deletions(-) > create mode 100644 arch/arm/cpu/armv7/omap3/am35x_musb.c > create mode 100644 arch/arm/include/asm/arch-omap3/musb.h > create mode 100644 arch/arm/include/asm/omap_musb.h > create mode 100644 drivers/usb/musb-new/Makefile > create mode 100644 drivers/usb/musb-new/am35x.c > create mode 100644 drivers/usb/musb-new/linux-compat.h > create mode 100644 drivers/usb/musb-new/musb_core.c > create mode 100644 drivers/usb/musb-new/musb_core.h > create mode 100644 drivers/usb/musb-new/musb_debug.h > create mode 100644 drivers/usb/musb-new/musb_dma.h > create mode 100644 drivers/usb/musb-new/musb_dsps.c > create mode 100644 drivers/usb/musb-new/musb_gadget.c > create mode 100644 drivers/usb/musb-new/musb_gadget.h > create mode 100644 drivers/usb/musb-new/musb_gadget_ep0.c > create mode 100644 drivers/usb/musb-new/musb_host.c > create mode 100644 drivers/usb/musb-new/musb_host.h > create mode 100644 drivers/usb/musb-new/musb_io.h > create mode 100644 drivers/usb/musb-new/musb_regs.h > create mode 100644 drivers/usb/musb-new/musb_uboot.c > create mode 100644 drivers/usb/musb-new/omap2430.c > create mode 100644 drivers/usb/musb-new/omap2430.h > create mode 100644 drivers/usb/musb-new/usb-compat.h > create mode 100644 include/linux/usb/musb.h Applied to u-boot/master, thanks!
Tom, please apply this onto u-boot/master ... I've been waiting for you to return with this pull. The following changes since commit 178d0cc1a4c73c3341afbeb2a93b172de8c96bd1: Merge branch 'master' of git://git.denx.de/u-boot-video (2012-11-19 09:28:04 -0700) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 7bae844f2dacd1b75f65e37624778a15e132f5e1: usb: r8a6659: Fix build by missing of parenthesis (2012-11-20 00:16:08 +0100) ---------------------------------------------------------------- Allen Martin (4): USB: make usb_kbd obey USB DMA alignment requirements tegra: move TEGRA_DEVICE_SETTINGS to tegra-common-post.h tegra: Enable USB keyboard USB: add arrow key support to usb_kbd Ilya Yanok (13): linux/usb/ch9.h: update with the version from Linux tree usb: use linux/usb/ch9.h instead of usbdescriptors.h musb-new: port of Linux musb driver musb-new: dsps backend driver am33xx: init OTG hardware and new musb gadget driver am335x_evm: enable both musb gadget and host musb-new: am35x backend driver OMAP3: am35x_def.h: add USB defines OMAP3: am35x: add musb functions am3517_evm: switch to musb-new musb-new: omap2plus backend driver omap3_beagle: add musb-new init omap3_beagle: use new MUSB intstead of the old one Jeroen Hofstee (1): boards: remove the no longer used CONFIG_EHCI_DCACHE Nobuhiro Iwamatsu (2): usb: r8a66597: Switched from variable to only macro usb: r8a6659: Fix build by missing of parenthesis Makefile | 1 + arch/arm/cpu/armv7/am33xx/board.c | 85 +++ arch/arm/cpu/armv7/am33xx/clock.c | 8 + arch/arm/cpu/armv7/omap3/Makefile | 1 + arch/arm/cpu/armv7/omap3/am35x_musb.c | 75 +++ arch/arm/include/asm/arch-am33xx/cpu.h | 11 +- arch/arm/include/asm/arch-am33xx/hardware.h | 4 + arch/arm/include/asm/arch-omap3/am35x_def.h | 27 + arch/arm/include/asm/arch-omap3/musb.h | 28 + arch/arm/include/asm/omap_musb.h | 32 + arch/mips/cpu/mips32/au1x00/au1x00_usb_ohci.c | 2 +- arch/powerpc/cpu/mpc5xxx/usb_ohci.c | 2 +- arch/powerpc/cpu/ppc4xx/usb_ohci.c | 2 +- board/logicpd/am3517evm/am3517evm.c | 74 +++ board/ti/am335x/board.c | 23 +- board/ti/beagle/beagle.c | 43 ++ common/cmd_usb.c | 2 +- common/usb.c | 4 +- common/usb_kbd.c | 18 +- drivers/usb/gadget/config.c | 1 - drivers/usb/gadget/epautoconf.c | 1 - drivers/usb/gadget/ether.c | 1 - drivers/usb/gadget/gadget_chips.h | 4 +- drivers/usb/gadget/s3c_udc_otg.c | 1 - drivers/usb/gadget/usbstring.c | 1 - drivers/usb/host/ehci-hcd.c | 16 +- drivers/usb/host/isp116x-hcd.c | 2 +- drivers/usb/host/ohci-hcd.c | 2 +- drivers/usb/host/ohci-s3c24xx.c | 2 +- drivers/usb/host/r8a66597-hcd.c | 17 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/musb-new/Makefile | 39 ++ drivers/usb/musb-new/am35x.c | 709 +++++++++++++++++++++ drivers/usb/musb-new/linux-compat.h | 116 ++++ drivers/usb/musb-new/musb_core.c | 2497 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb-new/musb_core.h | 623 +++++++++++++++++++ drivers/usb/musb-new/musb_debug.h | 58 ++ drivers/usb/musb-new/musb_dma.h | 186 ++++++ drivers/usb/musb-new/musb_dsps.c | 771 +++++++++++++++++++++++ drivers/usb/musb-new/musb_gadget.c | 2333 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb-new/musb_gadget.h | 130 ++++ drivers/usb/musb-new/musb_gadget_ep0.c | 1089 ++++++++++++++++++++++++++++++++ drivers/usb/musb-new/musb_host.c | 2400 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/usb/musb-new/musb_host.h | 114 ++++ drivers/usb/musb-new/musb_io.h | 146 +++++ drivers/usb/musb-new/musb_regs.h | 645 +++++++++++++++++++ drivers/usb/musb-new/musb_uboot.c | 237 +++++++ drivers/usb/musb-new/omap2430.c | 626 +++++++++++++++++++ drivers/usb/musb-new/omap2430.h | 56 ++ drivers/usb/musb-new/usb-compat.h | 88 +++ drivers/usb/musb/musb_core.h | 3 +- drivers/usb/musb/musb_hcd.c | 5 +- include/configs/am335x_evm.h | 27 + include/configs/am3517_evm.h | 37 +- include/configs/lwmon5.h | 1 - include/configs/mcx.h | 1 - include/configs/omap3_beagle.h | 14 +- include/configs/seaboard.h | 6 +- include/configs/sequoia.h | 3 - include/configs/tam3517-common.h | 2 - include/configs/tegra-common-post.h | 19 + include/configs/tegra20-common.h | 5 - include/configs/vct.h | 1 - include/configs/ventana.h | 3 + include/linux/usb/ch9.h | 514 +++++++++++++++- include/linux/usb/musb.h | 162 +++++ include/usb.h | 19 +- include/usb/s3c_udc.h | 1 - include/usb_defs.h | 6 - 69 files changed, 14063 insertions(+), 121 deletions(-) create mode 100644 arch/arm/cpu/armv7/omap3/am35x_musb.c create mode 100644 arch/arm/include/asm/arch-omap3/musb.h create mode 100644 arch/arm/include/asm/omap_musb.h create mode 100644 drivers/usb/musb-new/Makefile create mode 100644 drivers/usb/musb-new/am35x.c create mode 100644 drivers/usb/musb-new/linux-compat.h create mode 100644 drivers/usb/musb-new/musb_core.c create mode 100644 drivers/usb/musb-new/musb_core.h create mode 100644 drivers/usb/musb-new/musb_debug.h create mode 100644 drivers/usb/musb-new/musb_dma.h create mode 100644 drivers/usb/musb-new/musb_dsps.c create mode 100644 drivers/usb/musb-new/musb_gadget.c create mode 100644 drivers/usb/musb-new/musb_gadget.h create mode 100644 drivers/usb/musb-new/musb_gadget_ep0.c create mode 100644 drivers/usb/musb-new/musb_host.c create mode 100644 drivers/usb/musb-new/musb_host.h create mode 100644 drivers/usb/musb-new/musb_io.h create mode 100644 drivers/usb/musb-new/musb_regs.h create mode 100644 drivers/usb/musb-new/musb_uboot.c create mode 100644 drivers/usb/musb-new/omap2430.c create mode 100644 drivers/usb/musb-new/omap2430.h create mode 100644 drivers/usb/musb-new/usb-compat.h create mode 100644 include/linux/usb/musb.h