diff options
| author | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-08-06 21:44:57 -0400 |
| commit | 13dfb3fa494361ea9a5950f27c9cd8b06d28c04f (patch) | |
| tree | 1bf30874f57c6c6b21160a10282191fcd0868055 /drivers/spi/spi-fsl-qspi.c | |
| parent | 05bb520376af2c5146d3c44832c22ec3bb54d778 (diff) | |
| parent | 33920f1ec5bf47c5c0a1d2113989bdd9dfb3fae9 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Just minor overlapping changes in the conflicts here.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/spi/spi-fsl-qspi.c')
| -rw-r--r-- | drivers/spi/spi-fsl-qspi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/spi/spi-fsl-qspi.c b/drivers/spi/spi-fsl-qspi.c index 41a49b93ca60..448c00e4065b 100644 --- a/drivers/spi/spi-fsl-qspi.c +++ b/drivers/spi/spi-fsl-qspi.c | |||
| @@ -206,7 +206,7 @@ static const struct fsl_qspi_devtype_data imx6sx_data = { | |||
| 206 | }; | 206 | }; |
| 207 | 207 | ||
| 208 | static const struct fsl_qspi_devtype_data imx7d_data = { | 208 | static const struct fsl_qspi_devtype_data imx7d_data = { |
| 209 | .rxfifo = SZ_512, | 209 | .rxfifo = SZ_128, |
| 210 | .txfifo = SZ_512, | 210 | .txfifo = SZ_512, |
| 211 | .ahb_buf_size = SZ_1K, | 211 | .ahb_buf_size = SZ_1K, |
| 212 | .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, | 212 | .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, |