Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 0eb8880fac7b0f32ebab33f99e758c6b308e3aa1

Authored by Shimoda, Yoshihiro
Committed by Grant Likely
1 parent d5a8003135
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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

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>

Showing 1 changed file with 23 additions and 2 deletions Side-by-side Diff

drivers/spi/spi-sh.c
Diff comments   View file @ 0eb8880
... ... @@ -92,17 +92,26 @@
92 92 unsigned long cr1;
93 93 wait_queue_head_t wait;
94 94 spinlock_t lock;
  95 + int width;
95 96 };
96 97  
97 98 static void spi_sh_write(struct spi_sh_data *ss, unsigned long data,
98 99 unsigned long offset)
99 100 {
100   - writel(data, ss->addr + offset);
  101 + if (ss->width == 8)
  102 + iowrite8(data, ss->addr + (offset >> 2));
  103 + else if (ss->width == 32)
  104 + iowrite32(data, ss->addr + offset);
101 105 }
102 106  
103 107 static unsigned long spi_sh_read(struct spi_sh_data *ss, unsigned long offset)
104 108 {
105   - return readl(ss->addr + offset);
  109 + if (ss->width == 8)
  110 + return ioread8(ss->addr + (offset >> 2));
  111 + else if (ss->width == 32)
  112 + return ioread32(ss->addr + offset);
  113 + else
  114 + return 0;
106 115 }
107 116  
108 117 static void spi_sh_set_bit(struct spi_sh_data *ss, unsigned long val,
... ... @@ -464,6 +473,18 @@
464 473 ss = spi_master_get_devdata(master);
465 474 dev_set_drvdata(&pdev->dev, ss);
466 475  
  476 + switch (res->flags & IORESOURCE_MEM_TYPE_MASK) {
  477 + case IORESOURCE_MEM_8BIT:
  478 + ss->width = 8;
  479 + break;
  480 + case IORESOURCE_MEM_32BIT:
  481 + ss->width = 32;
  482 + break;
  483 + default:
  484 + dev_err(&pdev->dev, "No support width\n");
  485 + ret = -ENODEV;
  486 + goto error1;
  487 + }
467 488 ss->irq = irq;
468 489 ss->master = master;
469 490 ss->addr = ioremap(res->start, resource_size(res));