Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'spi-fix-v6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fixes from Mark Brown:
"A few small driver specific fixes, the most substantial one being the
Tegra one which fixes spurious errors with default delays for chip
select hold times"
* tag 'spi-fix-v6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
spi: spi-sun4i: fix early activation
spi: tegra114: Use value to check for invalid delays
spi: loopback-test: Do not split 1024-byte hexdumps
+8
-5
+1
-1
drivers/spi/spi-loopback-test.c
+1
-1
drivers/spi/spi-loopback-test.c
+4
-1
drivers/spi/spi-sun4i.c
+4
-1
drivers/spi/spi-sun4i.c
···
264
264
else
265
265
reg |= SUN4I_CTL_DHB;
266
266
267
+
/* Now that the settings are correct, enable the interface */
268
+
reg |= SUN4I_CTL_ENABLE;
269
+
267
270
sun4i_spi_write(sspi, SUN4I_CTL_REG, reg);
268
271
269
272
/* Ensure that we have a parent clock fast enough */
···
407
404
}
408
405
409
406
sun4i_spi_write(sspi, SUN4I_CTL_REG,
410
-
SUN4I_CTL_ENABLE | SUN4I_CTL_MASTER | SUN4I_CTL_TP);
407
+
SUN4I_CTL_MASTER | SUN4I_CTL_TP);
411
408
412
409
return 0;
413
410
+3
-3
drivers/spi/spi-tegra114.c
+3
-3
drivers/spi/spi-tegra114.c
···
728
728
u32 inactive_cycles;
729
729
u8 cs_state;
730
730
731
-
if ((setup->unit && setup->unit != SPI_DELAY_UNIT_SCK) ||
732
-
(hold->unit && hold->unit != SPI_DELAY_UNIT_SCK) ||
733
-
(inactive->unit && inactive->unit != SPI_DELAY_UNIT_SCK)) {
731
+
if ((setup->value && setup->unit != SPI_DELAY_UNIT_SCK) ||
732
+
(hold->value && hold->unit != SPI_DELAY_UNIT_SCK) ||
733
+
(inactive->value && inactive->unit != SPI_DELAY_UNIT_SCK)) {
734
734
dev_err(&spi->dev,
735
735
"Invalid delay unit %d, should be SPI_DELAY_UNIT_SCK\n",
736
736
SPI_DELAY_UNIT_SCK);