Commit 78e39523 authored by Axel Lin's avatar Axel Lin Committed by Mark Brown

spi: Remove explictly set bus_num and num_chipselect to default setting

The purpose of commit 1e8a52e1
"spi: By default setup spi_masters with 1 chipselect and dynamics bus number"
is to avoid setting default value for bus_num and num_chipselect in spi master
drivers. So let's remove the duplicate code.
Signed-off-by: default avatarAxel Lin <axel.lin@ingics.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-By: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarStephen Warren <swarren@nvidia.com>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 38dbfb59
...@@ -315,7 +315,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev) ...@@ -315,7 +315,6 @@ static int bcm2835_spi_probe(struct platform_device *pdev)
master->mode_bits = BCM2835_SPI_MODE_BITS; master->mode_bits = BCM2835_SPI_MODE_BITS;
master->bits_per_word_mask = SPI_BPW_MASK(8); master->bits_per_word_mask = SPI_BPW_MASK(8);
master->bus_num = -1;
master->num_chipselect = 3; master->num_chipselect = 3;
master->transfer_one_message = bcm2835_spi_transfer_one; master->transfer_one_message = bcm2835_spi_transfer_one;
master->dev.of_node = pdev->dev.of_node; master->dev.of_node = pdev->dev.of_node;
......
...@@ -308,10 +308,6 @@ static int efm32_spi_probe_dt(struct platform_device *pdev, ...@@ -308,10 +308,6 @@ static int efm32_spi_probe_dt(struct platform_device *pdev,
} }
ddata->pdata.location = location; ddata->pdata.location = location;
/* spi core takes care about the bus number using an alias */
master->bus_num = -1;
return 0; return 0;
} }
......
...@@ -422,9 +422,7 @@ static int falcon_sflash_probe(struct platform_device *pdev) ...@@ -422,9 +422,7 @@ static int falcon_sflash_probe(struct platform_device *pdev)
priv->master = master; priv->master = master;
master->mode_bits = SPI_MODE_3; master->mode_bits = SPI_MODE_3;
master->num_chipselect = 1;
master->flags = SPI_MASTER_HALF_DUPLEX; master->flags = SPI_MASTER_HALF_DUPLEX;
master->bus_num = -1;
master->setup = falcon_sflash_setup; master->setup = falcon_sflash_setup;
master->prepare_transfer_hardware = falcon_sflash_prepare_xfer; master->prepare_transfer_hardware = falcon_sflash_prepare_xfer;
master->transfer_one_message = falcon_sflash_xfer_one; master->transfer_one_message = falcon_sflash_xfer_one;
......
...@@ -257,8 +257,6 @@ static int octeon_spi_probe(struct platform_device *pdev) ...@@ -257,8 +257,6 @@ static int octeon_spi_probe(struct platform_device *pdev)
p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start, p->register_base = (u64)devm_ioremap(&pdev->dev, res_mem->start,
resource_size(res_mem)); resource_size(res_mem));
/* Dynamic bus numbering */
master->bus_num = -1;
master->num_chipselect = 4; master->num_chipselect = 4;
master->mode_bits = SPI_CPHA | master->mode_bits = SPI_CPHA |
SPI_CPOL | SPI_CPOL |
......
...@@ -298,7 +298,6 @@ static int hspi_probe(struct platform_device *pdev) ...@@ -298,7 +298,6 @@ static int hspi_probe(struct platform_device *pdev)
pm_runtime_enable(&pdev->dev); pm_runtime_enable(&pdev->dev);
master->num_chipselect = 1;
master->bus_num = pdev->id; master->bus_num = pdev->id;
master->setup = hspi_setup; master->setup = hspi_setup;
master->cleanup = hspi_cleanup; master->cleanup = hspi_cleanup;
......
...@@ -1058,7 +1058,6 @@ static int tegra_spi_probe(struct platform_device *pdev) ...@@ -1058,7 +1058,6 @@ static int tegra_spi_probe(struct platform_device *pdev)
master->setup = tegra_spi_setup; master->setup = tegra_spi_setup;
master->transfer_one_message = tegra_spi_transfer_one_message; master->transfer_one_message = tegra_spi_transfer_one_message;
master->num_chipselect = MAX_CHIP_SELECT; master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
tspi->master = master; tspi->master = master;
......
...@@ -471,7 +471,6 @@ static int tegra_sflash_probe(struct platform_device *pdev) ...@@ -471,7 +471,6 @@ static int tegra_sflash_probe(struct platform_device *pdev)
master->transfer_one_message = tegra_sflash_transfer_one_message; master->transfer_one_message = tegra_sflash_transfer_one_message;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
master->num_chipselect = MAX_CHIP_SELECT; master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
tsd = spi_master_get_devdata(master); tsd = spi_master_get_devdata(master);
......
...@@ -1053,7 +1053,6 @@ static int tegra_slink_probe(struct platform_device *pdev) ...@@ -1053,7 +1053,6 @@ static int tegra_slink_probe(struct platform_device *pdev)
master->unprepare_message = tegra_slink_unprepare_message; master->unprepare_message = tegra_slink_unprepare_message;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
master->num_chipselect = MAX_CHIP_SELECT; master->num_chipselect = MAX_CHIP_SELECT;
master->bus_num = -1;
platform_set_drvdata(pdev, master); platform_set_drvdata(pdev, master);
tspi = spi_master_get_devdata(master); tspi = spi_master_get_devdata(master);
......
...@@ -429,7 +429,6 @@ static int ti_qspi_probe(struct platform_device *pdev) ...@@ -429,7 +429,6 @@ static int ti_qspi_probe(struct platform_device *pdev)
master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD; master->mode_bits = SPI_CPOL | SPI_CPHA | SPI_RX_DUAL | SPI_RX_QUAD;
master->bus_num = -1;
master->flags = SPI_MASTER_HALF_DUPLEX; master->flags = SPI_MASTER_HALF_DUPLEX;
master->setup = ti_qspi_setup; master->setup = ti_qspi_setup;
master->auto_runtime_pm = true; master->auto_runtime_pm = true;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment