Commit ae4860b5 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers',... 

Merge remote-tracking branches 'spi/fix/lock', 'spi/fix/maintainers', 'spi/fix/put', 'spi/fix/pxa2xx', 'spi/fix/sh-msiof' and 'spi/fix/timeout' into spi-linus
parents c6935931 764f2166 2e365a70 2932c287 b70cd2de c3ccf357 d0716dde

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;

}