Unverified Commit 04518cd8 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by Mark Brown
Browse files

spi: gpio: Make use of device properties 



Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Include mod_devicetable.h explicitly to replace the dropped of.h
which included mod_devicetable.h indirectly.

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://msgid.link/r/20240517194246.747427-2-andriy.shevchenko@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f44b3730

drivers/spi/spi-gpio.c

+18 −33
Original line number Diff line number Diff line
@@ -5,17 +5,17 @@ 
 * Copyright (C) 2006,2008 David Brownell

 * Copyright (C) 2017 Linus Walleij

 */

#include <linux/gpio/consumer.h>

#include <linux/kernel.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>

#include <linux/platform_device.h>

#include <linux/gpio/consumer.h>

#include <linux/of.h>

#include <linux/property.h>



#include <linux/spi/spi.h>

#include <linux/spi/spi_bitbang.h>

#include <linux/spi/spi_gpio.h>





/*

 * This bitbanging SPI host driver should help make systems usable

 * when a native hardware SPI engine is not available, perhaps because
@@ -326,29 +326,6 @@ static int spi_gpio_request(struct device *dev, struct spi_gpio *spi_gpio) 
	return PTR_ERR_OR_ZERO(spi_gpio->sck);

}



#ifdef CONFIG_OF

static const struct of_device_id spi_gpio_dt_ids[] = {

	{ .compatible = "spi-gpio" },

	{}

};

MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids);



static int spi_gpio_probe_dt(struct platform_device *pdev,

			     struct spi_controller *host)

{

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

	host->use_gpio_descriptors = true;



	return 0;

}

#else

static inline int spi_gpio_probe_dt(struct platform_device *pdev,

				    struct spi_controller *host)

{

	return 0;

}

#endif



static int spi_gpio_probe_pdata(struct platform_device *pdev,

				struct spi_controller *host)

{
@@ -389,19 +366,21 @@ static int spi_gpio_probe(struct platform_device *pdev) 
	struct spi_controller		*host;

	struct spi_gpio			*spi_gpio;

	struct device			*dev = &pdev->dev;

	struct fwnode_handle		*fwnode = dev_fwnode(dev);

	struct spi_bitbang		*bb;



	host = devm_spi_alloc_host(dev, sizeof(*spi_gpio));

	if (!host)

		return -ENOMEM;



	if (pdev->dev.of_node)

		status = spi_gpio_probe_dt(pdev, host);

	else

	if (fwnode) {

		device_set_node(&host->dev, fwnode);

		host->use_gpio_descriptors = true;

	} else {

		status = spi_gpio_probe_pdata(pdev, host);



		if (status)

			return status;

	}



	spi_gpio = spi_controller_get_devdata(host);
@@ -459,10 +438,16 @@ static int spi_gpio_probe(struct platform_device *pdev) 


MODULE_ALIAS("platform:" DRIVER_NAME);



static const struct of_device_id spi_gpio_dt_ids[] = {

	{ .compatible = "spi-gpio" },

	{}

};

MODULE_DEVICE_TABLE(of, spi_gpio_dt_ids);



static struct platform_driver spi_gpio_driver = {

	.driver = {

		.name	= DRIVER_NAME,

		.of_match_table = of_match_ptr(spi_gpio_dt_ids),

		.of_match_table = spi_gpio_dt_ids,

	},

	.probe		= spi_gpio_probe,

};