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

Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx',... 

Merge remote-tracking branches 'spi/fix/bcm2835', 'spi/fix/bcm63xx', 'spi/fix/mpc512x-psc', 'spi/fix/mxs', 'spi/fix/pxa2xx', 'spi/fix/qspi', 'spi/fix/rspi' and 'spi/fix/txx9' into spi-linus
parents b8aba761 e0b35b89 ec325268 a4469a42 e322ce93 c50325f7 cbcabb7a 53063ec6 b38f87ec

drivers/spi/spi-bcm2835.c

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 


static int bcm2835_spi_remove(struct platform_device *pdev)

{

	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct spi_master *master = platform_get_drvdata(pdev);

	struct bcm2835_spi *bs = spi_master_get_devdata(master);



	free_irq(bs->irq, master);

drivers/spi/spi-bcm63xx.c

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ static int bcm63xx_spi_probe(struct platform_device *pdev) 


static int bcm63xx_spi_remove(struct platform_device *pdev)

{

	struct spi_master *master = spi_master_get(platform_get_drvdata(pdev));

	struct spi_master *master = platform_get_drvdata(pdev);

	struct bcm63xx_spi *bs = spi_master_get_devdata(master);



	/* reset spi block */

drivers/spi/spi-mpc512x-psc.c

+1 −1
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ static int mpc512x_psc_spi_do_probe(struct device *dev, u32 regaddr, 


static int mpc512x_psc_spi_do_remove(struct device *dev)

{

	struct spi_master *master = spi_master_get(dev_get_drvdata(dev));

	struct spi_master *master = dev_get_drvdata(dev);

	struct mpc512x_psc_spi *mps = spi_master_get_devdata(master);



	clk_disable_unprepare(mps->clk_mclk);

drivers/spi/spi-mxs.c

+1 −1
Original line number Diff line number Diff line
@@ -565,7 +565,7 @@ static int mxs_spi_remove(struct platform_device *pdev) 
	struct mxs_spi *spi;

	struct mxs_ssp *ssp;



	master = spi_master_get(platform_get_drvdata(pdev));

	master = platform_get_drvdata(pdev);

	spi = spi_master_get_devdata(master);

	ssp = &spi->ssp;

drivers/spi/spi-pxa2xx.c

+5 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,8 @@ pxa2xx_spi_acpi_get_pdata(struct platform_device *pdev) 
static struct acpi_device_id pxa2xx_spi_acpi_match[] = {

	{ "INT33C0", 0 },

	{ "INT33C1", 0 },

	{ "INT3430", 0 },

	{ "INT3431", 0 },

	{ "80860F0E", 0 },

	{ },

};
@@ -1291,6 +1293,9 @@ static int pxa2xx_spi_resume(struct device *dev) 
	/* Enable the SSP clock */

	clk_prepare_enable(ssp->clk);



	/* Restore LPSS private register bits */

	lpss_ssp_setup(drv_data);



	/* Start the queue running */

	status = spi_master_resume(drv_data->master);

	if (status != 0) {