Unverified Commit 1b2e883e authored by Mark Brown's avatar Mark Brown
Browse files

spi: Merge up fix 

One small fix that didn't seem worth sending before the merge window.
parents 75223bbe c3aa5cb2

Documentation/devicetree/bindings/spi/fsl-imx-cspi.yaml

+7 −0
Original line number Diff line number Diff line
@@ -22,6 +22,13 @@ properties: 
      - const: fsl,imx35-cspi

      - const: fsl,imx51-ecspi

      - const: fsl,imx53-ecspi

      - items:

          - enum:

              - fsl,imx25-cspi

              - fsl,imx50-cspi

              - fsl,imx51-cspi

              - fsl,imx53-cspi

          - const: fsl,imx35-cspi

      - items:

          - const: fsl,imx8mp-ecspi

          - const: fsl,imx6ul-ecspi

drivers/spi/spi-cs42l43.c

+0 −1
Original line number Diff line number Diff line
@@ -256,7 +256,6 @@ static int cs42l43_spi_probe(struct platform_device *pdev) 


	ret = devm_spi_register_controller(priv->dev, priv->ctlr);

	if (ret) {

		pm_runtime_disable(priv->dev);

		dev_err(priv->dev, "Failed to register SPI controller: %d\n", ret);

	}

drivers/spi/spi-gxp.c

+1 −1
Original line number Diff line number Diff line
@@ -194,7 +194,7 @@ static ssize_t gxp_spi_write(struct gxp_spi_chip *chip, const struct spi_mem_op 
		return ret;

	}



	return write_len;

	return 0;

}



static int do_gxp_exec_mem_op(struct spi_mem *mem, const struct spi_mem_op *op)

drivers/spi/spi-imx.c

+1 −1
Original line number Diff line number Diff line
@@ -662,7 +662,7 @@ static int mx51_ecspi_prepare_transfer(struct spi_imx_data *spi_imx, 
		if (spi_imx->count >= 512)

			ctrl |= 0xFFF << MX51_ECSPI_CTRL_BL_OFFSET;

		else

			ctrl |= (spi_imx->count*8 - 1)

			ctrl |= (spi_imx->count * spi_imx->bits_per_word - 1)

				<< MX51_ECSPI_CTRL_BL_OFFSET;

	}

drivers/spi/spi-intel-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ static const struct pci_device_id intel_spi_pci_ids[] = { 
	{ PCI_VDEVICE(INTEL, 0x4da4), (unsigned long)&bxt_info },

	{ PCI_VDEVICE(INTEL, 0x51a4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x54a4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x5794), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7a24), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7aa4), (unsigned long)&cnl_info },

	{ PCI_VDEVICE(INTEL, 0x7e23), (unsigned long)&cnl_info },