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

Merge branch 'for-5.7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi into spi-5.8

parents 73da2352 b9dd3f6d

drivers/spi/spi-bcm2835.c

+3 −1
Original line number Diff line number Diff line
@@ -1351,7 +1351,7 @@ static int bcm2835_spi_probe(struct platform_device *pdev) 
		goto out_dma_release;

	}



	err = devm_spi_register_controller(&pdev->dev, ctlr);

	err = spi_register_controller(ctlr);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI controller: %d\n",

			err);
@@ -1378,6 +1378,8 @@ static int bcm2835_spi_remove(struct platform_device *pdev) 


	bcm2835_debugfs_remove(bs);



	spi_unregister_controller(ctlr);



	/* Clear FIFOs, and disable the HW block */

	bcm2835_wr(bs, BCM2835_SPI_CS,

		   BCM2835_SPI_CS_CLEAR_RX | BCM2835_SPI_CS_CLEAR_TX);

drivers/spi/spi-bcm2835aux.c

+3 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ static int bcm2835aux_spi_probe(struct platform_device *pdev) 
		goto out_clk_disable;

	}



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

	err = spi_register_master(master);

	if (err) {

		dev_err(&pdev->dev, "could not register SPI master: %d\n", err);

		goto out_clk_disable;
@@ -593,6 +593,8 @@ static int bcm2835aux_spi_remove(struct platform_device *pdev) 


	bcm2835aux_debugfs_remove(bs);



	spi_unregister_master(master);



	bcm2835aux_spi_reset_hw(bs);



	/* disable the HW block by releasing the clock */

drivers/spi/spi.c

+2 −1
Original line number Diff line number Diff line
@@ -2761,6 +2761,8 @@ void spi_unregister_controller(struct spi_controller *ctlr) 
	struct spi_controller *found;

	int id = ctlr->bus_num;



	device_for_each_child(&ctlr->dev, NULL, __unregister);



	/* First make sure that this controller was ever added */

	mutex_lock(&board_lock);

	found = idr_find(&spi_master_idr, id);
@@ -2773,7 +2775,6 @@ void spi_unregister_controller(struct spi_controller *ctlr) 
	list_del(&ctlr->list);

	mutex_unlock(&board_lock);



	device_for_each_child(&ctlr->dev, NULL, __unregister);

	device_unregister(&ctlr->dev);

	/* free bus id */

	mutex_lock(&board_lock);