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

Commit b590782a authored by Suniel Mahesh's avatar Suniel Mahesh Committed by Mark Brown
Browse files

spi: omap: Allocate bus number from spi framework 



spi framework should allocate bus number dynamically either
via Linux IDR or spi alias for master drivers. This patch deletes
code pertaining to manual allocation of spi bus number in spi omap2
master driver.

Signed-off-by: default avatarSuniel Mahesh <sunil.m@techveda.org>
Signed-off-by: default avatarKarthik Tummala <karthik@techveda.org>
Tested-by: default avatarKarthik Tummala <karthik@techveda.org>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5771a8c0

drivers/spi/spi-omap2-mcspi.c

+0 −4
Original line number Diff line number Diff line
@@ -1338,7 +1338,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 
	struct resource		*r;

	int			status = 0, i;

	u32			regs_offset = 0;

	static int		bus_num = 1;

	struct device_node	*node = pdev->dev.of_node;

	const struct of_device_id *match;
@@ -1374,14 +1373,11 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 


		of_property_read_u32(node, "ti,spi-num-cs", &num_cs);

		master->num_chipselect = num_cs;

		master->bus_num = bus_num++;

		if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))

			mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;

	} else {

		pdata = dev_get_platdata(&pdev->dev);

		master->num_chipselect = pdata->num_cs;

		if (pdev->id != -1)

			master->bus_num = pdev->id;

		mcspi->pin_dir = pdata->pin_dir;

	}

	regs_offset = pdata->regs_offset;