From: Mark Brown Date: Tue, 8 Oct 2019 18:12:28 +0000 (+0100) Subject: Merge branch 'for-5.4' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie... X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=2b60d727cb2e059e0569b937e742e93423ae1541;p=linux.git Merge branch 'for-5.4' of https://git./linux/kernel/git/broonie/spi into spi-5.5 --- 2b60d727cb2e059e0569b937e742e93423ae1541 diff --cc drivers/spi/spi-fsl-qspi.c index 51385b0927e3f,63c9f7edaf6cb..79b1558b74b8a --- a/drivers/spi/spi-fsl-qspi.c +++ b/drivers/spi/spi-fsl-qspi.c @@@ -63,11 -63,11 +63,16 @@@ #define QUADSPI_IPCR 0x08 #define QUADSPI_IPCR_SEQID(x) ((x) << 24) + #define QUADSPI_FLSHCR 0x0c + #define QUADSPI_FLSHCR_TCSS_MASK GENMASK(3, 0) + #define QUADSPI_FLSHCR_TCSH_MASK GENMASK(11, 8) + #define QUADSPI_FLSHCR_TDH_MASK GENMASK(17, 16) + +#define QUADSPI_BUF0CR 0x10 +#define QUADSPI_BUF1CR 0x14 +#define QUADSPI_BUF2CR 0x18 +#define QUADSPI_BUFXCR_INVALID_MSTRID 0xe + #define QUADSPI_BUF3CR 0x1c #define QUADSPI_BUF3CR_ALLMST_MASK BIT(31) #define QUADSPI_BUF3CR_ADATSZ(x) ((x) << 8) @@@ -216,18 -219,18 +227,20 @@@ static const struct fsl_qspi_devtype_da static const struct fsl_qspi_devtype_data imx7d_data = { .rxfifo = SZ_128, .txfifo = SZ_512, + .invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID, .ahb_buf_size = SZ_1K, - .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, + .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK | + QUADSPI_QUIRK_USE_TDH_SETTING, .little_endian = true, }; static const struct fsl_qspi_devtype_data imx6ul_data = { .rxfifo = SZ_128, .txfifo = SZ_512, + .invalid_mstrid = QUADSPI_BUFXCR_INVALID_MSTRID, .ahb_buf_size = SZ_1K, - .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK, + .quirks = QUADSPI_QUIRK_TKT253890 | QUADSPI_QUIRK_4X_INT_CLK | + QUADSPI_QUIRK_USE_TDH_SETTING, .little_endian = true, }; diff --cc drivers/spi/spi-gpio.c index 42f4d82e9c5ab,f9c5bbb747142..7ceb0ba27b755 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c @@@ -368,10 -371,12 +368,12 @@@ static int spi_gpio_probe(struct platfo return -ENOMEM; status = devm_add_action_or_reset(&pdev->dev, spi_gpio_put, master); - if (status) + if (status) { + spi_master_put(master); return status; + } - if (of_id) + if (pdev->dev.of_node) status = spi_gpio_probe_dt(pdev, master); else status = spi_gpio_probe_pdata(pdev, master);