Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00ab5392 authored by Thomas Abraham's avatar Thomas Abraham Committed by Grant Likely
Browse files

spi/s3c64xx: let device core setup the default pin configuration 



With device core now able to setup the default pin configuration,
the pin configuration code based on the deprecated Samsung specific
gpio bindings is removed.

Signed-off-by: default avatarThomas Abraham <thomas.abraham@linaro.org>
Signed-off-by: default avatarDoug Anderson <dianders@chromium.org>
Acked-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarDoug Anderson <dianders@chromium.org>
Tested-by: default avatarDoug Anderson <dianders@chromium.org>
Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
parent 19624236

Documentation/devicetree/bindings/spi/spi-samsung.txt

+2 −6
Original line number Original line Diff line number Diff line
@@ -31,9 +31,6 @@ Required Board Specific Properties: 




- #address-cells: should be 1.

- #address-cells: should be 1.

- #size-cells: should be 0.

- #size-cells: should be 0.

- gpios: The gpio specifier for clock, mosi and miso interface lines (in the

  order specified). The format of the gpio specifier depends on the gpio

  controller.





Optional Board Specific Properties:

Optional Board Specific Properties:
@@ -86,9 +83,8 @@ Example: 
	spi_0: spi@12d20000 {

	spi_0: spi@12d20000 {

		#address-cells = <1>;

		#address-cells = <1>;

		#size-cells = <0>;

		#size-cells = <0>;

		gpios = <&gpa2 4 2 3 0>,

		pinctrl-names = "default";

			<&gpa2 6 2 3 0>,

		pinctrl-0 = <&spi0_bus>;

			<&gpa2 7 2 3 0>;





		w25q80bw@0 {

		w25q80bw@0 {

			#address-cells = <1>;

			#address-cells = <1>;

drivers/spi/spi-s3c64xx.c

+4 −62
Original line number Original line Diff line number Diff line
@@ -1148,41 +1148,6 @@ static void s3c64xx_spi_hwinit(struct s3c64xx_spi_driver_data *sdd, int channel) 
}

}





#ifdef CONFIG_OF

#ifdef CONFIG_OF

static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)

{

	struct device *dev = &sdd->pdev->dev;

	int idx, gpio, ret;



	/* find gpios for mosi, miso and clock lines */

	for (idx = 0; idx < 3; idx++) {

		gpio = of_get_gpio(dev->of_node, idx);

		if (!gpio_is_valid(gpio)) {

			dev_err(dev, "invalid gpio[%d]: %d\n", idx, gpio);

			goto free_gpio;

		}

		sdd->gpios[idx] = gpio;

		ret = gpio_request(gpio, "spi-bus");

		if (ret) {

			dev_err(dev, "gpio [%d] request failed: %d\n",

				gpio, ret);

			goto free_gpio;

		}

	}

	return 0;



free_gpio:

	while (--idx >= 0)

		gpio_free(sdd->gpios[idx]);

	return -EINVAL;

}



static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd)

{

	unsigned int idx;

	for (idx = 0; idx < 3; idx++)

		gpio_free(sdd->gpios[idx]);

}



static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)

static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev)

{

{

	struct s3c64xx_spi_info *sci;

	struct s3c64xx_spi_info *sci;
@@ -1215,15 +1180,6 @@ static struct s3c64xx_spi_info *s3c64xx_spi_parse_dt(struct device *dev) 
{

{

	return dev->platform_data;

	return dev->platform_data;

}

}



static int s3c64xx_spi_parse_dt_gpio(struct s3c64xx_spi_driver_data *sdd)

{

	return -EINVAL;

}



static void s3c64xx_spi_dt_gpio_free(struct s3c64xx_spi_driver_data *sdd)

{

}

#endif

#endif





static const struct of_device_id s3c64xx_spi_dt_match[];

static const struct of_device_id s3c64xx_spi_dt_match[];
@@ -1344,10 +1300,7 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
		goto err0;

		goto err0;

	}

	}





	if (!sci->cfg_gpio && pdev->dev.of_node) {

	if (sci->cfg_gpio && sci->cfg_gpio()) {

		if (s3c64xx_spi_parse_dt_gpio(sdd))

			return -EBUSY;

	} else if (sci->cfg_gpio == NULL || sci->cfg_gpio()) {

		dev_err(&pdev->dev, "Unable to config gpio\n");

		dev_err(&pdev->dev, "Unable to config gpio\n");

		ret = -EBUSY;

		ret = -EBUSY;

		goto err0;

		goto err0;
@@ -1358,13 +1311,13 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
	if (IS_ERR(sdd->clk)) {

	if (IS_ERR(sdd->clk)) {

		dev_err(&pdev->dev, "Unable to acquire clock 'spi'\n");

		dev_err(&pdev->dev, "Unable to acquire clock 'spi'\n");

		ret = PTR_ERR(sdd->clk);

		ret = PTR_ERR(sdd->clk);

		goto err1;

		goto err0;

	}

	}





	if (clk_prepare_enable(sdd->clk)) {

	if (clk_prepare_enable(sdd->clk)) {

		dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");

		dev_err(&pdev->dev, "Couldn't enable clock 'spi'\n");

		ret = -EBUSY;

		ret = -EBUSY;

		goto err1;

		goto err0;

	}

	}





	sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);

	sprintf(clk_name, "spi_busclk%d", sci->src_clk_nr);
@@ -1421,9 +1374,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) 
	clk_disable_unprepare(sdd->src_clk);

	clk_disable_unprepare(sdd->src_clk);

err2:

err2:

	clk_disable_unprepare(sdd->clk);

	clk_disable_unprepare(sdd->clk);

err1:

	if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)

		s3c64xx_spi_dt_gpio_free(sdd);

err0:

err0:

	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);

	spi_master_put(master);

	spi_master_put(master);
@@ -1446,9 +1396,6 @@ static int s3c64xx_spi_remove(struct platform_device *pdev) 




	clk_disable_unprepare(sdd->clk);

	clk_disable_unprepare(sdd->clk);





	if (!sdd->cntrlr_info->cfg_gpio && pdev->dev.of_node)

		s3c64xx_spi_dt_gpio_free(sdd);



	platform_set_drvdata(pdev, NULL);

	platform_set_drvdata(pdev, NULL);

	spi_master_put(master);

	spi_master_put(master);
@@ -1467,9 +1414,6 @@ static int s3c64xx_spi_suspend(struct device *dev) 
	clk_disable_unprepare(sdd->src_clk);

	clk_disable_unprepare(sdd->src_clk);

	clk_disable_unprepare(sdd->clk);

	clk_disable_unprepare(sdd->clk);





	if (!sdd->cntrlr_info->cfg_gpio && dev->of_node)

		s3c64xx_spi_dt_gpio_free(sdd);



	sdd->cur_speed = 0; /* Output Clock is stopped */

	sdd->cur_speed = 0; /* Output Clock is stopped */





	return 0;

	return 0;
@@ -1481,9 +1425,7 @@ static int s3c64xx_spi_resume(struct device *dev) 
	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);

	struct s3c64xx_spi_driver_data *sdd = spi_master_get_devdata(master);

	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;

	struct s3c64xx_spi_info *sci = sdd->cntrlr_info;





	if (!sci->cfg_gpio && dev->of_node)

	if (sci->cfg_gpio)

		s3c64xx_spi_parse_dt_gpio(sdd);

	else

		sci->cfg_gpio();

		sci->cfg_gpio();





	/* Enable the clock */

	/* Enable the clock */