1 files changed, 11 insertions, 13 deletions

diff --git a/drivers/spi/spi-cadence.c b/drivers/spi/spi-cadence.c
index 7b811e38c7ad..240493706c36 100644
--- a/drivers/spi/spi-cadence.c
+++ b/drivers/spi/spi-cadence.c
@@ -516,6 +516,17 @@ static int cdns_spi_probe(struct platform_device *pdev)
                 goto clk_dis_apb;
         }
 
+        ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
+        if (ret < 0)
+                master->num_chipselect = CDNS_SPI_DEFAULT_NUM_CS;
+        else
+                master->num_chipselect = num_cs;
+
+        ret = of_property_read_u32(pdev->dev.of_node, "is-decoded-cs",
+                                   &xspi->is_decoded_cs);
+        if (ret < 0)
+                xspi->is_decoded_cs = 0;
+
         /* SPI controller initializations */
         cdns_spi_init_hw(xspi);
 
@@ -534,19 +545,6 @@ static int cdns_spi_probe(struct platform_device *pdev)
                 goto remove_master;
         }
 
-        ret = of_property_read_u32(pdev->dev.of_node, "num-cs", &num_cs);
-
-        if (ret < 0)
-                master->num_chipselect = CDNS_SPI_DEFAULT_NUM_CS;
-        else
-                master->num_chipselect = num_cs;
-
-        ret = of_property_read_u32(pdev->dev.of_node, "is-decoded-cs",
-                                   &xspi->is_decoded_cs);
-
-        if (ret < 0)
-                xspi->is_decoded_cs = 0;
-
         master->prepare_transfer_hardware = cdns_prepare_transfer_hardware;
         master->prepare_message = cdns_prepare_message;
         master->transfer_one = cdns_transfer_one;