Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0afd0fa authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/rspi' and... 

Merge remote-tracking branches 'spi/fix/pxa2xx', 'spi/fix/rspi' and 'spi/fix/s3c64xx' into spi-linus
parents d2f68a05 e18a80ac ad16d4a8 379f831a

drivers/spi/spi-pxa2xx.c

+4 −0
Original line number Diff line number Diff line
@@ -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, 0x1ac4), 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 */

	{ PCI_VDEVICE(INTEL, 0x5ac2), LPSS_BXT_SSP },

	{ PCI_VDEVICE(INTEL, 0x5ac4), LPSS_BXT_SSP },

drivers/spi/spi-rspi.c

+2 −3
Original line number Diff line number Diff line
@@ -808,7 +808,7 @@ static int qspi_transfer_out(struct rspi_data *rspi, struct spi_transfer *xfer) 
			for (i = 0; i < len; i++)

				rspi_write_data(rspi, *tx++);

		} else {

			ret = rspi_pio_transfer(rspi, tx, NULL, n);

			ret = rspi_pio_transfer(rspi, tx, NULL, len);

			if (ret < 0)

				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++)

				*rx++ = rspi_read_data(rspi);

		} else {

			ret = rspi_pio_transfer(rspi, NULL, rx, n);

			ret = rspi_pio_transfer(rspi, NULL, rx, len);

			if (ret < 0)

				return ret;

			*rx++ = ret;

		}

		n -= len;

	}

drivers/spi/spi-s3c64xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1003,7 +1003,7 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev) 
		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;

}