Commit 22a85e4c authored by Shawn Guo's avatar Shawn Guo Committed by Grant Likely
Browse files

spi/imx: add device tree probe support 



It adds device tree probe support for spi-imx driver.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent c2387cb9

Documentation/devicetree/bindings/spi/fsl-imx-cspi.txt

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
* Freescale (Enhanced) Configurable Serial Peripheral Interface

  (CSPI/eCSPI) for i.MX



Required properties:

- compatible : Should be "fsl,<soc>-cspi" or "fsl,<soc>-ecspi"

- reg : Offset and length of the register set for the device

- interrupts : Should contain CSPI/eCSPI interrupt

- fsl,spi-num-chipselects : Contains the number of the chipselect

- cs-gpios : Specifies the gpio pins to be used for chipselects.



Example:



ecspi@70010000 {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "fsl,imx51-ecspi";

	reg = <0x70010000 0x4000>;

	interrupts = <36>;

	fsl,spi-num-chipselects = <2>;

	cs-gpios = <&gpio3 24 0>, /* GPIO4_24 */

		   <&gpio3 25 0>; /* GPIO4_25 */

};

drivers/spi/spi-imx.c

+31 −7
Original line number Original line Diff line number Diff line
@@ -34,6 +34,9 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/types.h>

#include <linux/types.h>

#include <linux/of.h>

#include <linux/of_device.h>

#include <linux/of_gpio.h>





#include <mach/spi.h>

#include <mach/spi.h>
@@ -604,6 +607,16 @@ static struct platform_device_id spi_imx_devtype[] = { 
	}

	}

};

};





static const struct of_device_id spi_imx_dt_ids[] = {

	{ .compatible = "fsl,imx1-cspi", .data = &imx1_cspi_devtype_data, },

	{ .compatible = "fsl,imx21-cspi", .data = &imx21_cspi_devtype_data, },

	{ .compatible = "fsl,imx27-cspi", .data = &imx27_cspi_devtype_data, },

	{ .compatible = "fsl,imx31-cspi", .data = &imx31_cspi_devtype_data, },

	{ .compatible = "fsl,imx35-cspi", .data = &imx35_cspi_devtype_data, },

	{ .compatible = "fsl,imx51-ecspi", .data = &imx51_ecspi_devtype_data, },

	{ /* sentinel */ }

};



static void spi_imx_chipselect(struct spi_device *spi, int is_active)

static void spi_imx_chipselect(struct spi_device *spi, int is_active)

{

{

	struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);

	struct spi_imx_data *spi_imx = spi_master_get_devdata(spi->master);
@@ -737,19 +750,25 @@ static void spi_imx_cleanup(struct spi_device *spi) 




static int __devinit spi_imx_probe(struct platform_device *pdev)

static int __devinit spi_imx_probe(struct platform_device *pdev)

{

{

	struct spi_imx_master *mxc_platform_info;

	struct device_node *np = pdev->dev.of_node;

	const struct of_device_id *of_id =

			of_match_device(spi_imx_dt_ids, &pdev->dev);

	struct spi_imx_master *mxc_platform_info =

			dev_get_platdata(&pdev->dev);

	struct spi_master *master;

	struct spi_master *master;

	struct spi_imx_data *spi_imx;

	struct spi_imx_data *spi_imx;

	struct resource *res;

	struct resource *res;

	int i, ret, num_cs;

	int i, ret, num_cs;





	mxc_platform_info = dev_get_platdata(&pdev->dev);

	if (!np && !mxc_platform_info) {

	if (!mxc_platform_info) {

		dev_err(&pdev->dev, "can't get the platform data\n");

		dev_err(&pdev->dev, "can't get the platform data\n");

		return -EINVAL;

		return -EINVAL;

	}

	}





	ret = of_property_read_u32(np, "fsl,spi-num-chipselects", &num_cs);

	if (ret < 0)

		num_cs = mxc_platform_info->num_chipselect;

		num_cs = mxc_platform_info->num_chipselect;



	master = spi_alloc_master(&pdev->dev,

	master = spi_alloc_master(&pdev->dev,

			sizeof(struct spi_imx_data) + sizeof(int) * num_cs);

			sizeof(struct spi_imx_data) + sizeof(int) * num_cs);

	if (!master)

	if (!master)
@@ -764,9 +783,12 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) 
	spi_imx->bitbang.master = spi_master_get(master);

	spi_imx->bitbang.master = spi_master_get(master);





	for (i = 0; i < master->num_chipselect; i++) {

	for (i = 0; i < master->num_chipselect; i++) {

		spi_imx->chipselect[i] = mxc_platform_info->chipselect[i];

		int cs_gpio = of_get_named_gpio(np, "cs-gpios", i);

		if (spi_imx->chipselect[i] < 0)

		if (cs_gpio < 0)

			cs_gpio = mxc_platform_info->chipselect[i];

		if (cs_gpio < 0)

			continue;

			continue;

		spi_imx->chipselect[i] = cs_gpio;

		ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);

		ret = gpio_request(spi_imx->chipselect[i], DRIVER_NAME);

		if (ret) {

		if (ret) {

			while (i > 0) {

			while (i > 0) {
@@ -788,7 +810,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) 




	init_completion(&spi_imx->xfer_done);

	init_completion(&spi_imx->xfer_done);





	spi_imx->devtype_data =

	spi_imx->devtype_data = of_id ? of_id->data :

		(struct spi_imx_devtype_data *) pdev->id_entry->driver_data;

		(struct spi_imx_devtype_data *) pdev->id_entry->driver_data;





	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -836,6 +858,7 @@ static int __devinit spi_imx_probe(struct platform_device *pdev) 




	spi_imx->devtype_data->intctrl(spi_imx, 0);

	spi_imx->devtype_data->intctrl(spi_imx, 0);





	master->dev.of_node = pdev->dev.of_node;

	ret = spi_bitbang_start(&spi_imx->bitbang);

	ret = spi_bitbang_start(&spi_imx->bitbang);

	if (ret) {

	if (ret) {

		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);

		dev_err(&pdev->dev, "bitbang start failed with %d\n", ret);
@@ -898,6 +921,7 @@ static struct platform_driver spi_imx_driver = { 
	.driver = {

	.driver = {

		   .name = DRIVER_NAME,

		   .name = DRIVER_NAME,

		   .owner = THIS_MODULE,

		   .owner = THIS_MODULE,

		   .of_match_table = spi_imx_dt_ids,

		   },

		   },

	.id_table = spi_imx_devtype,

	.id_table = spi_imx_devtype,

	.probe = spi_imx_probe,

	.probe = spi_imx_probe,