Merge tag 'cleanup-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm...

[cascardo/linux.git] / drivers / spi / spi-s3c64xx.c

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index a771a3a..480133e 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -197,7 +197,6 @@ struct s3c64xx_spi_driver_data {
        struct s3c64xx_spi_dma_data     tx_dma;
        struct s3c64xx_spi_port_config  *port_conf;
        unsigned int                    port_id;
-       bool                            cs_gpio;
 };
 
 static void flush_fifo(struct s3c64xx_spi_driver_data *sdd)
@@ -754,10 +753,8 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
 {
        struct s3c64xx_spi_csinfo *cs;
        struct device_node *slave_np, *data_np = NULL;
-       struct s3c64xx_spi_driver_data *sdd;
        u32 fb_delay = 0;
 
-       sdd = spi_master_get_devdata(spi->master);
        slave_np = spi->dev.of_node;
        if (!slave_np) {
                dev_err(&spi->dev, "device node not found\n");
@@ -776,17 +773,6 @@ static struct s3c64xx_spi_csinfo *s3c64xx_get_slave_ctrldata(
                return ERR_PTR(-ENOMEM);
        }
 
-       /* The CS line is asserted/deasserted by the gpio pin */
-       if (sdd->cs_gpio)
-               cs->line = of_get_named_gpio(data_np, "cs-gpio", 0);
-
-       if (!gpio_is_valid(cs->line)) {
-               dev_err(&spi->dev, "chip select gpio is not specified or invalid\n");
-               kfree(cs);
-               of_node_put(data_np);
-               return ERR_PTR(-EINVAL);
-       }
-
        of_property_read_u32(data_np, "samsung,spi-feedback-delay", &fb_delay);
        cs->fb_delay = fb_delay;
        of_node_put(data_np);
@@ -807,9 +793,16 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
        int err;
 
        sdd = spi_master_get_devdata(spi->master);
-       if (!cs && spi->dev.of_node) {
+       if (spi->dev.of_node) {
                cs = s3c64xx_get_slave_ctrldata(spi);
                spi->controller_data = cs;
+       } else if (cs) {
+               /* On non-DT platforms the SPI core will set spi->cs_gpio
+                * to -ENOENT. The GPIO pin used to drive the chip select
+                * is defined by using platform data so spi->cs_gpio value
+                * has to be override to have the proper GPIO pin number.
+                */
+               spi->cs_gpio = cs->line;
        }
 
        if (IS_ERR_OR_NULL(cs)) {
@@ -818,18 +811,15 @@ static int s3c64xx_spi_setup(struct spi_device *spi)
        }
 
        if (!spi_get_ctldata(spi)) {
-               /* Request gpio only if cs line is asserted by gpio pins */
-               if (sdd->cs_gpio) {
-                       err = gpio_request_one(cs->line, GPIOF_OUT_INIT_HIGH,
-                                       dev_name(&spi->dev));
+               if (gpio_is_valid(spi->cs_gpio)) {
+                       err = gpio_request_one(spi->cs_gpio, GPIOF_OUT_INIT_HIGH,
+                                              dev_name(&spi->dev));
                        if (err) {
                                dev_err(&spi->dev,
                                        "Failed to get /CS gpio [%d]: %d\n",
-                                       cs->line, err);
+                                       spi->cs_gpio, err);
                                goto err_gpio_req;
                        }
-
-                       spi->cs_gpio = cs->line;
                }
 
                spi_set_ctldata(spi, cs);
@@ -884,7 +874,8 @@ setup_exit:
        /* setup() returns with device de-selected */
        writel(S3C64XX_SPI_SLAVE_SIG_INACT, sdd->regs + S3C64XX_SPI_SLAVE_SEL);
 
-       gpio_free(cs->line);
+       if (gpio_is_valid(spi->cs_gpio))
+               gpio_free(spi->cs_gpio);
        spi_set_ctldata(spi, NULL);
 
 err_gpio_req:
@@ -897,14 +888,21 @@ err_gpio_req:
 static void s3c64xx_spi_cleanup(struct spi_device *spi)
 {
        struct s3c64xx_spi_csinfo *cs = spi_get_ctldata(spi);
-       struct s3c64xx_spi_driver_data *sdd;
 
-       sdd = spi_master_get_devdata(spi->master);
-       if (spi->cs_gpio) {
+       if (gpio_is_valid(spi->cs_gpio)) {
                gpio_free(spi->cs_gpio);
                if (spi->dev.of_node)
                        kfree(cs);
+               else {
+                       /* On non-DT platforms, the SPI core sets
+                        * spi->cs_gpio to -ENOENT and .setup()
+                        * overrides it with the GPIO pin value
+                        * passed using platform data.
+                        */
+                       spi->cs_gpio = -ENOENT;
+               }
        }
+
        spi_set_ctldata(spi, NULL);
 }
 
@@ -1075,11 +1073,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev)
        sdd->cntrlr_info = sci;
        sdd->pdev = pdev;
        sdd->sfr_start = mem_res->start;
-       sdd->cs_gpio = true;
        if (pdev->dev.of_node) {
-               if (!of_find_property(pdev->dev.of_node, "cs-gpio", NULL))
-                       sdd->cs_gpio = false;
-
                ret = of_alias_get_id(pdev->dev.of_node, "spi");
                if (ret < 0) {
                        dev_err(&pdev->dev, "failed to get alias id, errno %d\n",