Commit bd7df5ad authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "This is all driver updates, mostly fixes for error handling paths
  except for the s3c64xx and hspi fixes for trying to use runtime PM
  before it is enabled and the pxa2xx fix for interactions between power
  management and interrupt handling"

* tag 'spi-v3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: atmel: Fix incorrect error path
  spi/hspi: fixup Runtime PM enable timing
  spi/s3c64xx: Ensure runtime PM is enabled prior to registration
  spi/clps711x: drop clk_put for devm_clk_get in spi_clps711x_probe()
  spi: fix return value check in dspi_probe()
  spi: mpc512x: fix error return code in mpc512x_psc_spi_do_probe()
  spi: clps711x: Don't call kfree() after spi_master_put/spi_unregister_master
  spi/pxa2xx: check status register as well to determine if the device is off
parents b291a229 ac9fdc88

drivers/spi/spi-atmel.c

+2 −1
Original line number Diff line number Diff line
@@ -1583,7 +1583,7 @@ static int atmel_spi_probe(struct platform_device *pdev) 
	/* Initialize the hardware */

	ret = clk_prepare_enable(clk);

	if (ret)

		goto out_unmap_regs;

		goto out_free_irq;

	spi_writel(as, CR, SPI_BIT(SWRST));

	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */

	if (as->caps.has_wdrbt) {
@@ -1614,6 +1614,7 @@ out_free_dma: 
	spi_writel(as, CR, SPI_BIT(SWRST));

	spi_writel(as, CR, SPI_BIT(SWRST)); /* AT91SAM9263 Rev B workaround */

	clk_disable_unprepare(clk);

out_free_irq:

	free_irq(irq, master);

out_unmap_regs:

	iounmap(as->regs);

drivers/spi/spi-clps711x.c

+0 −3
Original line number Diff line number Diff line
@@ -226,7 +226,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
			       dev_name(&pdev->dev), hw);

	if (ret) {

		dev_err(&pdev->dev, "Can't request IRQ\n");

		clk_put(hw->spi_clk);

		goto clk_out;

	}
@@ -247,7 +246,6 @@ err_out: 
			gpio_free(hw->chipselect[i]);



	spi_master_put(master);

	kfree(master);



	return ret;

}
@@ -263,7 +261,6 @@ static int spi_clps711x_remove(struct platform_device *pdev) 
			gpio_free(hw->chipselect[i]);



	spi_unregister_master(master);

	kfree(master);



	return 0;

}

drivers/spi/spi-fsl-dspi.c

+2 −8
Original line number Diff line number Diff line
@@ -476,15 +476,9 @@ static int dspi_probe(struct platform_device *pdev) 
	master->bus_num = bus_num;



	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	if (!res) {

		dev_err(&pdev->dev, "can't get platform resource\n");

		ret = -EINVAL;

		goto out_master_put;

	}



	dspi->base = devm_ioremap_resource(&pdev->dev, res);

	if (!dspi->base) {

		ret = -EINVAL;

	if (IS_ERR(dspi->base)) {

		ret = PTR_ERR(dspi->base);

		goto out_master_put;

	}

drivers/spi/spi-mpc512x-psc.c

+3 −1
Original line number Diff line number Diff line
@@ -522,8 +522,10 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, 
	psc_num = master->bus_num;

	snprintf(clk_name, sizeof(clk_name), "psc%d_mclk", psc_num);

	clk = devm_clk_get(dev, clk_name);

	if (IS_ERR(clk))

	if (IS_ERR(clk)) {

		ret = PTR_ERR(clk);

		goto free_irq;

	}

	ret = clk_prepare_enable(clk);

	if (ret)

		goto free_irq;

drivers/spi/spi-pxa2xx.c

+10 −1
Original line number Diff line number Diff line
@@ -546,8 +546,17 @@ static irqreturn_t ssp_int(int irq, void *dev_id) 
	if (pm_runtime_suspended(&drv_data->pdev->dev))

		return IRQ_NONE;



	sccr1_reg = read_SSCR1(reg);

	/*

	 * If the device is not yet in RPM suspended state and we get an

	 * interrupt that is meant for another device, check if status bits

	 * are all set to one. That means that the device is already

	 * powered off.

	 */

	status = read_SSSR(reg);

	if (status == ~0)

		return IRQ_NONE;



	sccr1_reg = read_SSCR1(reg);



	/* Ignore possible writes if we don't need to write */

	if (!(sccr1_reg & SSCR1_TIE))

CRA Git | Maintained and supported by SUSTech CRA and CCSE