|
@@ -1338,7 +1338,6 @@ static int omap2_mcspi_probe(struct platform_device *pdev)
|
|
struct resource *r;
|
|
struct resource *r;
|
|
int status = 0, i;
|
|
int status = 0, i;
|
|
u32 regs_offset = 0;
|
|
u32 regs_offset = 0;
|
|
- static int bus_num = 1;
|
|
|
|
struct device_node *node = pdev->dev.of_node;
|
|
struct device_node *node = pdev->dev.of_node;
|
|
const struct of_device_id *match;
|
|
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);
|
|
of_property_read_u32(node, "ti,spi-num-cs", &num_cs);
|
|
master->num_chipselect = num_cs;
|
|
master->num_chipselect = num_cs;
|
|
- master->bus_num = bus_num++;
|
|
|
|
if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
|
|
if (of_get_property(node, "ti,pindir-d0-out-d1-in", NULL))
|
|
mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
|
|
mcspi->pin_dir = MCSPI_PINDIR_D0_OUT_D1_IN;
|
|
} else {
|
|
} else {
|
|
pdata = dev_get_platdata(&pdev->dev);
|
|
pdata = dev_get_platdata(&pdev->dev);
|
|
master->num_chipselect = pdata->num_cs;
|
|
master->num_chipselect = pdata->num_cs;
|
|
- if (pdev->id != -1)
|
|
|
|
- master->bus_num = pdev->id;
|
|
|
|
mcspi->pin_dir = pdata->pin_dir;
|
|
mcspi->pin_dir = pdata->pin_dir;
|
|
}
|
|
}
|
|
regs_offset = pdata->regs_offset;
|
|
regs_offset = pdata->regs_offset;
|