From: Simon Horman <horms@verge.net.au> To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI driver support Date: Wed, 07 Nov 2012 08:40:07 +0000 [thread overview] Message-ID: <1352277607-24040-4-git-send-email-horms@verge.net.au> (raw) In-Reply-To: <1352277607-24040-1-git-send-email-horms@verge.net.au> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> This patch supports CN21/CN22 USB 1.x (port 0/1/2), and enable input event on defconfig Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/configs/marzen_defconfig | 5 +-- arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/board-marzen.c | 57 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 6540dfb..728a43c 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -61,9 +61,8 @@ CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -86,6 +85,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y CONFIG_UIO=y diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index c03aeec..64db252 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -42,6 +42,7 @@ config ARCH_R8A7779 select CPU_V7 select SH_CLK_CPG select USB_ARCH_HAS_EHCI + select USB_ARCH_HAS_OHCI config ARCH_EMEV2 bool "Emma Mobile EV2" diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 707b3bd..449f928 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -36,6 +36,7 @@ #include <linux/mfd/tmio.h> #include <linux/usb/otg.h> #include <linux/usb/ehci_pdriver.h> +#include <linux/usb/ohci_pdriver.h> #include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/r8a7779.h> @@ -255,9 +256,65 @@ static struct platform_device ehci1_device = { .resource = ehci1_resources, }; +static struct usb_ohci_pdata ohcix_pdata = { + .power_on = usb_power_on, + .power_off = usb_power_off, + .power_suspend = usb_power_off, +}; + +static struct resource ohci0_resources[] = { + [0] = { + .start = 0xffe70400, + .end = 0xffe70800 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(44), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device ohci0_device = { + .name = "ohci-platform", + .id = 0, + .dev = { + .dma_mask = &ohci0_device.dev.coherent_dma_mask, + .coherent_dma_mask = 0xffffffff, + .platform_data = &ohcix_pdata, + }, + .num_resources = ARRAY_SIZE(ohci0_resources), + .resource = ohci0_resources, +}; + +static struct resource ohci1_resources[] = { + [0] = { + .start = 0xfff70400, + .end = 0xfff70800 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(45), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device ohci1_device = { + .name = "ohci-platform", + .id = 1, + .dev = { + .dma_mask = &ohci1_device.dev.coherent_dma_mask, + .coherent_dma_mask = 0xffffffff, + .platform_data = &ohcix_pdata, + }, + .num_resources = ARRAY_SIZE(ohci1_resources), + .resource = ohci1_resources, +}; + static struct platform_device *marzen_late_devices[] __initdata = { &ehci0_device, &ehci1_device, + &ohci0_device, + &ohci1_device, }; void __init marzen_init_late(void) -- 1.7.10.4
WARNING: multiple messages have this Message-ID (diff)
From: horms@verge.net.au (Simon Horman) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI driver support Date: Wed, 7 Nov 2012 17:40:07 +0900 [thread overview] Message-ID: <1352277607-24040-4-git-send-email-horms@verge.net.au> (raw) In-Reply-To: <1352277607-24040-1-git-send-email-horms@verge.net.au> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> This patch supports CN21/CN22 USB 1.x (port 0/1/2), and enable input event on defconfig Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> Signed-off-by: Simon Horman <horms@verge.net.au> --- arch/arm/configs/marzen_defconfig | 5 +-- arch/arm/mach-shmobile/Kconfig | 1 + arch/arm/mach-shmobile/board-marzen.c | 57 +++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 2 deletions(-) diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig index 6540dfb..728a43c 100644 --- a/arch/arm/configs/marzen_defconfig +++ b/arch/arm/configs/marzen_defconfig @@ -61,9 +61,8 @@ CONFIG_SMSC911X=y # CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_WLAN is not set # CONFIG_INPUT_MOUSEDEV is not set -# CONFIG_INPUT_KEYBOARD is not set +CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set -# CONFIG_SERIO is not set # CONFIG_VT is not set # CONFIG_LEGACY_PTYS is not set # CONFIG_DEVKMEM is not set @@ -86,6 +85,8 @@ CONFIG_MMC=y CONFIG_MMC_SDHI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_PLATFORM=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_STORAGE=y CONFIG_UIO=y diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index c03aeec..64db252 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -42,6 +42,7 @@ config ARCH_R8A7779 select CPU_V7 select SH_CLK_CPG select USB_ARCH_HAS_EHCI + select USB_ARCH_HAS_OHCI config ARCH_EMEV2 bool "Emma Mobile EV2" diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c index 707b3bd..449f928 100644 --- a/arch/arm/mach-shmobile/board-marzen.c +++ b/arch/arm/mach-shmobile/board-marzen.c @@ -36,6 +36,7 @@ #include <linux/mfd/tmio.h> #include <linux/usb/otg.h> #include <linux/usb/ehci_pdriver.h> +#include <linux/usb/ohci_pdriver.h> #include <linux/pm_runtime.h> #include <mach/hardware.h> #include <mach/r8a7779.h> @@ -255,9 +256,65 @@ static struct platform_device ehci1_device = { .resource = ehci1_resources, }; +static struct usb_ohci_pdata ohcix_pdata = { + .power_on = usb_power_on, + .power_off = usb_power_off, + .power_suspend = usb_power_off, +}; + +static struct resource ohci0_resources[] = { + [0] = { + .start = 0xffe70400, + .end = 0xffe70800 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(44), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device ohci0_device = { + .name = "ohci-platform", + .id = 0, + .dev = { + .dma_mask = &ohci0_device.dev.coherent_dma_mask, + .coherent_dma_mask = 0xffffffff, + .platform_data = &ohcix_pdata, + }, + .num_resources = ARRAY_SIZE(ohci0_resources), + .resource = ohci0_resources, +}; + +static struct resource ohci1_resources[] = { + [0] = { + .start = 0xfff70400, + .end = 0xfff70800 - 1, + .flags = IORESOURCE_MEM, + }, + [1] = { + .start = gic_spi(45), + .flags = IORESOURCE_IRQ, + }, +}; + +static struct platform_device ohci1_device = { + .name = "ohci-platform", + .id = 1, + .dev = { + .dma_mask = &ohci1_device.dev.coherent_dma_mask, + .coherent_dma_mask = 0xffffffff, + .platform_data = &ohcix_pdata, + }, + .num_resources = ARRAY_SIZE(ohci1_resources), + .resource = ohci1_resources, +}; + static struct platform_device *marzen_late_devices[] __initdata = { &ehci0_device, &ehci1_device, + &ohci0_device, + &ohci1_device, }; void __init marzen_init_late(void) -- 1.7.10.4
next prev parent reply other threads:[~2012-11-07 8:40 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-10-17 4:39 [GIT PULL] Renesas ARM-based SoC boards for v3.8 Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 01/10] ARM: shmobile: r8a7740: Enable PMU Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 02/10] ARM: shmobile: kzm9g: enable magnetometer ak8975 Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 03/10] ARM: shmobile: kzm9g: enable three-axis digital accelerometer ADXL345 Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 04/10] ARM: shmobile: kzm9g: enable DMAEngine on SHDI0 and SDHI2 Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 05/10] ARM: mach-shmobile: add FLCTL DMA slave definitions for sh7372 Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 06/10] ARM: shmobile: armadillo800eva: enable restart Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 07/10] ARM: shmobile: r8a7779: add HSPI clock support Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 08/10] ARM: shmobile: r8a7779: add I2C " Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 09/10] ARM: shmobile: r8a7779: add I2C driver support Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-10-17 4:39 ` [PATCH 10/10] ARM: shmobile: marzen: add HSPI support Simon Horman 2012-10-17 4:39 ` Simon Horman 2012-11-07 8:40 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #2 Simon Horman 2012-11-07 8:40 ` Simon Horman 2012-11-07 8:40 ` [PATCH 1/3] ARM: shmobile: marzen: add USB phy support Simon Horman 2012-11-07 8:40 ` Simon Horman 2012-11-07 8:40 ` [PATCH 2/3] ARM: shmobile: marzen: add USB EHCI driver support Simon Horman 2012-11-07 8:40 ` Simon Horman 2012-11-07 8:40 ` Simon Horman [this message] 2012-11-07 8:40 ` [PATCH 3/3] ARM: shmobile: marzen: add USB OHCI " Simon Horman 2012-11-19 1:24 ` [GIT PULL] Renesas ARM-based SoC boards for v3.8 #3 Simon Horman 2012-11-19 1:24 ` Simon Horman 2012-11-19 1:24 ` [PATCH] ARM: shmobile: mackerel: Add FLCTL IRQ resource Simon Horman 2012-11-19 1:24 ` Simon Horman 2012-11-19 12:30 ` Sergei Shtylyov 2012-11-19 12:30 ` Sergei Shtylyov 2012-11-20 0:03 ` Simon Horman 2012-11-20 0:03 ` Simon Horman 2013-01-25 2:17 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 1/7] ARM: mackerel: include the correct .dtsi file Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 2/7] ARM: shmobile: fix sample amixer settings for mackerel Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 3/7] ARM: shmobile: add sample amixer settings for ap4evb Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 4/7] ARM: shmobile: add sample amixer settings for armadillo800eva Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 5/7] ARM: shmobile: kzm9g: Use of_machine_is_compatible() Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 6/7] ARM: shmobile: Include DTSI of r8a7740 to armadillo800eva Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-25 2:17 ` [PATCH 7/7] ARM: shmobile: Include sh73a0 DTSI in kzm9g Simon Horman 2013-01-25 2:17 ` Simon Horman 2013-01-29 17:03 ` [GIT PULL] Renesas ARM-based SoC boards for v3.9 Olof Johansson 2013-01-29 17:03 ` Olof Johansson
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1352277607-24040-4-git-send-email-horms@verge.net.au \ --to=horms@verge.net.au \ --cc=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.