tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge remote-tracking branches 'spi/fix/fsl-dspi' and 'spi/fix/pxa2xx' into spi-linus
+7
-4
+2
-2
drivers/spi/spi-fsl-dspi.c
+2
-2
drivers/spi/spi-fsl-dspi.c
···
46
46
47
47
#define SPI_TCR 0x08
48
48
49
-
#define SPI_CTAR(x) (0x0c + (x * 4))
49
+
#define SPI_CTAR(x) (0x0c + (((x) & 0x3) * 4))
50
50
#define SPI_CTAR_FMSZ(x) (((x) & 0x0000000f) << 27)
51
51
#define SPI_CTAR_CPOL(x) ((x) << 26)
52
52
#define SPI_CTAR_CPHA(x) ((x) << 25)
···
70
70
71
71
#define SPI_PUSHR 0x34
72
72
#define SPI_PUSHR_CONT (1 << 31)
73
-
#define SPI_PUSHR_CTAS(x) (((x) & 0x00000007) << 28)
73
+
#define SPI_PUSHR_CTAS(x) (((x) & 0x00000003) << 28)
74
74
#define SPI_PUSHR_EOQ (1 << 27)
75
75
#define SPI_PUSHR_CTCNT (1 << 26)
76
76
#define SPI_PUSHR_PCS(x) (((1 << x) & 0x0000003f) << 16)
+5
-2
drivers/spi/spi-pxa2xx.c
+5
-2
drivers/spi/spi-pxa2xx.c
···
1274
1274
if (status != 0)
1275
1275
return status;
1276
1276
write_SSCR0(0, drv_data->ioaddr);
1277
-
clk_disable_unprepare(ssp->clk);
1277
+
1278
+
if (!pm_runtime_suspended(dev))
1279
+
clk_disable_unprepare(ssp->clk);
1278
1280
1279
1281
return 0;
1280
1282
}
···
1290
1288
pxa2xx_spi_dma_resume(drv_data);
1291
1289
1292
1290
/* Enable the SSP clock */
1293
-
clk_prepare_enable(ssp->clk);
1291
+
if (!pm_runtime_suspended(dev))
1292
+
clk_prepare_enable(ssp->clk);
1294
1293
1295
1294
/* Restore LPSS private register bits */
1296
1295
lpss_ssp_setup(drv_data);