Unverified Commit db4a8319 authored by Mark Brown's avatar Mark Brown
Browse files

Merge branch 'for-5.10' of... 

Merge branch 'for-5.10' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.11
parents 459ea850 72188381

drivers/spi/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ config SPI_DW_BT1 
	tristate "Baikal-T1 SPI driver for DW SPI core"

	depends on MIPS_BAIKAL_T1 || COMPILE_TEST

	select MULTIPLEXER

	select MUX_MMIO

	help

	  Baikal-T1 SoC is equipped with three DW APB SSI-based MMIO SPI

	  controllers. Two of them are pretty much normal: with IRQ, DMA,
@@ -269,8 +270,6 @@ config SPI_DW_BT1 
config SPI_DW_BT1_DIRMAP

	bool "Directly mapped Baikal-T1 Boot SPI flash support"

	depends on SPI_DW_BT1

	select MULTIPLEXER

	select MUX_MMIO

	help

	  Directly mapped SPI flash memory is an interface specific to the

	  Baikal-T1 System Boot Controller. It is a 16MB MMIO region, which

drivers/spi/spi-bcm-qspi.c

+12 −22
Original line number Diff line number Diff line
@@ -1327,7 +1327,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 


	data = of_id->data;



	master = spi_alloc_master(dev, sizeof(struct bcm_qspi));

	master = devm_spi_alloc_master(dev, sizeof(struct bcm_qspi));

	if (!master) {

		dev_err(dev, "error allocating spi_master\n");

		return -ENOMEM;
@@ -1367,21 +1367,17 @@ int bcm_qspi_probe(struct platform_device *pdev, 


	if (res) {

		qspi->base[MSPI]  = devm_ioremap_resource(dev, res);

		if (IS_ERR(qspi->base[MSPI])) {

			ret = PTR_ERR(qspi->base[MSPI]);

			goto qspi_resource_err;

		}

		if (IS_ERR(qspi->base[MSPI]))

			return PTR_ERR(qspi->base[MSPI]);

	} else {

		goto qspi_resource_err;

		return 0;

	}



	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "bspi");

	if (res) {

		qspi->base[BSPI]  = devm_ioremap_resource(dev, res);

		if (IS_ERR(qspi->base[BSPI])) {

			ret = PTR_ERR(qspi->base[BSPI]);

			goto qspi_resource_err;

		}

		if (IS_ERR(qspi->base[BSPI]))

			return PTR_ERR(qspi->base[BSPI]);

		qspi->bspi_mode = true;

	} else {

		qspi->bspi_mode = false;
@@ -1392,18 +1388,14 @@ int bcm_qspi_probe(struct platform_device *pdev, 
	res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "cs_reg");

	if (res) {

		qspi->base[CHIP_SELECT]  = devm_ioremap_resource(dev, res);

		if (IS_ERR(qspi->base[CHIP_SELECT])) {

			ret = PTR_ERR(qspi->base[CHIP_SELECT]);

			goto qspi_resource_err;

		}

		if (IS_ERR(qspi->base[CHIP_SELECT]))

			return PTR_ERR(qspi->base[CHIP_SELECT]);

	}



	qspi->dev_ids = kcalloc(num_irqs, sizeof(struct bcm_qspi_dev_id),

				GFP_KERNEL);

	if (!qspi->dev_ids) {

		ret = -ENOMEM;

		goto qspi_resource_err;

	}

	if (!qspi->dev_ids)

		return -ENOMEM;



	for (val = 0; val < num_irqs; val++) {

		irq = -1;
@@ -1484,7 +1476,7 @@ int bcm_qspi_probe(struct platform_device *pdev, 
	qspi->xfer_mode.addrlen = -1;

	qspi->xfer_mode.hp = -1;



	ret = devm_spi_register_master(&pdev->dev, master);

	ret = spi_register_master(master);

	if (ret < 0) {

		dev_err(dev, "can't register master\n");

		goto qspi_reg_err;
@@ -1497,8 +1489,6 @@ int bcm_qspi_probe(struct platform_device *pdev, 
	clk_disable_unprepare(qspi->clk);

qspi_probe_err:

	kfree(qspi->dev_ids);

qspi_resource_err:

	spi_master_put(master);

	return ret;

}

/* probe function to be called by SoC specific platform driver probe */
@@ -1508,10 +1498,10 @@ int bcm_qspi_remove(struct platform_device *pdev) 
{

	struct bcm_qspi *qspi = platform_get_drvdata(pdev);



	spi_unregister_master(qspi->master);

	bcm_qspi_hw_uninit(qspi);

	clk_disable_unprepare(qspi->clk);

	kfree(qspi->dev_ids);

	spi_unregister_master(qspi->master);



	return 0;

}

drivers/spi/spi-bcm2835.c

+9 −30
Original line number Diff line number Diff line
@@ -1193,7 +1193,6 @@ static int bcm2835_spi_setup(struct spi_device *spi) 
	struct spi_controller *ctlr = spi->controller;

	struct bcm2835_spi *bs = spi_controller_get_devdata(ctlr);

	struct gpio_chip *chip;

	enum gpio_lookup_flags lflags;

	u32 cs;



	/*
@@ -1259,21 +1258,9 @@ static int bcm2835_spi_setup(struct spi_device *spi) 
	if (!chip)

		return 0;



	/*

	 * Retrieve the corresponding GPIO line used for CS.

	 * The inversion semantics will be handled by the GPIO core

	 * code, so we pass GPIOD_OUT_LOW for "unasserted" and

	 * the correct flag for inversion semantics. The SPI_CS_HIGH

	 * on spi->mode cannot be checked for polarity in this case

	 * as the flag use_gpio_descriptors enforces SPI_CS_HIGH.

	 */

	if (of_property_read_bool(spi->dev.of_node, "spi-cs-high"))

		lflags = GPIO_ACTIVE_HIGH;

	else

		lflags = GPIO_ACTIVE_LOW;

	spi->cs_gpiod = gpiochip_request_own_desc(chip, 8 - spi->chip_select,

						  DRV_NAME,

						  lflags,

						  GPIO_LOOKUP_FLAGS_DEFAULT,

						  GPIOD_OUT_LOW);

	if (IS_ERR(spi->cs_gpiod))

		return PTR_ERR(spi->cs_gpiod);
@@ -1291,7 +1278,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
	struct bcm2835_spi *bs;

	int err;



	ctlr = spi_alloc_master(&pdev->dev, ALIGN(sizeof(*bs),

	ctlr = devm_spi_alloc_master(&pdev->dev, ALIGN(sizeof(*bs),

						  dma_get_cache_alignment()));

	if (!ctlr)

		return -ENOMEM;
@@ -1312,23 +1299,17 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
	bs->ctlr = ctlr;



	bs->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(bs->regs)) {

		err = PTR_ERR(bs->regs);

		goto out_controller_put;

	}

	if (IS_ERR(bs->regs))

		return PTR_ERR(bs->regs);



	bs->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(bs->clk)) {

		err = dev_err_probe(&pdev->dev, PTR_ERR(bs->clk),

	if (IS_ERR(bs->clk))

		return dev_err_probe(&pdev->dev, PTR_ERR(bs->clk),

				     "could not get clk\n");

		goto out_controller_put;

	}



	bs->irq = platform_get_irq(pdev, 0);

	if (bs->irq <= 0) {

		err = bs->irq ? bs->irq : -ENODEV;

		goto out_controller_put;

	}

	if (bs->irq <= 0)

		return bs->irq ? bs->irq : -ENODEV;



	clk_prepare_enable(bs->clk);
@@ -1362,8 +1343,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
	bcm2835_dma_release(ctlr, bs);

out_clk_disable:

	clk_disable_unprepare(bs->clk);

out_controller_put:

	spi_controller_put(ctlr);

	return err;

}

drivers/spi/spi-bcm2835aux.c

+7 −13
Original line number Diff line number Diff line
@@ -494,7 +494,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 
	unsigned long clk_hz;

	int err;



	master = spi_alloc_master(&pdev->dev, sizeof(*bs));

	master = devm_spi_alloc_master(&pdev->dev, sizeof(*bs));

	if (!master)

		return -ENOMEM;
@@ -524,29 +524,25 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 


	/* the main area */

	bs->regs = devm_platform_ioremap_resource(pdev, 0);

	if (IS_ERR(bs->regs)) {

		err = PTR_ERR(bs->regs);

		goto out_master_put;

	}

	if (IS_ERR(bs->regs))

		return PTR_ERR(bs->regs);



	bs->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(bs->clk)) {

		err = PTR_ERR(bs->clk);

		dev_err(&pdev->dev, "could not get clk: %d\n", err);

		goto out_master_put;

		return err;

	}



	bs->irq = platform_get_irq(pdev, 0);

	if (bs->irq <= 0) {

		err = bs->irq ? bs->irq : -ENODEV;

		goto out_master_put;

	}

	if (bs->irq <= 0)

		return bs->irq ? bs->irq : -ENODEV;



	/* this also enables the HW block */

	err = clk_prepare_enable(bs->clk);

	if (err) {

		dev_err(&pdev->dev, "could not prepare clock: %d\n", err);

		goto out_master_put;

		return err;

	}



	/* just checking if the clock returns a sane value */
@@ -581,8 +577,6 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 


out_clk_disable:

	clk_disable_unprepare(bs->clk);

out_master_put:

	spi_master_put(master);

	return err;

}

drivers/spi/spi-cadence-quadspi.c

+2 −0
Original line number Diff line number Diff line
@@ -1260,12 +1260,14 @@ static int cqspi_probe(struct platform_device *pdev) 
	/* Obtain QSPI reset control */

	rstc = devm_reset_control_get_optional_exclusive(dev, "qspi");

	if (IS_ERR(rstc)) {

		ret = PTR_ERR(rstc);

		dev_err(dev, "Cannot get QSPI reset.\n");

		goto probe_reset_failed;

	}



	rstc_ocp = devm_reset_control_get_optional_exclusive(dev, "qspi-ocp");

	if (IS_ERR(rstc_ocp)) {

		ret = PTR_ERR(rstc_ocp);

		dev_err(dev, "Cannot get QSPI OCP reset.\n");

		goto probe_reset_failed;

	}