[U-Boot] [PATCH v3 3/3] mips: gpio: mscc: Obsoleted gpio-mscc-bitbang-spi.c

Lars Povlsen lars.povlsen at microchip.com
Tue Jan 8 09:38:35 UTC 2019


With the new mscc_bb_spi.c driver, there is no longer use for the
gpio-mscc-bitbang-spi.c driver.

Signed-off-by: Lars Povlsen <lars.povlsen at microchip.com>
Reviewed-by: Daniel Schwierzeck <daniel.schwierzeck at gmail.com>
---
 drivers/gpio/Kconfig                 |   7 --
 drivers/gpio/Makefile                |   1 -
 drivers/gpio/gpio-mscc-bitbang-spi.c | 122 ---------------------------
 3 files changed, 130 deletions(-)
 delete mode 100644 drivers/gpio/gpio-mscc-bitbang-spi.c

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index aa55ff43c4..14a14be917 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -99,13 +99,6 @@ config LPC32XX_GPIO
 	help
 	  Support for the LPC32XX GPIO driver.
 
-config MSCC_BITBANG_SPI_GPIO
-	bool "Microsemi bitbang spi GPIO driver"
-	depends on DM_GPIO && SOC_VCOREIII
-	help
-	  Support controlling the GPIO used for SPI bitbang by software. Can
-	  be used by the VCoreIII SoCs, but it was mainly useful for Luton.
-
 config MSCC_SGPIO
 	bool "Microsemi Serial GPIO driver"
 	depends on DM_GPIO && SOC_VCOREIII
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index be2b3c792f..7c479efe2d 100644
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -59,5 +59,4 @@ obj-$(CONFIG_MSM_GPIO)		+= msm_gpio.o
 obj-$(CONFIG_$(SPL_)PCF8575_GPIO)	+= pcf8575_gpio.o
 obj-$(CONFIG_PM8916_GPIO)	+= pm8916_gpio.o
 obj-$(CONFIG_MT7621_GPIO)	+= mt7621_gpio.o
-obj-$(CONFIG_MSCC_BITBANG_SPI_GPIO)	+= gpio-mscc-bitbang-spi.o
 obj-$(CONFIG_MSCC_SGPIO)	+= mscc_sgpio.o
diff --git a/drivers/gpio/gpio-mscc-bitbang-spi.c b/drivers/gpio/gpio-mscc-bitbang-spi.c
deleted file mode 100644
index b675f9052c..0000000000
--- a/drivers/gpio/gpio-mscc-bitbang-spi.c
+++ /dev/null
@@ -1,122 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/*
- * Microsemi SoCs pinctrl driver
- *
- * Author: <gregory.clement at bootlin.com>
- * License: Dual MIT/GPL
- * Copyright (c) 2018 Microsemi Corporation
- */
-
-#include <common.h>
-#include <asm-generic/gpio.h>
-#include <asm/io.h>
-#include <dm.h>
-#include <errno.h>
-
-enum {
-	SDI,
-	CS0,
-	CS1,
-	CS2,
-	CS3,
-	SDO,
-	SCK
-};
-
-static const int pinmap[] = { 0, 5, 6, 7, 8, 10, 12 };
-
-#define SW_SPI_CSn_OE	 0x1E	/* bits 1 to 4 */
-#define SW_SPI_CS0_OE	 BIT(1)
-#define SW_SPI_SDO_OE	 BIT(9)
-#define SW_SPI_SCK_OE	 BIT(11)
-#define SW_PIN_CTRL_MODE BIT(13)
-
-struct mscc_bb_spi_gpio {
-	void __iomem *regs;
-	u32 cache_val;
-};
-
-static int mscc_bb_spi_gpio_set(struct udevice *dev, unsigned oft, int val)
-{
-	struct mscc_bb_spi_gpio *gpio = dev_get_priv(dev);
-
-	if (val)
-		gpio->cache_val |= BIT(pinmap[oft]);
-	else
-		gpio->cache_val &= ~BIT(pinmap[oft]);
-
-	writel(gpio->cache_val, gpio->regs);
-
-	return 0;
-}
-
-static int mscc_bb_spi_gpio_direction_output(struct udevice *dev, unsigned oft,
-					     int val)
-{
-	if (oft == 0) {
-		pr_err("SW_SPI_DSI can't be used as output\n");
-		return -ENOTSUPP;
-	}
-
-	mscc_bb_spi_gpio_set(dev, oft, val);
-
-	return 0;
-}
-
-static int mscc_bb_spi_gpio_direction_input(struct udevice *dev, unsigned oft)
-{
-	return 0;
-}
-
-static int mscc_bb_spi_gpio_get(struct udevice *dev, unsigned int oft)
-{
-	struct mscc_bb_spi_gpio *gpio = dev_get_priv(dev);
-	u32 val = readl(gpio->regs);
-
-	return !!(val & BIT(pinmap[oft]));
-}
-
-static const struct dm_gpio_ops mscc_bb_spi_gpio_ops = {
-	.direction_output	= mscc_bb_spi_gpio_direction_output,
-	.direction_input	= mscc_bb_spi_gpio_direction_input,
-	.set_value		= mscc_bb_spi_gpio_set,
-	.get_value		= mscc_bb_spi_gpio_get,
-};
-
-static int mscc_bb_spi_gpio_probe(struct udevice *dev)
-{
-	struct mscc_bb_spi_gpio *gpio = dev_get_priv(dev);
-	struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-
-	gpio->regs = dev_remap_addr(dev);
-	if (!gpio->regs)
-		return -EINVAL;
-
-	uc_priv->bank_name = dev->name;
-	uc_priv->gpio_count = ARRAY_SIZE(pinmap);
-	/*
-	 * Enable software mode to control the SPI pin, enables the
-	 * output mode for most of the pin and initialize the cache
-	 * value in the same time
-	 */
-
-	gpio->cache_val = SW_PIN_CTRL_MODE | SW_SPI_SCK_OE | SW_SPI_SDO_OE |
-	    SW_SPI_CS0_OE;
-	writel(gpio->cache_val, gpio->regs);
-
-	return 0;
-}
-
-static const struct udevice_id mscc_bb_spi_gpio_ids[] = {
-	{.compatible = "mscc,spi-bitbang-gpio"},
-	{}
-};
-
-U_BOOT_DRIVER(gpio_mscc_bb_spi) = {
-	.name	= "gpio-mscc-spi-bitbang",
-	.id	= UCLASS_GPIO,
-	.ops	= &mscc_bb_spi_gpio_ops,
-	.probe	= mscc_bb_spi_gpio_probe,
-	.of_match = of_match_ptr(mscc_bb_spi_gpio_ids),
-	.priv_auto_alloc_size = sizeof(struct mscc_bb_spi_gpio),
-};
-- 
2.19.2



More information about the U-Boot mailing list