lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

spi/spi-sh: add IORESOURCE_MEM_TYPE_MASK decoding for access size

Browse Source 
This SPI controller's access size is 32, or 8-bit. The previous driver
supported 32-bit only. So, this patch adds IORESOURCE_MEM_TYPE_MASK
decoding, an then, the driver can handle the SPI controller of 8-bit.

Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
This commit is contained in:
Shimoda, Yoshihiro
2012-03-07 14:45:37 +09:00
committed by Grant Likely
parent d5a8003135
commit 0eb8880fac
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/spi/spi-sh.c
View File

@@ -92,17 +92,26 @@ struct spi_sh_data {
unsigned long cr1; unsigned long cr1;
wait_queue_head_t wait; wait_queue_head_t wait;
spinlock_t lock; spinlock_t lock;
int width;
}; };
static void spi_sh_write(struct spi_sh_data *ss, unsigned long data, static void spi_sh_write(struct spi_sh_data *ss, unsigned long data,
unsigned long offset) unsigned long offset)
{ {
writel(data, ss->addr + offset); if (ss->width == 8)
iowrite8(data, ss->addr + (offset >> 2));
else if (ss->width == 32)
iowrite32(data, ss->addr + offset);
} }
static unsigned long spi_sh_read(struct spi_sh_data *ss, unsigned long offset) static unsigned long spi_sh_read(struct spi_sh_data *ss, unsigned long offset)
{ {
return readl(ss->addr + offset); if (ss->width == 8)
return ioread8(ss->addr + (offset >> 2));
else if (ss->width == 32)
return ioread32(ss->addr + offset);
else
return 0;
} }
static void spi_sh_set_bit(struct spi_sh_data *ss, unsigned long val, static void spi_sh_set_bit(struct spi_sh_data *ss, unsigned long val,
@@ -464,6 +473,18 @@ static int __devinit spi_sh_probe(struct platform_device *pdev)
ss = spi_master_get_devdata(master); ss = spi_master_get_devdata(master);
dev_set_drvdata(&pdev->dev, ss); dev_set_drvdata(&pdev->dev, ss);
switch (res->flags & IORESOURCE_MEM_TYPE_MASK) {
case IORESOURCE_MEM_8BIT:
ss->width = 8;
break;
case IORESOURCE_MEM_32BIT:
ss->width = 32;
break;
default:
dev_err(&pdev->dev, "No support width\n");
ret = -ENODEV;
goto error1;
}
ss->irq = irq; ss->irq = irq;
ss->master = master; ss->master = master;
ss->addr = ioremap(res->start, resource_size(res)); ss->addr = ioremap(res->start, resource_size(res));