Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7cb55577 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by Mark Brown
Browse files

spi: fsl-espi: migrate relevant parts of mpc8xxx_spi_probe and of_mpc8xxx_spi_probe 



Very little of the library functions mpc8xxx_spi_probe and
of_mpc8xxx_spi_probe is relevant for fsl-espi.

Therefore migrate the relevant parts to fsl-espi (considering
that get_brgfreq() always returns -1 on systems with ESPI)
and remove use of these functions.

Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent cdb2f77c

drivers/spi/spi-fsl-espi.c

+13 −7
Original line number Diff line number Diff line
@@ -587,9 +587,9 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, 


	dev_set_drvdata(dev, master);



	mpc8xxx_spi_probe(dev, mem, irq);



	master->mode_bits |= SPI_RX_DUAL;

	master->mode_bits = SPI_RX_DUAL | SPI_CPOL | SPI_CPHA | SPI_CS_HIGH |

			    SPI_LSB_FIRST | SPI_LOOP;

	master->dev.of_node = dev->of_node;

	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 16);

	master->setup = fsl_espi_setup;

	master->cleanup = fsl_espi_cleanup;
@@ -601,6 +601,16 @@ static int fsl_espi_probe(struct device *dev, struct resource *mem, 
	mpc8xxx_spi = spi_master_get_devdata(master);

	spin_lock_init(&mpc8xxx_spi->lock);



	mpc8xxx_spi->dev = dev;

	mpc8xxx_spi->spibrg = fsl_get_sys_freq();

	if (mpc8xxx_spi->spibrg == -1) {

		dev_err(dev, "Can't get sys frequency!\n");

		ret = -EINVAL;

		goto err_probe;

	}



	init_completion(&mpc8xxx_spi->done);



	mpc8xxx_spi->local_buf =

		devm_kmalloc(dev, SPCOM_TRANLEN_MAX, GFP_KERNEL);

	if (!mpc8xxx_spi->local_buf) {
@@ -713,10 +723,6 @@ static int of_fsl_espi_probe(struct platform_device *ofdev) 
		return -EINVAL;

	}



	ret = of_mpc8xxx_spi_probe(ofdev);

	if (ret)

		return ret;



	num_cs = of_fsl_espi_get_chipselects(dev);

	if (!num_cs)

		return -EINVAL;