* [PATCH v2 0/3] Add USB support for Ingenic JZ4740
@ 2013-12-17 23:55 Apelete Seketeli
2013-12-17 23:55 ` [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote Apelete Seketeli
` (2 more replies)
0 siblings, 3 replies; 8+ messages in thread
From: Apelete Seketeli @ 2013-12-17 23:55 UTC (permalink / raw)
To: linux-usb; +Cc: linux-kernel, Felipe Balbi, Lars-Peter Clausen
Hello,
Following the fix I submitted a few weeks ago, here is a set of
patches that adds USB support for the Ingenic JZ4740 MIPS SoC.
The JZ4740 is found in the Ben NanoNote handheld computer which is
built by the Qi-Hardware community.
Even though Ben NanoNote is already supported in the kernel, we were
relying on an out-of-tree gadget driver to make use of the JZ4740 USB
Device Controller.
The patches that come as a follow-up of this message are an attempt to
provide USB support through an musb glue layer.
Changes since v1:
- usb: musb-jz4740: Don't manually free device managed resources
- usb: musb-jz4740: Move musb_hdrc_config to the glue driver
- usb: musb-jz4740: Move jz4740 specific fifo config to the jz4740 glue
- usb: musb-jz4740: Mask host mode only IRQ bits
- usb: musb-jz4740: Remove set_vbus callback
- usb: musb_gadget: Use is_otg flag to set gadget peripheral mode on reset
Changes were rebased on top of Felipe Balbi's USB Subsystem master
branch, built and tested on device successfully.
The following changes since commit 9bdff34517bc49d8e98558659e077ea9f9df3d60:
Merge branch 'next'
are available in the git repository at:
git://seketeli.fr/~apelete/linux-usb.git musb-jz4740
Apelete Seketeli (3):
mips: qi_lb60: add defconfig for Ben NanoNote
usb: musb: add support for JZ4740 usb device controller
usb: musb: fix setting JZ4740 gadget periphal mode on reset
arch/mips/configs/qi_lb60_defconfig | 188 ++++++++++++++++++++++++
arch/mips/include/asm/mach-jz4740/platform.h | 1 +
arch/mips/jz4740/board-qi_lb60.c | 1 +
arch/mips/jz4740/platform.c | 40 +++--
drivers/usb/musb/Kconfig | 8 +-
drivers/usb/musb/Makefile | 1 +
drivers/usb/musb/jz4740.c | 201 ++++++++++++++++++++++++++
drivers/usb/musb/musb_gadget.c | 10 +-
8 files changed, 432 insertions(+), 18 deletions(-)
create mode 100644 arch/mips/configs/qi_lb60_defconfig
create mode 100644 drivers/usb/musb/jz4740.c
--
1.7.10.4
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote 2013-12-17 23:55 [PATCH v2 0/3] Add USB support for Ingenic JZ4740 Apelete Seketeli @ 2013-12-17 23:55 ` Apelete Seketeli 2013-12-18 14:59 ` Sergei Shtylyov 2013-12-17 23:56 ` [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller Apelete Seketeli 2013-12-17 23:56 ` [PATCH v2 3/3] usb: musb: fix setting JZ4740 gadget periphal mode on reset Apelete Seketeli 2 siblings, 1 reply; 8+ messages in thread From: Apelete Seketeli @ 2013-12-17 23:55 UTC (permalink / raw) To: linux-usb; +Cc: linux-kernel, Felipe Balbi, Lars-Peter Clausen Add defconfig for the Ben NanoNote handheld computer which is built around QI_LB60 board and Ingenic JZ4740 MIPS SoC. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> --- arch/mips/configs/qi_lb60_defconfig | 188 +++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) create mode 100644 arch/mips/configs/qi_lb60_defconfig diff --git a/arch/mips/configs/qi_lb60_defconfig b/arch/mips/configs/qi_lb60_defconfig new file mode 100644 index 0000000..2b96547 --- /dev/null +++ b/arch/mips/configs/qi_lb60_defconfig @@ -0,0 +1,188 @@ +CONFIG_MACH_JZ4740=y +# CONFIG_COMPACTION is not set +# CONFIG_CROSS_MEMORY_ATTACH is not set +CONFIG_HZ_100=y +CONFIG_PREEMPT=y +# CONFIG_SECCOMP is not set +# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_SYSVIPC=y +CONFIG_LOG_BUF_SHIFT=14 +CONFIG_SYSCTL_SYSCALL=y +CONFIG_KALLSYMS_ALL=y +CONFIG_EMBEDDED=y +# CONFIG_VM_EVENT_COUNTERS is not set +# CONFIG_COMPAT_BRK is not set +CONFIG_SLAB=y +CONFIG_MODULES=y +CONFIG_MODULE_UNLOAD=y +# CONFIG_BLK_DEV_BSG is not set +CONFIG_PARTITION_ADVANCED=y +# CONFIG_EFI_PARTITION is not set +# CONFIG_IOSCHED_CFQ is not set +# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +CONFIG_IP_MULTICAST=y +CONFIG_IP_ADVANCED_ROUTER=y +CONFIG_IP_MULTIPLE_TABLES=y +CONFIG_IP_ROUTE_MULTIPATH=y +CONFIG_IP_ROUTE_VERBOSE=y +CONFIG_IP_MROUTE=y +CONFIG_IP_MROUTE_MULTIPLE_TABLES=y +# CONFIG_INET_XFRM_MODE_TRANSPORT is not set +# CONFIG_INET_XFRM_MODE_TUNNEL is not set +# CONFIG_INET_XFRM_MODE_BEET is not set +# CONFIG_INET_LRO is not set +# CONFIG_INET_DIAG is not set +CONFIG_TCP_CONG_ADVANCED=y +# CONFIG_TCP_CONG_BIC is not set +# CONFIG_TCP_CONG_CUBIC is not set +CONFIG_TCP_CONG_WESTWOOD=y +# CONFIG_TCP_CONG_HTCP is not set +# CONFIG_IPV6 is not set +CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" +# CONFIG_FIRMWARE_IN_KERNEL is not set +CONFIG_MTD=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_JZ4740=y +CONFIG_MTD_UBI=y +CONFIG_NETDEVICES=y +# CONFIG_WLAN is not set +# CONFIG_INPUT_MOUSEDEV is not set +CONFIG_INPUT_EVDEV=y +# CONFIG_KEYBOARD_ATKBD is not set +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_MATRIX=y +# CONFIG_INPUT_MOUSE is not set +CONFIG_INPUT_MISC=y +# CONFIG_SERIO is not set +CONFIG_LEGACY_PTY_COUNT=2 +# CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +# CONFIG_SERIAL_8250_DMA is not set +CONFIG_SERIAL_8250_NR_UARTS=2 +CONFIG_SERIAL_8250_RUNTIME_UARTS=2 +# CONFIG_HW_RANDOM is not set +CONFIG_SPI=y +CONFIG_SPI_GPIO=y +CONFIG_POWER_SUPPLY=y +CONFIG_BATTERY_JZ4740=y +CONFIG_CHARGER_GPIO=y +# CONFIG_HWMON is not set +CONFIG_MFD_JZ4740_ADC=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_FB=y +CONFIG_FB_JZ4740=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CLASS_DEVICE is not set +# CONFIG_VGA_CONSOLE is not set +CONFIG_FRAMEBUFFER_CONSOLE=y +CONFIG_LOGO=y +# CONFIG_LOGO_LINUX_MONO is not set +# CONFIG_LOGO_LINUX_VGA16 is not set +# CONFIG_LOGO_LINUX_CLUT224 is not set +CONFIG_SOUND=y +CONFIG_SND=y +# CONFIG_SND_SUPPORT_OLD_API is not set +# CONFIG_SND_VERBOSE_PROCFS is not set +# CONFIG_SND_DRIVERS is not set +# CONFIG_SND_SPI is not set +# CONFIG_SND_MIPS is not set +CONFIG_SND_SOC=y +CONFIG_SND_JZ4740_SOC=y +CONFIG_SND_JZ4740_SOC_QI_LB60=y +CONFIG_USB=y +CONFIG_USB_OTG_BLACKLIST_HUB=y +CONFIG_USB_MUSB_HDRC=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_JZ4740=y +CONFIG_NOP_USB_XCEIV=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_DEBUG=y +CONFIG_USB_ETH=y +# CONFIG_USB_ETH_RNDIS is not set +CONFIG_MMC=y +CONFIG_MMC_UNSAFE_RESUME=y +# CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_JZ4740=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_JZ4740=y +CONFIG_DMADEVICES=y +CONFIG_DMA_JZ4740=y +CONFIG_PWM=y +CONFIG_PWM_JZ4740=y +CONFIG_EXT2_FS=y +CONFIG_EXT3_FS=y +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set +# CONFIG_EXT3_FS_XATTR is not set +# CONFIG_DNOTIFY is not set +CONFIG_VFAT_FS=y +CONFIG_PROC_KCORE=y +# CONFIG_PROC_PAGE_MONITOR is not set +CONFIG_TMPFS=y +CONFIG_JFFS2_FS=y +CONFIG_JFFS2_SUMMARY=y +CONFIG_JFFS2_COMPRESSION_OPTIONS=y +# CONFIG_JFFS2_ZLIB is not set +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +# CONFIG_NETWORK_FILESYSTEMS is not set +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_737=y +CONFIG_NLS_CODEPAGE_775=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_CODEPAGE_852=y +CONFIG_NLS_CODEPAGE_855=y +CONFIG_NLS_CODEPAGE_857=y +CONFIG_NLS_CODEPAGE_860=y +CONFIG_NLS_CODEPAGE_861=y +CONFIG_NLS_CODEPAGE_862=y +CONFIG_NLS_CODEPAGE_863=y +CONFIG_NLS_CODEPAGE_864=y +CONFIG_NLS_CODEPAGE_865=y +CONFIG_NLS_CODEPAGE_866=y +CONFIG_NLS_CODEPAGE_869=y +CONFIG_NLS_CODEPAGE_936=y +CONFIG_NLS_CODEPAGE_950=y +CONFIG_NLS_CODEPAGE_932=y +CONFIG_NLS_CODEPAGE_949=y +CONFIG_NLS_CODEPAGE_874=y +CONFIG_NLS_ISO8859_8=y +CONFIG_NLS_CODEPAGE_1250=y +CONFIG_NLS_CODEPAGE_1251=y +CONFIG_NLS_ASCII=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_ISO8859_2=y +CONFIG_NLS_ISO8859_3=y +CONFIG_NLS_ISO8859_4=y +CONFIG_NLS_ISO8859_5=y +CONFIG_NLS_ISO8859_6=y +CONFIG_NLS_ISO8859_7=y +CONFIG_NLS_ISO8859_9=y +CONFIG_NLS_ISO8859_13=y +CONFIG_NLS_ISO8859_14=y +CONFIG_NLS_ISO8859_15=y +CONFIG_NLS_KOI8_R=y +CONFIG_NLS_KOI8_U=y +CONFIG_NLS_UTF8=y +CONFIG_PRINTK_TIME=y +CONFIG_DEBUG_INFO=y +CONFIG_STRIP_ASM_SYMS=y +CONFIG_READABLE_ASM=y +CONFIG_DEBUG_KMEMLEAK=y +CONFIG_DEBUG_MEMORY_INIT=y +CONFIG_DEBUG_STACKOVERFLOW=y +CONFIG_PANIC_ON_OOPS=y +# CONFIG_FTRACE is not set +CONFIG_KGDB=y +CONFIG_RUNTIME_DEBUG=y +CONFIG_CRYPTO_ZLIB=y +# CONFIG_CRYPTO_ANSI_CPRNG is not set +CONFIG_FONTS=y +CONFIG_FONT_SUN8x16=y -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote 2013-12-17 23:55 ` [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote Apelete Seketeli @ 2013-12-18 14:59 ` Sergei Shtylyov 2013-12-18 16:00 ` Apelete Seketeli 0 siblings, 1 reply; 8+ messages in thread From: Sergei Shtylyov @ 2013-12-18 14:59 UTC (permalink / raw) To: Apelete Seketeli, linux-usb Cc: linux-kernel, Felipe Balbi, Lars-Peter Clausen Hello. On 18-12-2013 3:55, Apelete Seketeli wrote: > Add defconfig for the Ben NanoNote handheld computer which is built > around QI_LB60 board and Ingenic JZ4740 MIPS SoC. > Signed-off-by: Apelete Seketeli <apelete@seketeli.net> > --- > arch/mips/configs/qi_lb60_defconfig | 188 +++++++++++++++++++++++++++++++++++ > 1 file changed, 188 insertions(+) > create mode 100644 arch/mips/configs/qi_lb60_defconfig This should be sent to linux-mips@linux-mips.org and pushed thru the MIPS tree. No need to send this patch to linux-usb. WBR, Sergei ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote 2013-12-18 14:59 ` Sergei Shtylyov @ 2013-12-18 16:00 ` Apelete Seketeli 2013-12-18 18:43 ` Sergei Shtylyov 0 siblings, 1 reply; 8+ messages in thread From: Apelete Seketeli @ 2013-12-18 16:00 UTC (permalink / raw) To: Sergei Shtylyov; +Cc: linux-usb, linux-kernel, Felipe Balbi, Lars-Peter Clausen Hello, On 18-Dec-13, Sergei Shtylyov wrote: > Hello. > > On 18-12-2013 3:55, Apelete Seketeli wrote: > > >Add defconfig for the Ben NanoNote handheld computer which is built > >around QI_LB60 board and Ingenic JZ4740 MIPS SoC. > > >Signed-off-by: Apelete Seketeli <apelete@seketeli.net> > >--- > > arch/mips/configs/qi_lb60_defconfig | 188 +++++++++++++++++++++++++++++++++++ > > 1 file changed, 188 insertions(+) > > create mode 100644 arch/mips/configs/qi_lb60_defconfig > > This should be sent to linux-mips@linux-mips.org and pushed thru > the MIPS tree. No need to send this patch to linux-usb. Understood, will send it to linux-mips@linux-mips.org. Please ignore this patch for USB tree. Cheers. -- Apelete ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote 2013-12-18 16:00 ` Apelete Seketeli @ 2013-12-18 18:43 ` Sergei Shtylyov 0 siblings, 0 replies; 8+ messages in thread From: Sergei Shtylyov @ 2013-12-18 18:43 UTC (permalink / raw) To: Apelete Seketeli Cc: linux-usb, linux-kernel, Felipe Balbi, Lars-Peter Clausen Hello. On 12/18/2013 07:00 PM, Apelete Seketeli wrote: >>> Add defconfig for the Ben NanoNote handheld computer which is built >>> around QI_LB60 board and Ingenic JZ4740 MIPS SoC. >>> Signed-off-by: Apelete Seketeli <apelete@seketeli.net> >>> --- >>> arch/mips/configs/qi_lb60_defconfig | 188 +++++++++++++++++++++++++++++++++++ >>> 1 file changed, 188 insertions(+) >>> create mode 100644 arch/mips/configs/qi_lb60_defconfig >> This should be sent to linux-mips@linux-mips.org and pushed thru >> the MIPS tree. No need to send this patch to linux-usb. > Understood, will send it to linux-mips@linux-mips.org. > Please ignore this patch for USB tree. Generally, please use scripts/get_maintainer.pl to determine where a patch should be mailed to. > Cheers. WBR, Sergei ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller 2013-12-17 23:55 [PATCH v2 0/3] Add USB support for Ingenic JZ4740 Apelete Seketeli 2013-12-17 23:55 ` [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote Apelete Seketeli @ 2013-12-17 23:56 ` Apelete Seketeli 2013-12-19 15:36 ` Felipe Balbi 2013-12-17 23:56 ` [PATCH v2 3/3] usb: musb: fix setting JZ4740 gadget periphal mode on reset Apelete Seketeli 2 siblings, 1 reply; 8+ messages in thread From: Apelete Seketeli @ 2013-12-17 23:56 UTC (permalink / raw) To: linux-usb; +Cc: linux-kernel, Felipe Balbi, Lars-Peter Clausen Add support for Ingenic JZ4740 USB Device Controller through a specific musb glue layer. The platform data already available in tree for that USB Device Controller was previously used by an out-of-tree USB gadget driver which was not relying on the musb driver and was written by Ingenic and the Qi-Hardware community. JZ4740 UDC not being OTG compatible and missing some hardware registers, this musb glue layer is written from scratch to be used in gadget mode only and take silicon design specifics into account. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> --- arch/mips/include/asm/mach-jz4740/platform.h | 1 + arch/mips/jz4740/board-qi_lb60.c | 1 + arch/mips/jz4740/platform.c | 40 +++-- drivers/usb/musb/Kconfig | 8 +- drivers/usb/musb/Makefile | 1 + drivers/usb/musb/jz4740.c | 201 ++++++++++++++++++++++++++ 6 files changed, 235 insertions(+), 17 deletions(-) create mode 100644 drivers/usb/musb/jz4740.c diff --git a/arch/mips/include/asm/mach-jz4740/platform.h b/arch/mips/include/asm/mach-jz4740/platform.h index 05988c2..069b43a 100644 --- a/arch/mips/include/asm/mach-jz4740/platform.h +++ b/arch/mips/include/asm/mach-jz4740/platform.h @@ -21,6 +21,7 @@ extern struct platform_device jz4740_usb_ohci_device; extern struct platform_device jz4740_udc_device; +extern struct platform_device jz4740_udc_xceiv_device; extern struct platform_device jz4740_mmc_device; extern struct platform_device jz4740_rtc_device; extern struct platform_device jz4740_i2c_device; diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c index 8a5ec0e..c01900e 100644 --- a/arch/mips/jz4740/board-qi_lb60.c +++ b/arch/mips/jz4740/board-qi_lb60.c @@ -427,6 +427,7 @@ static struct platform_device qi_lb60_audio_device = { static struct platform_device *jz_platform_devices[] __initdata = { &jz4740_udc_device, + &jz4740_udc_xceiv_device, &jz4740_mmc_device, &jz4740_nand_device, &qi_lb60_keypad, diff --git a/arch/mips/jz4740/platform.c b/arch/mips/jz4740/platform.c index df65677..1be41e2 100644 --- a/arch/mips/jz4740/platform.c +++ b/arch/mips/jz4740/platform.c @@ -21,6 +21,8 @@ #include <linux/dma-mapping.h> +#include <linux/usb/musb.h> + #include <asm/mach-jz4740/platform.h> #include <asm/mach-jz4740/base.h> #include <asm/mach-jz4740/irq.h> @@ -56,29 +58,35 @@ struct platform_device jz4740_usb_ohci_device = { .resource = jz4740_usb_ohci_resources, }; -/* UDC (USB gadget controller) */ -static struct resource jz4740_usb_gdt_resources[] = { - { - .start = JZ4740_UDC_BASE_ADDR, - .end = JZ4740_UDC_BASE_ADDR + 0x1000 - 1, - .flags = IORESOURCE_MEM, +/* USB Device Controller */ +struct platform_device jz4740_udc_xceiv_device = { + .name = "usb_phy_gen_xceiv", + .id = 0, +}; + +static struct resource jz4740_udc_resources[] = { + [0] = { + .start = JZ4740_UDC_BASE_ADDR, + .end = JZ4740_UDC_BASE_ADDR + 0x10000 - 1, + .flags = IORESOURCE_MEM, }, - { - .start = JZ4740_IRQ_UDC, - .end = JZ4740_IRQ_UDC, - .flags = IORESOURCE_IRQ, + [1] = { + .start = JZ4740_IRQ_UDC, + .end = JZ4740_IRQ_UDC, + .flags = IORESOURCE_IRQ, + .name = "mc", }, }; struct platform_device jz4740_udc_device = { - .name = "jz-udc", - .id = -1, - .dev = { - .dma_mask = &jz4740_udc_device.dev.coherent_dma_mask, + .name = "musb-jz4740", + .id = -1, + .dev = { + .dma_mask = &jz4740_udc_device.dev.coherent_dma_mask, .coherent_dma_mask = DMA_BIT_MASK(32), }, - .num_resources = ARRAY_SIZE(jz4740_usb_gdt_resources), - .resource = jz4740_usb_gdt_resources, + .num_resources = ARRAY_SIZE(jz4740_udc_resources), + .resource = jz4740_udc_resources, }; /* MMC/SD controller */ diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig index 57dfc0c..a45ed15 100644 --- a/drivers/usb/musb/Kconfig +++ b/drivers/usb/musb/Kconfig @@ -93,6 +93,12 @@ config USB_MUSB_BLACKFIN config USB_MUSB_UX500 tristate "Ux500 platforms" +config USB_MUSB_JZ4740 + tristate "JZ4740" + depends on MACH_JZ4740 + depends on USB_MUSB_GADGET + depends on USB_OTG_BLACKLIST_HUB + endchoice config USB_MUSB_AM335X_CHILD @@ -100,7 +106,7 @@ config USB_MUSB_AM335X_CHILD choice prompt 'MUSB DMA mode' - default MUSB_PIO_ONLY if ARCH_MULTIPLATFORM + default MUSB_PIO_ONLY if ARCH_MULTIPLATFORM || USB_MUSB_JZ4740 default USB_UX500_DMA if USB_MUSB_UX500 default USB_INVENTRA_DMA if USB_MUSB_OMAP2PLUS || USB_MUSB_BLACKFIN default USB_TI_CPPI_DMA if USB_MUSB_DAVINCI diff --git a/drivers/usb/musb/Makefile b/drivers/usb/musb/Makefile index c5ea5c6..ba49501 100644 --- a/drivers/usb/musb/Makefile +++ b/drivers/usb/musb/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_USB_MUSB_DAVINCI) += davinci.o obj-$(CONFIG_USB_MUSB_DA8XX) += da8xx.o obj-$(CONFIG_USB_MUSB_BLACKFIN) += blackfin.o obj-$(CONFIG_USB_MUSB_UX500) += ux500.o +obj-$(CONFIG_USB_MUSB_JZ4740) += jz4740.o obj-$(CONFIG_USB_MUSB_AM335X_CHILD) += musb_am335x.o diff --git a/drivers/usb/musb/jz4740.c b/drivers/usb/musb/jz4740.c new file mode 100644 index 0000000..5f30537 --- /dev/null +++ b/drivers/usb/musb/jz4740.c @@ -0,0 +1,201 @@ +/* + * Ingenic JZ4740 "glue layer" + * + * Copyright (C) 2013, Apelete Seketeli <apelete@seketeli.net> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +#include <linux/clk.h> +#include <linux/dma-mapping.h> +#include <linux/errno.h> +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/platform_device.h> + +#include "musb_core.h" + +struct jz4740_glue { + struct device *dev; + struct platform_device *musb; + struct clk *clk; +}; + +static irqreturn_t jz4740_musb_interrupt(int irq, void *__hci) +{ + unsigned long flags; + irqreturn_t retval = IRQ_NONE; + struct musb *musb = __hci; + + spin_lock_irqsave(&musb->lock, flags); + + musb->int_usb = musb_readb(musb->mregs, MUSB_INTRUSB); + musb->int_tx = musb_readw(musb->mregs, MUSB_INTRTX); + musb->int_rx = musb_readw(musb->mregs, MUSB_INTRRX); + + /* + * The controller is gadget only, the state of the host mode IRQ bits is + * undefined. Mask them to make sure that the musb driver core will + * never see them set + */ + musb->int_usb &= MUSB_INTR_SUSPEND | MUSB_INTR_RESUME | + MUSB_INTR_RESET | MUSB_INTR_SOF; + + if (musb->int_usb || musb->int_tx || musb->int_rx) + retval = musb_interrupt(musb); + + spin_unlock_irqrestore(&musb->lock, flags); + + return retval; +} + +static struct musb_fifo_cfg jz4740_musb_fifo_cfg[] = { +{ .hw_ep_num = 1, .style = FIFO_TX, .maxpacket = 512, }, +{ .hw_ep_num = 1, .style = FIFO_RX, .maxpacket = 512, }, +{ .hw_ep_num = 2, .style = FIFO_TX, .maxpacket = 64, }, +}; + +static struct musb_hdrc_config jz4740_musb_config = { + /* Silicon does not implement USB OTG. */ + .multipoint = 0, + /* Max EPs scanned, driver will decide which EP can be used. */ + .num_eps = 4, + /* RAMbits needed to configure EPs from table */ + .ram_bits = 9, + .fifo_cfg = jz4740_musb_fifo_cfg, + .fifo_cfg_size = ARRAY_SIZE(jz4740_musb_fifo_cfg), +}; + +static struct musb_hdrc_platform_data jz4740_musb_platform_data = { + .mode = MUSB_PERIPHERAL, + .config = &jz4740_musb_config, +}; + +static int jz4740_musb_init(struct musb *musb) +{ + musb->xceiv = usb_get_phy(USB_PHY_TYPE_USB2); + if (!musb->xceiv) { + pr_err("HS UDC: no transceiver configured\n"); + return -ENODEV; + } + + /* Silicon does not implement ConfigData register. + * Set dyn_fifo to avoid reading EP config from hardware. + */ + musb->dyn_fifo = true; + + musb->isr = jz4740_musb_interrupt; + + return 0; +} + +static int jz4740_musb_exit(struct musb *musb) +{ + usb_put_phy(musb->xceiv); + + return 0; +} + +static const struct musb_platform_ops jz4740_musb_ops = { + .init = jz4740_musb_init, + .exit = jz4740_musb_exit, +}; + +static int jz4740_probe(struct platform_device *pdev) +{ + struct musb_hdrc_platform_data *pdata = &jz4740_musb_platform_data; + struct platform_device *musb; + struct jz4740_glue *glue; + struct clk *clk; + int ret; + + glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); + if (!glue) + return -ENOMEM; + + musb = platform_device_alloc("musb-hdrc", PLATFORM_DEVID_AUTO); + if (!musb) { + dev_err(&pdev->dev, "failed to allocate musb device\n"); + return -ENOMEM; + } + + clk = devm_clk_get(&pdev->dev, "udc"); + if (IS_ERR(clk)) { + dev_err(&pdev->dev, "failed to get clock\n"); + ret = PTR_ERR(clk); + goto err_platform_device_put; + } + + ret = clk_prepare_enable(clk); + if (ret) { + dev_err(&pdev->dev, "failed to enable clock\n"); + goto err_platform_device_put; + } + + musb->dev.parent = &pdev->dev; + + glue->dev = &pdev->dev; + glue->musb = musb; + glue->clk = clk; + + pdata->platform_ops = &jz4740_musb_ops; + + platform_set_drvdata(pdev, glue); + + ret = platform_device_add_resources(musb, pdev->resource, + pdev->num_resources); + if (ret) { + dev_err(&pdev->dev, "failed to add resources\n"); + goto err_clk_disable; + } + + ret = platform_device_add_data(musb, pdata, sizeof(*pdata)); + if (ret) { + dev_err(&pdev->dev, "failed to add platform_data\n"); + goto err_clk_disable; + } + + ret = platform_device_add(musb); + if (ret) { + dev_err(&pdev->dev, "failed to register musb device\n"); + goto err_clk_disable; + } + + return 0; + +err_clk_disable: + clk_disable_unprepare(clk); +err_platform_device_put: + platform_device_put(musb); + return ret; +} + +static int jz4740_remove(struct platform_device *pdev) +{ + struct jz4740_glue *glue = platform_get_drvdata(pdev); + + platform_device_unregister(glue->musb); + clk_disable_unprepare(glue->clk); + + return 0; +} + +static struct platform_driver jz4740_driver = { + .probe = jz4740_probe, + .remove = jz4740_remove, + .driver = { + .name = "musb-jz4740", + }, +}; + +MODULE_DESCRIPTION("JZ4740 MUSB Glue Layer"); +MODULE_AUTHOR("Apelete Seketeli <apelete@seketeli.net>"); +MODULE_LICENSE("GPL v2"); +module_platform_driver(jz4740_driver); -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller 2013-12-17 23:56 ` [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller Apelete Seketeli @ 2013-12-19 15:36 ` Felipe Balbi 0 siblings, 0 replies; 8+ messages in thread From: Felipe Balbi @ 2013-12-19 15:36 UTC (permalink / raw) To: Apelete Seketeli Cc: linux-usb, linux-kernel, Felipe Balbi, Lars-Peter Clausen [-- Attachment #1: Type: text/plain, Size: 1590 bytes --] On Wed, Dec 18, 2013 at 12:56:00AM +0100, Apelete Seketeli wrote: > Add support for Ingenic JZ4740 USB Device Controller through a > specific musb glue layer. > > The platform data already available in tree for that USB Device > Controller was previously used by an out-of-tree USB gadget driver > which was not relying on the musb driver and was written by Ingenic > and the Qi-Hardware community. > > JZ4740 UDC not being OTG compatible and missing some hardware > registers, this musb glue layer is written from scratch to be used in > gadget mode only and take silicon design specifics into account. > > Signed-off-by: Apelete Seketeli <apelete@seketeli.net> > Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> > --- > arch/mips/include/asm/mach-jz4740/platform.h | 1 + > arch/mips/jz4740/board-qi_lb60.c | 1 + > arch/mips/jz4740/platform.c | 40 +++-- > drivers/usb/musb/Kconfig | 8 +- > drivers/usb/musb/Makefile | 1 + > drivers/usb/musb/jz4740.c | 201 ++++++++++++++++++++++++++ you can split this patch. drivers part has no dependency on arch part. > diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig > index 57dfc0c..a45ed15 100644 > --- a/drivers/usb/musb/Kconfig > +++ b/drivers/usb/musb/Kconfig > @@ -93,6 +93,12 @@ config USB_MUSB_BLACKFIN > config USB_MUSB_UX500 > tristate "Ux500 platforms" > > +config USB_MUSB_JZ4740 > + tristate "JZ4740" > + depends on MACH_JZ4740 add || COMPILE_TEST -- balbi [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 836 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v2 3/3] usb: musb: fix setting JZ4740 gadget periphal mode on reset 2013-12-17 23:55 [PATCH v2 0/3] Add USB support for Ingenic JZ4740 Apelete Seketeli 2013-12-17 23:55 ` [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote Apelete Seketeli 2013-12-17 23:56 ` [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller Apelete Seketeli @ 2013-12-17 23:56 ` Apelete Seketeli 2 siblings, 0 replies; 8+ messages in thread From: Apelete Seketeli @ 2013-12-17 23:56 UTC (permalink / raw) To: linux-usb; +Cc: linux-kernel, Felipe Balbi, Lars-Peter Clausen JZ4740 USB Device Controller is not OTG compatible and does not have DEVCTL register in silicon. During ethernet-over-usb transactions, on reset, musb driver tries to read from DEVCTL and consequently sets device as host (A-Device) instead of peripheral (B-Device), which makes it a composite device to the USB gadget driver. This induces a kernel panic during power down where the USB gadget driver does a null pointer dereference when trying to access the composite device configuration. On reset, do not rely on DEVCTL value for setting gadget peripheral mode. Use is_otg flag instead to set it to B-Device. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> --- drivers/usb/musb/musb_gadget.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index 32fb057..cb50163 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c @@ -2119,7 +2119,15 @@ __acquires(musb->lock) /* Normal reset, as B-Device; * or else after HNP, as A-Device */ - if (devctl & MUSB_DEVCTL_BDEVICE) { + if (!musb->g.is_otg) { + /* USB device controllers that are not OTG compatible + * may not have DEVCTL register in silicon. + * In that case, do not rely on devctl for setting + * peripheral mode. + */ + musb->xceiv->state = OTG_STATE_B_PERIPHERAL; + musb->g.is_a_peripheral = 0; + } else if (devctl & MUSB_DEVCTL_BDEVICE) { musb->xceiv->state = OTG_STATE_B_PERIPHERAL; musb->g.is_a_peripheral = 0; } else { -- 1.7.10.4 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-12-19 15:36 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2013-12-17 23:55 [PATCH v2 0/3] Add USB support for Ingenic JZ4740 Apelete Seketeli 2013-12-17 23:55 ` [PATCH v2 1/3] mips: qi_lb60: add defconfig for Ben NanoNote Apelete Seketeli 2013-12-18 14:59 ` Sergei Shtylyov 2013-12-18 16:00 ` Apelete Seketeli 2013-12-18 18:43 ` Sergei Shtylyov 2013-12-17 23:56 ` [PATCH v2 2/3] usb: musb: add support for JZ4740 usb device controller Apelete Seketeli 2013-12-19 15:36 ` Felipe Balbi 2013-12-17 23:56 ` [PATCH v2 3/3] usb: musb: fix setting JZ4740 gadget periphal mode on reset Apelete Seketeli
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.