sh: convert boards to use the OHCI platform driver

This patch makes all SuperH boards using the ohci-sh platform driver to use
the ohci-platform driver instead, which is suitable for use by these boards.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Florian Fainelli 2012-10-08 15:11:36 +02:00 коммит произвёл Greg Kroah-Hartman
Родитель c2e91e046d
Коммит 7518f0763e
4 изменённых файлов: 20 добавлений и 4 удалений

Просмотреть файл

@ -20,6 +20,7 @@
#include <linux/serial_sci.h> #include <linux/serial_sci.h>
#include <linux/sh_timer.h> #include <linux/sh_timer.h>
#include <linux/sh_intc.h> #include <linux/sh_intc.h>
#include <linux/usb/ohci_pdriver.h>
#include <asm/rtc.h> #include <asm/rtc.h>
#include <cpu/serial.h> #include <cpu/serial.h>
@ -103,12 +104,15 @@ static struct resource usb_ohci_resources[] = {
static u64 usb_ohci_dma_mask = 0xffffffffUL; static u64 usb_ohci_dma_mask = 0xffffffffUL;
static struct usb_ohci_pdata usb_ohci_pdata;
static struct platform_device usb_ohci_device = { static struct platform_device usb_ohci_device = {
.name = "sh_ohci", .name = "ohci-platform",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &usb_ohci_dma_mask, .dma_mask = &usb_ohci_dma_mask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = 0xffffffff,
.platform_data = &usb_ohci_pdata,
}, },
.num_resources = ARRAY_SIZE(usb_ohci_resources), .num_resources = ARRAY_SIZE(usb_ohci_resources),
.resource = usb_ohci_resources, .resource = usb_ohci_resources,

Просмотреть файл

@ -19,6 +19,7 @@
#include <linux/sh_timer.h> #include <linux/sh_timer.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
#include <linux/sh_intc.h> #include <linux/sh_intc.h>
#include <linux/usb/ohci_pdriver.h>
#include <cpu/dma-register.h> #include <cpu/dma-register.h>
#include <cpu/sh7757.h> #include <cpu/sh7757.h>
@ -750,12 +751,15 @@ static struct resource usb_ohci_resources[] = {
}, },
}; };
static struct usb_ohci_pdata usb_ohci_pdata;
static struct platform_device usb_ohci_device = { static struct platform_device usb_ohci_device = {
.name = "sh_ohci", .name = "ohci-platform",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &usb_ohci_device.dev.coherent_dma_mask, .dma_mask = &usb_ohci_device.dev.coherent_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usb_ohci_pdata,
}, },
.num_resources = ARRAY_SIZE(usb_ohci_resources), .num_resources = ARRAY_SIZE(usb_ohci_resources),
.resource = usb_ohci_resources, .resource = usb_ohci_resources,

Просмотреть файл

@ -16,6 +16,7 @@
#include <linux/sh_intc.h> #include <linux/sh_intc.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/serial_sci.h> #include <linux/serial_sci.h>
#include <linux/usb/ohci_pdriver.h>
static struct plat_sci_port scif0_platform_data = { static struct plat_sci_port scif0_platform_data = {
.mapbase = 0xffe00000, .mapbase = 0xffe00000,
@ -106,12 +107,15 @@ static struct resource usb_ohci_resources[] = {
static u64 usb_ohci_dma_mask = 0xffffffffUL; static u64 usb_ohci_dma_mask = 0xffffffffUL;
static struct usb_ohci_pdata usb_ohci_pdata;
static struct platform_device usb_ohci_device = { static struct platform_device usb_ohci_device = {
.name = "sh_ohci", .name = "ohci-platform",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &usb_ohci_dma_mask, .dma_mask = &usb_ohci_dma_mask,
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = 0xffffffff,
.platform_data = &usb_ohci_pdata,
}, },
.num_resources = ARRAY_SIZE(usb_ohci_resources), .num_resources = ARRAY_SIZE(usb_ohci_resources),
.resource = usb_ohci_resources, .resource = usb_ohci_resources,

Просмотреть файл

@ -23,6 +23,7 @@
#include <linux/sh_timer.h> #include <linux/sh_timer.h>
#include <linux/sh_dma.h> #include <linux/sh_dma.h>
#include <linux/sh_intc.h> #include <linux/sh_intc.h>
#include <linux/usb/ohci_pdriver.h>
#include <cpu/dma-register.h> #include <cpu/dma-register.h>
#include <asm/mmzone.h> #include <asm/mmzone.h>
@ -583,12 +584,15 @@ static struct resource usb_ohci_resources[] = {
}, },
}; };
static struct usb_ohci_pdata usb_ohci_pdata;
static struct platform_device usb_ohci_device = { static struct platform_device usb_ohci_device = {
.name = "sh_ohci", .name = "ohci-platform",
.id = -1, .id = -1,
.dev = { .dev = {
.dma_mask = &usb_ohci_device.dev.coherent_dma_mask, .dma_mask = &usb_ohci_device.dev.coherent_dma_mask,
.coherent_dma_mask = DMA_BIT_MASK(32), .coherent_dma_mask = DMA_BIT_MASK(32),
.platform_data = &usb_ohci_pdata,
}, },
.num_resources = ARRAY_SIZE(usb_ohci_resources), .num_resources = ARRAY_SIZE(usb_ohci_resources),
.resource = usb_ohci_resources, .resource = usb_ohci_resources,