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

Commit 19dee0d2 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'spi/topic/cleanup' into spi-sh-msiof 

Conflicts:
	drivers/spi/spi-sh-msiof.c
parents b0d0ce8b 8e3489f3

drivers/spi/spi-cadence.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ static int __maybe_unused cdns_spi_resume(struct device *dev) 
static SIMPLE_DEV_PM_OPS(cdns_spi_dev_pm_ops, cdns_spi_suspend,

			 cdns_spi_resume);



static struct of_device_id cdns_spi_of_match[] = {

static const struct of_device_id cdns_spi_of_match[] = {

	{ .compatible = "xlnx,zynq-spi-r1p6" },

	{ .compatible = "cdns,spi-r1p6" },

	{ /* end of table */ }

drivers/spi/spi-clps711x.c

+0 −2
Original line number Diff line number Diff line
@@ -184,8 +184,6 @@ static int spi_clps711x_probe(struct platform_device *pdev) 
	}

	master->max_speed_hz = clk_get_rate(hw->spi_clk);



	platform_set_drvdata(pdev, master);



	hw->syscon = syscon_regmap_lookup_by_pdevname("syscon.3");

	if (IS_ERR(hw->syscon)) {

		ret = PTR_ERR(hw->syscon);

drivers/spi/spi-falcon.c

+0 −2
Original line number Diff line number Diff line
@@ -425,8 +425,6 @@ static int falcon_sflash_probe(struct platform_device *pdev) 
	master->unprepare_transfer_hardware = falcon_sflash_unprepare_xfer;

	master->dev.of_node = pdev->dev.of_node;



	platform_set_drvdata(pdev, priv);



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

	if (ret)

		spi_master_put(master);

drivers/spi/spi-fsl-spi.c

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ static struct fsl_spi_match_data of_fsl_spi_grlib_config = { 
	.type = TYPE_GRLIB,

};



static struct of_device_id of_fsl_spi_match[] = {

static const struct of_device_id of_fsl_spi_match[] = {

	{

		.compatible = "fsl,spi",

		.data = &of_fsl_spi_fsl_config,

drivers/spi/spi-omap-100k.c

+0 −2
Original line number Diff line number Diff line
@@ -420,8 +420,6 @@ static int omap1_spi100k_probe(struct platform_device *pdev) 
	master->min_speed_hz = OMAP1_SPI100K_MAX_FREQ/(1<<16);

	master->max_speed_hz = OMAP1_SPI100K_MAX_FREQ;



	platform_set_drvdata(pdev, master);



	spi100k = spi_master_get_devdata(master);



	/*