mfd: pcF50633-gpio: Remove unused driver

The pcf50633 was used as part of the OpenMoko devices but
the support for its main chip was recently removed in:
commit 61b7f8920b17 ("ARM: s3c: remove all s3c24xx support")

See https://lore.kernel.org/all/Z8z236h4B5A6Ki3D@gallifrey/

Remove it.

Signed-off-by: "Dr. David Alan Gilbert" <linux@treblig.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20250311014959.743322-4-linux@treblig.org
Signed-off-by: Lee Jones <lee@kernel.org>

diff --git a/arch/mips/configs/ip27_defconfig b/arch/mips/configs/ip27_defconfig
index 66085bb71bc44d2579e1a8abb7cb695595de7c98..0a9ec09aff6545e172b6a7e0ea973c25f341ea9a 100644 (file)
--- a/arch/mips/configs/ip27_defconfig
+++ b/arch/mips/configs/ip27_defconfig
@@ -256,7 +256,6 @@ CONFIG_I2C_STUB=m
 # CONFIG_HWMON is not set
 CONFIG_THERMAL=y
 CONFIG_MFD_PCF50633=m
-CONFIG_PCF50633_GPIO=m
 # CONFIG_VGA_ARB is not set
 CONFIG_LEDS_LP3944=m
 CONFIG_LEDS_PCA955X=m

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index cd55ef1027e05de779960b79675b35d298560fa5..4bd31f6a6b4c2f3813e63334e6b6153012ba8f96 100644 (file)
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1142,13 +1142,6 @@ config MFD_PCF50633
          facilities, and registers devices for the various functions
          so that function-specific drivers can bind to them.
 
-config PCF50633_GPIO
-       tristate "NXP PCF50633 GPIO"
-       depends on MFD_PCF50633
-       help
-         Say yes here if you want to include support GPIO for pins on
-         the PCF50633 chip.
-
 config MFD_PM8XXX
        tristate "Qualcomm PM8xxx PMIC chips driver"
        depends on ARM || HEXAGON || COMPILE_TEST

diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
index 481e4c7e1e2dd993c9ee60df73400caf47229716..e3e78ad1ee4b610d16f8e18a6800569889ce432d 100644 (file)
--- a/drivers/mfd/Makefile
+++ b/drivers/mfd/Makefile
@@ -185,7 +185,6 @@ obj-$(CONFIG_MFD_MT6397)    += mt6397.o
 
 pcf50633-objs                  := pcf50633-core.o pcf50633-irq.o
 obj-$(CONFIG_MFD_PCF50633)     += pcf50633.o
-obj-$(CONFIG_PCF50633_GPIO)    += pcf50633-gpio.o
 obj-$(CONFIG_RZ_MTU3)          += rz-mtu3.o
 obj-$(CONFIG_ABX500_CORE)      += abx500-core.o
 obj-$(CONFIG_MFD_DB8500_PRCMU) += db8500-prcmu.o

diff --git a/drivers/mfd/pcf50633-gpio.c b/drivers/mfd/pcf50633-gpio.c
deleted file mode 100644 (file)
index 3e36821..0000000
--- a/drivers/mfd/pcf50633-gpio.c
+++ /dev/null
@@ -1,92 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-/* NXP PCF50633 GPIO Driver
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * Author: Balaji Rao <balajirrao@openmoko.org>
- * All rights reserved.
- *
- * Broken down from monstrous PCF50633 driver mainly by
- * Harald Welte, Andy Green and Werner Almesberger
- */
-
-#include <linux/kernel.h>
-#include <linux/module.h>
-
-#include <linux/mfd/pcf50633/core.h>
-#include <linux/mfd/pcf50633/gpio.h>
-#include <linux/mfd/pcf50633/pmic.h>
-
-static const u8 pcf50633_regulator_registers[PCF50633_NUM_REGULATORS] = {
-       [PCF50633_REGULATOR_AUTO]       = PCF50633_REG_AUTOOUT,
-       [PCF50633_REGULATOR_DOWN1]      = PCF50633_REG_DOWN1OUT,
-       [PCF50633_REGULATOR_DOWN2]      = PCF50633_REG_DOWN2OUT,
-       [PCF50633_REGULATOR_MEMLDO]     = PCF50633_REG_MEMLDOOUT,
-       [PCF50633_REGULATOR_LDO1]       = PCF50633_REG_LDO1OUT,
-       [PCF50633_REGULATOR_LDO2]       = PCF50633_REG_LDO2OUT,
-       [PCF50633_REGULATOR_LDO3]       = PCF50633_REG_LDO3OUT,
-       [PCF50633_REGULATOR_LDO4]       = PCF50633_REG_LDO4OUT,
-       [PCF50633_REGULATOR_LDO5]       = PCF50633_REG_LDO5OUT,
-       [PCF50633_REGULATOR_LDO6]       = PCF50633_REG_LDO6OUT,
-       [PCF50633_REGULATOR_HCLDO]      = PCF50633_REG_HCLDOOUT,
-};
-
-int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val)
-{
-       u8 reg;
-
-       reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-
-       return pcf50633_reg_set_bit_mask(pcf, reg, 0x07, val);
-}
-EXPORT_SYMBOL_GPL(pcf50633_gpio_set);
-
-u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio)
-{
-       u8 reg, val;
-
-       reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-       val = pcf50633_reg_read(pcf, reg) & 0x07;
-
-       return val;
-}
-EXPORT_SYMBOL_GPL(pcf50633_gpio_get);
-
-int pcf50633_gpio_invert_set(struct pcf50633 *pcf, int gpio, int invert)
-{
-       u8 val, reg;
-
-       reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-       val = !!invert << 3;
-
-       return pcf50633_reg_set_bit_mask(pcf, reg, 1 << 3, val);
-}
-EXPORT_SYMBOL_GPL(pcf50633_gpio_invert_set);
-
-int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio)
-{
-       u8 reg, val;
-
-       reg = gpio - PCF50633_GPIO1 + PCF50633_REG_GPIO1CFG;
-       val = pcf50633_reg_read(pcf, reg);
-
-       return val & (1 << 3);
-}
-EXPORT_SYMBOL_GPL(pcf50633_gpio_invert_get);
-
-int pcf50633_gpio_power_supply_set(struct pcf50633 *pcf,
-                                       int gpio, int regulator, int on)
-{
-       u8 reg, val, mask;
-
-       /* the *ENA register is always one after the *OUT register */
-       reg = pcf50633_regulator_registers[regulator] + 1;
-
-       val = !!on << (gpio - PCF50633_GPIO1);
-       mask = 1 << (gpio - PCF50633_GPIO1);
-
-       return pcf50633_reg_set_bit_mask(pcf, reg, mask, val);
-}
-EXPORT_SYMBOL_GPL(pcf50633_gpio_power_supply_set);
-
-MODULE_DESCRIPTION("NXP PCF50633 GPIO Driver");
-MODULE_LICENSE("GPL");

diff --git a/include/linux/mfd/pcf50633/gpio.h b/include/linux/mfd/pcf50633/gpio.h
deleted file mode 100644 (file)
index f589e35..0000000
--- a/include/linux/mfd/pcf50633/gpio.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * gpio.h -- GPIO driver for NXP PCF50633
- *
- * (C) 2006-2008 by Openmoko, Inc.
- * All rights reserved.
- */
-
-#ifndef __LINUX_MFD_PCF50633_GPIO_H
-#define __LINUX_MFD_PCF50633_GPIO_H
-
-#include <linux/mfd/pcf50633/core.h>
-
-#define PCF50633_GPIO1         1
-#define PCF50633_GPIO2         2
-#define PCF50633_GPIO3         3
-#define PCF50633_GPO           4
-
-#define PCF50633_REG_GPIO1CFG  0x14
-#define PCF50633_REG_GPIO2CFG  0x15
-#define PCF50633_REG_GPIO3CFG  0x16
-#define PCF50633_REG_GPOCFG    0x17
-
-#define PCF50633_GPOCFG_GPOSEL_MASK    0x07
-
-enum pcf50633_reg_gpocfg {
-       PCF50633_GPOCFG_GPOSEL_0        = 0x00,
-       PCF50633_GPOCFG_GPOSEL_LED_NFET = 0x01,
-       PCF50633_GPOCFG_GPOSEL_SYSxOK   = 0x02,
-       PCF50633_GPOCFG_GPOSEL_CLK32K   = 0x03,
-       PCF50633_GPOCFG_GPOSEL_ADAPUSB  = 0x04,
-       PCF50633_GPOCFG_GPOSEL_USBxOK   = 0x05,
-       PCF50633_GPOCFG_GPOSEL_ACTPH4   = 0x06,
-       PCF50633_GPOCFG_GPOSEL_1        = 0x07,
-       PCF50633_GPOCFG_GPOSEL_INVERSE  = 0x08,
-};
-
-int pcf50633_gpio_set(struct pcf50633 *pcf, int gpio, u8 val);
-u8 pcf50633_gpio_get(struct pcf50633 *pcf, int gpio);
-
-int pcf50633_gpio_invert_set(struct pcf50633 *, int gpio, int invert);
-int pcf50633_gpio_invert_get(struct pcf50633 *pcf, int gpio);
-
-int pcf50633_gpio_power_supply_set(struct pcf50633 *,
-                                       int gpio, int regulator, int on);
-#endif /* __LINUX_MFD_PCF50633_GPIO_H */
-
-