Commit eba6d937 authored by Christopher Hoover's avatar Christopher Hoover Committed by Russell King

[ARM PATCH] 1489/1: SA-1111: usb_dev needs non-zero dev.dma_mask for usb core to work properly

Patch from Christopher Hoover
parent 5c97ec96
...@@ -60,6 +60,7 @@ static struct sa1111_dev usb_dev = { ...@@ -60,6 +60,7 @@ static struct sa1111_dev usb_dev = {
}, },
.skpcr_mask = SKPCR_UCLKEN, .skpcr_mask = SKPCR_UCLKEN,
.devid = SA1111_DEVID_USB, .devid = SA1111_DEVID_USB,
.dma_mask = 0xffffffffLL,
.irq = { .irq = {
IRQ_USBPWR, IRQ_USBPWR,
IRQ_HCIM, IRQ_HCIM,
...@@ -494,6 +495,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct sa1111_dev *sadev, unsigned ...@@ -494,6 +495,7 @@ sa1111_init_one_child(struct sa1111 *sachip, struct sa1111_dev *sadev, unsigned
sadev->dev.parent = sachip->dev; sadev->dev.parent = sachip->dev;
sadev->dev.bus = &sa1111_bus_type; sadev->dev.bus = &sa1111_bus_type;
sadev->dev.dma_mask = &sadev->dma_mask;
sadev->res.start = sachip->res.start + offset; sadev->res.start = sachip->res.start + offset;
sadev->res.end = sadev->res.start + 511; sadev->res.end = sadev->res.start + 511;
sadev->res.name = sadev->dev.name; sadev->res.name = sadev->dev.name;
......
...@@ -553,6 +553,7 @@ struct sa1111_dev { ...@@ -553,6 +553,7 @@ struct sa1111_dev {
void *mapbase; void *mapbase;
unsigned int skpcr_mask; unsigned int skpcr_mask;
unsigned int irq[6]; unsigned int irq[6];
u64 dma_mask;
}; };
#define SA1111_DEV(_d) container_of((_d), struct sa1111_dev, dev) #define SA1111_DEV(_d) container_of((_d), struct sa1111_dev, dev)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment