FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-14 13:39:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/rspi' and 'spi/fix/s3c64xx' into spi-linus

Browse Source
This commit is contained in:
Mark Brown 2017-02-19 16:40:53 +00:00
commit e0afd0facf
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/spi/spi-pxa2xx.c
View File

@ -1458,6 +1458,10 @@ static const struct pci_device_id pxa2xx_spi_pci_compound_match[] = {
{ PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x1ac2), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x1ac4), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x1ac6), LPSS_BXT_SSP },
/* GLK */
{ PCI_VDEVICE(INTEL, 0x31c2), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x31c4), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x31c6), LPSS_BXT_SSP },
/* APL */ /* APL */
{ PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP },
{ PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP }, { PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },

5
drivers/spi/spi-rspi.c
View File

@ -808,7 +808,7 @@ static int qspi_transfer_out(struct rspi_data *rspi, struct spi_transfer *xfer)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
rspi_write_data(rspi, *tx++); rspi_write_data(rspi, *tx++);
} else { } else {
ret = rspi_pio_transfer(rspi, tx, NULL, n); ret = rspi_pio_transfer(rspi, tx, NULL, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -845,10 +845,9 @@ static int qspi_transfer_in(struct rspi_data *rspi, struct spi_transfer *xfer)
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
*rx++ = rspi_read_data(rspi); *rx++ = rspi_read_data(rspi);
} else { } else {
ret = rspi_pio_transfer(rspi, NULL, rx, n); ret = rspi_pio_transfer(rspi, NULL, rx, len);
if (ret < 0) if (ret < 0)
return ret; return ret;
*rx++ = ret;
} }
n -= len; n -= len;
} }

2
drivers/spi/spi-s3c64xx.c
View File

@ -1003,7 +1003,7 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)
sci->num_cs = temp; sci->num_cs = temp;
} }
sci->no_cs = of_property_read_bool(dev->of_node, "broken-cs"); sci->no_cs = of_property_read_bool(dev->of_node, "no-cs-readback");
return sci; return sci;
} }