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

Commit 8ded8f00 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-fix-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi fixes from Mark Brown:
 "As well as the usual driver fixes there's a couple of non-trivial core
  fixes in here:

   - Fixes for issues reported by Julia Lawall in the changes that were
     sent last time to fix interaction between the bus lock and the
     locking done for the SPI thread.  I'd let this one cook for a while
     to make sure nothing else came up in testing.

   - A fix from Sien Wu for arithmetic overflows when calculating the
     timeout for larger transfers (espcially common with slow buses with
     flashes on them)"

* tag 'spi-fix-v4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: Prevent unexpected SPI time out due to arithmetic overflow
  spi: pxa2xx-pci: fix ACPI-based enumeration of SPI devices
  MAINTAINERS: add myself as Samsung SPI maintainer
  spi: Drop io_mutex in error paths
  spi: sh-msiof: Avoid invalid clock generator parameters
  spi: img-spfi: Remove spi_master_put in img_spfi_remove()
  spi: mediatek: remove spi_master_put in mtk_spi_remove()
  spi: qup: Remove spi_master_put in spi_qup_remove()
parents 8fa5729d ae4860b5

MAINTAINERS

+11 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,6 @@ F: drivers/*/*s3c64xx* 
F:	drivers/*/*s5pv210*

F:	drivers/memory/samsung/*

F:	drivers/soc/samsung/*

F:	drivers/spi/spi-s3c*

F:	Documentation/arm/Samsung/

F:	Documentation/devicetree/bindings/arm/samsung/

F:	Documentation/devicetree/bindings/sram/samsung-sram.txt
@@ -10254,6 +10253,17 @@ S: Supported 
L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

F:	drivers/clk/samsung/



SAMSUNG SPI DRIVERS

M:	Kukjin Kim <kgene@kernel.org>

M:	Krzysztof Kozlowski <krzk@kernel.org>

M:	Andi Shyti <andi.shyti@samsung.com>

L:	linux-spi@vger.kernel.org

L:	linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)

S:	Maintained

F:	Documentation/devicetree/bindings/spi/spi-samsung.txt

F:	drivers/spi/spi-s3c*

F:	include/linux/platform_data/spi-s3c64xx.h



SAMSUNG SXGBE DRIVERS

M:	Byungho An <bh74.an@samsung.com>

M:	Girish K S <ks.giri@samsung.com>

drivers/spi/spi-img-spfi.c

+0 −2
Original line number Diff line number Diff line
@@ -720,8 +720,6 @@ static int img_spfi_remove(struct platform_device *pdev) 
		clk_disable_unprepare(spfi->sys_clk);

	}



	spi_master_put(master);



	return 0;

}

drivers/spi/spi-mt65xx.c

+0 −1
Original line number Diff line number Diff line
@@ -685,7 +685,6 @@ static int mtk_spi_remove(struct platform_device *pdev) 
	pm_runtime_disable(&pdev->dev);



	mtk_spi_reset(mdata);

	spi_master_put(master);



	return 0;

}

drivers/spi/spi-pxa2xx-pci.c

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev, 
		return PTR_ERR(ssp->clk);



	memset(&pi, 0, sizeof(pi));

	pi.fwnode = dev->dev.fwnode;

	pi.parent = &dev->dev;

	pi.name = "pxa2xx-spi";

	pi.id = ssp->port_id;

drivers/spi/spi-qup.c

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


	pm_runtime_put_noidle(&pdev->dev);

	pm_runtime_disable(&pdev->dev);

	spi_master_put(master);



	return 0;

}