Skip to content

Commit

Permalink
usb: r8a66597-hcd platform data on_chip support
Browse files Browse the repository at this point in the history
Convert the r8a66597-hcd driver to use the on_chip flag
from platform data to enable on chip behaviour instead
of relying on CONFIG_SUPERH_ON_CHIP_R8A66597 ugliness.

This makes the code cleaner and also allows us to support
both external and internal r8a66597 with the same kernel.

It also makes the Kconfig part more future proof since
we with this patch can add support for new processors
with on-chip r8a66597 without modifying the Kconfig.

Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
  • Loading branch information
Magnus Damm authored and Paul Mundt committed Jul 19, 2009
1 parent ae1cef6 commit 719a72b
Show file tree
Hide file tree
Showing 7 changed files with 147 additions and 131 deletions.
1 change: 1 addition & 0 deletions arch/sh/boards/mach-se/7724/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ static struct platform_device sh_eth_device = {
};

static struct r8a66597_platdata sh7724_usb0_host_data = {
.on_chip = 1,
};

static struct resource sh7724_usb0_host_resources[] = {
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh4a/setup-sh7366.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ static struct platform_device iic_device = {
};

static struct r8a66597_platdata r8a66597_data = {
/* This set zero to all members */
.on_chip = 1,
};

static struct resource usb_host_resources[] = {
Expand Down
2 changes: 1 addition & 1 deletion arch/sh/kernel/cpu/sh4a/setup-sh7723.c
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ static struct platform_device rtc_device = {
};

static struct r8a66597_platdata r8a66597_data = {
/* This set zero to all members */
.on_chip = 1,
};

static struct resource sh7723_usb_host_resources[] = {
Expand Down
7 changes: 0 additions & 7 deletions drivers/usb/host/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,6 @@ config USB_R8A66597_HCD
To compile this driver as a module, choose M here: the
module will be called r8a66597-hcd.

config SUPERH_ON_CHIP_R8A66597
boolean "Enable SuperH on-chip R8A66597 USB"
depends on USB_R8A66597_HCD && (CPU_SUBTYPE_SH7366 || CPU_SUBTYPE_SH7723 || CPU_SUBTYPE_SH7724)
help
This driver enables support for the on-chip R8A66597 in the
SH7366, SH7723 and SH7724 processors.

config USB_WHCI_HCD
tristate "Wireless USB Host Controller Interface (WHCI) driver (EXPERIMENTAL)"
depends on EXPERIMENTAL
Expand Down
Loading

0 comments on commit 719a72b

Please sign in to comment.