gpio: mpc8xxx: Rename Kconfig option, structures, and functions

Rename the Kconfig option, structures (and their members), as well as
functions of the mpc85xx driver to include mpc8xxx to reflect the more
generic usage.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
index 76faa22c8b437012ce9bbd72fde83e3c686e5736..b2ba31e623c7972c3e55308e20d1335c0191f40b 100644 (file)
--- a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
+++ b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
@@ -18,7 +18,7 @@
 #include <asm/mpc85xx_gpio.h>
 #endif
 
-struct mpc85xx_gpio_plat {
+struct mpc8xxx_gpio_plat {
        ulong addr;
        unsigned long size;
        uint ngpios;

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index b4e859e40cfe3b7f4796f17a3be0985c06be6ab2..b121979dddd7c42743b0e415513dba68a9111b13 100644 (file)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -276,11 +276,11 @@ config DM_PCA953X
          Now, max 24 bits chips and PCA953X compatible chips are
          supported
 
-config MPC85XX_GPIO
-       bool "Freescale MPC85XX GPIO driver"
+config MPC8XXX_GPIO
+       bool "Freescale MPC8XXX GPIO driver"
        depends on DM_GPIO
        help
-         This driver supports the built-in GPIO controller of MPC85XX CPUs.
+         This driver supports the built-in GPIO controller of MPC8XXX CPUs.
          Each GPIO bank is identified by its own entry in the device tree,
          i.e.
 
@@ -298,7 +298,4 @@ config MPC85XX_GPIO
          Aside from the standard functions of input/output mode, and output
          value setting, the open-drain feature, which can configure individual
          GPIOs to work as open-drain outputs, is supported.
-
-         The driver has been tested on MPC85XX, but it is likely that other
-         PowerQUICC III devices will work as well.
 endmenu

diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 6c08d4c66cb8a175d55d62933afb2eb9d1e489e5..266c9588fff0f6f6c78b7d569907575c5a236a47 100644 (file)
--- a/drivers/gpio/Makefile
+++ b/drivers/gpio/Makefile
@@ -38,7 +38,7 @@ obj-$(CONFIG_DA8XX_GPIO)      += da8xx_gpio.o
 obj-$(CONFIG_DM644X_GPIO)      += da8xx_gpio.o
 obj-$(CONFIG_ALTERA_PIO)       += altera_pio.o
 obj-$(CONFIG_MPC83XX_GPIO)     += mpc83xx_gpio.o
-obj-$(CONFIG_MPC85XX_GPIO)     += mpc8xxx_gpio.o
+obj-$(CONFIG_MPC8XXX_GPIO)     += mpc8xxx_gpio.o
 obj-$(CONFIG_SH_GPIO_PFC)      += sh_pfc.o
 obj-$(CONFIG_OMAP_GPIO)        += omap_gpio.o
 obj-$(CONFIG_DB8500_GPIO)      += db8500_gpio.o

diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 4566c091b7729352debdd1ecf313d7206597fbc7..e4ebbc117c96dbe82b23c7a4d15c7bb8135bd8fc 100644 (file)
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -25,7 +25,7 @@ struct ccsr_gpio {
        u32     gpicr;
 };
 
-struct mpc85xx_gpio_data {
+struct mpc8xxx_gpio_data {
        /* The bank's register base in memory */
        struct ccsr_gpio __iomem *base;
        /* The address of the registers; used to identify the bank */
@@ -44,130 +44,130 @@ inline u32 gpio_mask(uint gpio)
        return (1U << (31 - (gpio)));
 }
 
-static inline u32 mpc85xx_gpio_get_val(struct ccsr_gpio *base, u32 mask)
+static inline u32 mpc8xxx_gpio_get_val(struct ccsr_gpio *base, u32 mask)
 {
        return in_be32(&base->gpdat) & mask;
 }
 
-static inline u32 mpc85xx_gpio_get_dir(struct ccsr_gpio *base, u32 mask)
+static inline u32 mpc8xxx_gpio_get_dir(struct ccsr_gpio *base, u32 mask)
 {
        return in_be32(&base->gpdir) & mask;
 }
 
-static inline void mpc85xx_gpio_set_in(struct ccsr_gpio *base, u32 gpios)
+static inline void mpc8xxx_gpio_set_in(struct ccsr_gpio *base, u32 gpios)
 {
        clrbits_be32(&base->gpdat, gpios);
        /* GPDIR register 0 -> input */
        clrbits_be32(&base->gpdir, gpios);
 }
 
-static inline void mpc85xx_gpio_set_low(struct ccsr_gpio *base, u32 gpios)
+static inline void mpc8xxx_gpio_set_low(struct ccsr_gpio *base, u32 gpios)
 {
        clrbits_be32(&base->gpdat, gpios);
        /* GPDIR register 1 -> output */
        setbits_be32(&base->gpdir, gpios);
 }
 
-static inline void mpc85xx_gpio_set_high(struct ccsr_gpio *base, u32 gpios)
+static inline void mpc8xxx_gpio_set_high(struct ccsr_gpio *base, u32 gpios)
 {
        setbits_be32(&base->gpdat, gpios);
        /* GPDIR register 1 -> output */
        setbits_be32(&base->gpdir, gpios);
 }
 
-static inline int mpc85xx_gpio_open_drain_val(struct ccsr_gpio *base, u32 mask)
+static inline int mpc8xxx_gpio_open_drain_val(struct ccsr_gpio *base, u32 mask)
 {
        return in_be32(&base->gpodr) & mask;
 }
 
-static inline void mpc85xx_gpio_open_drain_on(struct ccsr_gpio *base, u32
+static inline void mpc8xxx_gpio_open_drain_on(struct ccsr_gpio *base, u32
                                              gpios)
 {
        /* GPODR register 1 -> open drain on */
        setbits_be32(&base->gpodr, gpios);
 }
 
-static inline void mpc85xx_gpio_open_drain_off(struct ccsr_gpio *base,
+static inline void mpc8xxx_gpio_open_drain_off(struct ccsr_gpio *base,
                                               u32 gpios)
 {
        /* GPODR register 0 -> open drain off (actively driven) */
        clrbits_be32(&base->gpodr, gpios);
 }
 
-static int mpc85xx_gpio_direction_input(struct udevice *dev, uint gpio)
+static int mpc8xxx_gpio_direction_input(struct udevice *dev, uint gpio)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
-       mpc85xx_gpio_set_in(data->base, gpio_mask(gpio));
+       mpc8xxx_gpio_set_in(data->base, gpio_mask(gpio));
        return 0;
 }
 
-static int mpc85xx_gpio_set_value(struct udevice *dev, uint gpio, int value)
+static int mpc8xxx_gpio_set_value(struct udevice *dev, uint gpio, int value)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
        if (value) {
                data->dat_shadow |= gpio_mask(gpio);
-               mpc85xx_gpio_set_high(data->base, gpio_mask(gpio));
+               mpc8xxx_gpio_set_high(data->base, gpio_mask(gpio));
        } else {
                data->dat_shadow &= ~gpio_mask(gpio);
-               mpc85xx_gpio_set_low(data->base, gpio_mask(gpio));
+               mpc8xxx_gpio_set_low(data->base, gpio_mask(gpio));
        }
        return 0;
 }
 
-static int mpc85xx_gpio_direction_output(struct udevice *dev, uint gpio,
+static int mpc8xxx_gpio_direction_output(struct udevice *dev, uint gpio,
                                         int value)
 {
-       return mpc85xx_gpio_set_value(dev, gpio, value);
+       return mpc8xxx_gpio_set_value(dev, gpio, value);
 }
 
-static int mpc85xx_gpio_get_value(struct udevice *dev, uint gpio)
+static int mpc8xxx_gpio_get_value(struct udevice *dev, uint gpio)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
-       if (!!mpc85xx_gpio_get_dir(data->base, gpio_mask(gpio))) {
+       if (!!mpc8xxx_gpio_get_dir(data->base, gpio_mask(gpio))) {
                /* Output -> use shadowed value */
                return !!(data->dat_shadow & gpio_mask(gpio));
        }
 
        /* Input -> read value from GPDAT register */
-       return !!mpc85xx_gpio_get_val(data->base, gpio_mask(gpio));
+       return !!mpc8xxx_gpio_get_val(data->base, gpio_mask(gpio));
 }
 
-static int mpc85xx_gpio_get_open_drain(struct udevice *dev, uint gpio)
+static int mpc8xxx_gpio_get_open_drain(struct udevice *dev, uint gpio)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
-       return !!mpc85xx_gpio_open_drain_val(data->base, gpio_mask(gpio));
+       return !!mpc8xxx_gpio_open_drain_val(data->base, gpio_mask(gpio));
 }
 
-static int mpc85xx_gpio_set_open_drain(struct udevice *dev, uint gpio,
+static int mpc8xxx_gpio_set_open_drain(struct udevice *dev, uint gpio,
                                       int value)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
        if (value)
-               mpc85xx_gpio_open_drain_on(data->base, gpio_mask(gpio));
+               mpc8xxx_gpio_open_drain_on(data->base, gpio_mask(gpio));
        else
-               mpc85xx_gpio_open_drain_off(data->base, gpio_mask(gpio));
+               mpc8xxx_gpio_open_drain_off(data->base, gpio_mask(gpio));
 
        return 0;
 }
 
-static int mpc85xx_gpio_get_function(struct udevice *dev, uint gpio)
+static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 {
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        int dir;
 
-       dir = !!mpc85xx_gpio_get_dir(data->base, gpio_mask(gpio));
+       dir = !!mpc8xxx_gpio_get_dir(data->base, gpio_mask(gpio));
        return dir ? GPIOF_OUTPUT : GPIOF_INPUT;
 }
 
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev)
+static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev)
 {
-       struct mpc85xx_gpio_plat *plat = dev_get_platdata(dev);
+       struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
        fdt_addr_t addr;
        fdt_size_t size;
 
@@ -183,10 +183,10 @@ static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev)
 }
 #endif
 
-static int mpc85xx_gpio_platdata_to_priv(struct udevice *dev)
+static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev)
 {
-       struct mpc85xx_gpio_data *priv = dev_get_priv(dev);
-       struct mpc85xx_gpio_plat *plat = dev_get_platdata(dev);
+       struct mpc8xxx_gpio_data *priv = dev_get_priv(dev);
+       struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
        unsigned long size = plat->size;
 
        if (size == 0)
@@ -201,16 +201,18 @@ static int mpc85xx_gpio_platdata_to_priv(struct udevice *dev)
        priv->gpio_count = plat->ngpios;
        priv->dat_shadow = 0;
 
+       priv->type = driver_data;
+
        return 0;
 }
 
-static int mpc85xx_gpio_probe(struct udevice *dev)
+static int mpc8xxx_gpio_probe(struct udevice *dev)
 {
        struct gpio_dev_priv *uc_priv = dev_get_uclass_priv(dev);
-       struct mpc85xx_gpio_data *data = dev_get_priv(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        char name[32], *str;
 
-       mpc85xx_gpio_platdata_to_priv(dev);
+       mpc8xxx_gpio_platdata_to_priv(dev);
 
        snprintf(name, sizeof(name), "MPC@%lx_", data->addr);
        str = strdup(name);
@@ -224,30 +226,30 @@ static int mpc85xx_gpio_probe(struct udevice *dev)
        return 0;
 }
 
-static const struct dm_gpio_ops gpio_mpc85xx_ops = {
-       .direction_input        = mpc85xx_gpio_direction_input,
-       .direction_output       = mpc85xx_gpio_direction_output,
-       .get_value              = mpc85xx_gpio_get_value,
-       .set_value              = mpc85xx_gpio_set_value,
-       .get_open_drain         = mpc85xx_gpio_get_open_drain,
-       .set_open_drain         = mpc85xx_gpio_set_open_drain,
-       .get_function           = mpc85xx_gpio_get_function,
+static const struct dm_gpio_ops gpio_mpc8xxx_ops = {
+       .direction_input        = mpc8xxx_gpio_direction_input,
+       .direction_output       = mpc8xxx_gpio_direction_output,
+       .get_value              = mpc8xxx_gpio_get_value,
+       .set_value              = mpc8xxx_gpio_set_value,
+       .get_open_drain         = mpc8xxx_gpio_get_open_drain,
+       .set_open_drain         = mpc8xxx_gpio_set_open_drain,
+       .get_function           = mpc8xxx_gpio_get_function,
 };
 
-static const struct udevice_id mpc85xx_gpio_ids[] = {
+static const struct udevice_id mpc8xxx_gpio_ids[] = {
        { .compatible = "fsl,pq3-gpio" },
        { /* sentinel */ }
 };
 
-U_BOOT_DRIVER(gpio_mpc85xx) = {
-       .name   = "gpio_mpc85xx",
+U_BOOT_DRIVER(gpio_mpc8xxx) = {
+       .name   = "gpio_mpc8xxx",
        .id     = UCLASS_GPIO,
-       .ops    = &gpio_mpc85xx_ops,
+       .ops    = &gpio_mpc8xxx_ops,
 #if CONFIG_IS_ENABLED(OF_CONTROL)
-       .ofdata_to_platdata = mpc85xx_gpio_ofdata_to_platdata,
-       .platdata_auto_alloc_size = sizeof(struct mpc85xx_gpio_plat),
-       .of_match = mpc85xx_gpio_ids,
+       .ofdata_to_platdata = mpc8xxx_gpio_ofdata_to_platdata,
+       .platdata_auto_alloc_size = sizeof(struct mpc8xxx_gpio_plat),
+       .of_match = mpc8xxx_gpio_ids,
 #endif
-       .probe  = mpc85xx_gpio_probe,
-       .priv_auto_alloc_size = sizeof(struct mpc85xx_gpio_data),
+       .probe  = mpc8xxx_gpio_probe,
+       .priv_auto_alloc_size = sizeof(struct mpc8xxx_gpio_data),
 };