1 files changed, 3 insertions, 16 deletions

diff --git a/drivers/spi/spi-tegra20-slink.c b/drivers/spi/spi-tegra20-slink.c
index be3a069879c3..eb5b771e1575 100644
--- a/drivers/spi/spi-tegra20-slink.c
+++ b/drivers/spi/spi-tegra20-slink.c
@@ -171,7 +171,6 @@ struct tegra_slink_data {
         void __iomem                            *base;
         phys_addr_t                             phys;
         unsigned                                irq;
-        u32                                     spi_max_frequency;
         u32                                     cur_speed;
 
         struct spi_device                       *cur_spi;
@@ -761,10 +760,6 @@ static int tegra_slink_setup(struct spi_device *spi)
                 spi->mode & SPI_CPHA ? "" : "~",
                 spi->max_speed_hz);
 
-        BUG_ON(spi->chip_select >= MAX_CHIP_SELECT);
-
-        /* Set speed to the spi max fequency if spi device has not set */
-        spi->max_speed_hz = spi->max_speed_hz ? : tspi->spi_max_frequency;
         ret = pm_runtime_get_sync(tspi->dev);
         if (ret < 0) {
                 dev_err(tspi->dev, "pm runtime failed, e = %d\n", ret);
@@ -999,15 +994,6 @@ static irqreturn_t tegra_slink_isr(int irq, void *context_data)
         return IRQ_WAKE_THREAD;
 }
 
-static void tegra_slink_parse_dt(struct tegra_slink_data *tspi)
-{
-        struct device_node *np = tspi->dev->of_node;
-
-        if (of_property_read_u32(np, "spi-max-frequency",
-                                        &tspi->spi_max_frequency))
-                tspi->spi_max_frequency = 25000000; /* 25MHz */
-}
-
 static const struct tegra_slink_chip_data tegra30_spi_cdata = {
         .cs_hold_time = true,
 };
@@ -1053,7 +1039,6 @@ static int tegra_slink_probe(struct platform_device *pdev)
         master->unprepare_message = tegra_slink_unprepare_message;
         master->auto_runtime_pm = true;
         master->num_chipselect = MAX_CHIP_SELECT;
-        master->bus_num = -1;
 
         platform_set_drvdata(pdev, master);
         tspi = spi_master_get_devdata(master);
@@ -1062,7 +1047,9 @@ static int tegra_slink_probe(struct platform_device *pdev)
         tspi->chip_data = cdata;
         spin_lock_init(&tspi->lock);
 
-        tegra_slink_parse_dt(tspi);
+        if (of_property_read_u32(tspi->dev->of_node, "spi-max-frequency",
+                                 &master->max_speed_hz))
+                master->max_speed_hz = 25000000; /* 25MHz */
 
         r = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (!r) {