gpio: mpc8xxx: support fsl-layerscape platform

Make the MPC8XXX gpio driver to support the fsl-layerscape.

Signed-off-by: hui.song <hui.song_1@nxp.com>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>

diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 1dfd22522c7d5d4cba1b647ac76b8231af35b115..27881a73224babaf48a652628f12215a50f184c9 100644 (file)
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -6,12 +6,15 @@
  * based on arch/powerpc/include/asm/mpc85xx_gpio.h, which is
  *
  * Copyright 2010 eXMeritus, A Boeing Company
+ * Copyright 2020 NXP
  */
 
 #include <common.h>
 #include <dm.h>
 #include <mapmem.h>
 #include <asm/gpio.h>
+#include <asm/io.h>
+#include <dm/of_access.h>
 
 struct ccsr_gpio {
        u32     gpdir;
@@ -20,6 +23,7 @@ struct ccsr_gpio {
        u32     gpier;
        u32     gpimr;
        u32     gpicr;
+       u32     gpibe;
 };
 
 struct mpc8xxx_gpio_data {
@@ -35,6 +39,7 @@ struct mpc8xxx_gpio_data {
         */
        u32 dat_shadow;
        ulong type;
+       bool  little_endian;
 };
 
 enum {
@@ -47,33 +52,56 @@ inline u32 gpio_mask(uint gpio)
        return (1U << (31 - (gpio)));
 }
 
-static inline u32 mpc8xxx_gpio_get_val(struct ccsr_gpio *base, u32 mask)
+static inline u32 mpc8xxx_gpio_get_val(struct udevice *dev, u32 mask)
 {
-       return in_be32(&base->gpdat) & mask;
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
+
+       if (data->little_endian)
+               return in_le32(&data->base->gpdat) & mask;
+       else
+               return in_be32(&data->base->gpdat) & mask;
 }
 
-static inline u32 mpc8xxx_gpio_get_dir(struct ccsr_gpio *base, u32 mask)
+static inline u32 mpc8xxx_gpio_get_dir(struct udevice *dev, u32 mask)
 {
-       return in_be32(&base->gpdir) & mask;
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
+
+       if (data->little_endian)
+               return in_le32(&data->base->gpdir) & mask;
+       else
+               return in_be32(&data->base->gpdir) & mask;
 }
 
-static inline int mpc8xxx_gpio_open_drain_val(struct ccsr_gpio *base, u32 mask)
+static inline int mpc8xxx_gpio_open_drain_val(struct udevice *dev, u32 mask)
 {
-       return in_be32(&base->gpodr) & mask;
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
+
+       if (data->little_endian)
+               return in_le32(&data->base->gpodr) & mask;
+       else
+               return in_be32(&data->base->gpodr) & mask;
 }
 
-static inline void mpc8xxx_gpio_open_drain_on(struct ccsr_gpio *base, u32
+static inline void mpc8xxx_gpio_open_drain_on(struct udevice *dev, u32
                                              gpios)
 {
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        /* GPODR register 1 -> open drain on */
-       setbits_be32(&base->gpodr, gpios);
+       if (data->little_endian)
+               setbits_le32(&data->base->gpodr, gpios);
+       else
+               setbits_be32(&data->base->gpodr, gpios);
 }
 
-static inline void mpc8xxx_gpio_open_drain_off(struct ccsr_gpio *base,
+static inline void mpc8xxx_gpio_open_drain_off(struct udevice *dev,
                                               u32 gpios)
 {
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        /* GPODR register 0 -> open drain off (actively driven) */
-       clrbits_be32(&base->gpodr, gpios);
+       if (data->little_endian)
+               clrbits_le32(&data->base->gpodr, gpios);
+       else
+               clrbits_be32(&data->base->gpodr, gpios);
 }
 
 static int mpc8xxx_gpio_direction_input(struct udevice *dev, uint gpio)
@@ -82,7 +110,10 @@ static int mpc8xxx_gpio_direction_input(struct udevice *dev, uint gpio)
        u32 mask = gpio_mask(gpio);
 
        /* GPDIR register 0 -> input */
-       clrbits_be32(&data->base->gpdir, mask);
+       if (data->little_endian)
+               clrbits_le32(&data->base->gpdir, mask);
+       else
+               clrbits_be32(&data->base->gpdir, mask);
 
        return 0;
 }
@@ -100,10 +131,20 @@ static int mpc8xxx_gpio_set_value(struct udevice *dev, uint gpio, int value)
                data->dat_shadow &= ~mask;
        }
 
-       gpdir = in_be32(&base->gpdir);
+       if (data->little_endian)
+               gpdir = in_le32(&base->gpdir);
+       else
+               gpdir = in_be32(&base->gpdir);
+
        gpdir |= gpio_mask(gpio);
-       out_be32(&base->gpdat, gpdir & data->dat_shadow);
-       out_be32(&base->gpdir, gpdir);
+
+       if (data->little_endian) {
+               out_le32(&base->gpdat, gpdir & data->dat_shadow);
+               out_le32(&base->gpdir, gpdir);
+       } else {
+               out_be32(&base->gpdat, gpdir & data->dat_shadow);
+               out_be32(&base->gpdir, gpdir);
+       }
 
        return 0;
 }
@@ -124,21 +165,20 @@ static int mpc8xxx_gpio_get_value(struct udevice *dev, uint gpio)
 {
        struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
 
-       if (!!mpc8xxx_gpio_get_dir(data->base, gpio_mask(gpio))) {
+       if (!!mpc8xxx_gpio_get_dir(dev, gpio_mask(gpio))) {
                /* Output -> use shadowed value */
                return !!(data->dat_shadow & gpio_mask(gpio));
        }
 
        /* Input -> read value from GPDAT register */
-       return !!mpc8xxx_gpio_get_val(data->base, gpio_mask(gpio));
+       return !!mpc8xxx_gpio_get_val(dev, gpio_mask(gpio));
 }
 
 static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 {
-       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        int dir;
 
-       dir = !!mpc8xxx_gpio_get_dir(data->base, gpio_mask(gpio));
+       dir = !!mpc8xxx_gpio_get_dir(dev, gpio_mask(gpio));
        return dir ? GPIOF_OUTPUT : GPIOF_INPUT;
 }
 
@@ -146,14 +186,33 @@ static int mpc8xxx_gpio_get_function(struct udevice *dev, uint gpio)
 static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev)
 {
        struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
+       struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
        fdt_addr_t addr;
-       u32 reg[2];
+       u32 i;
+       u32 reg[4];
+
+       if (ofnode_read_bool(dev->node, "little-endian"))
+               data->little_endian = true;
+
+       if (data->little_endian)
+               dev_read_u32_array(dev, "reg", reg, 4);
+       else
+               dev_read_u32_array(dev, "reg", reg, 2);
+
+       if (data->little_endian) {
+               for (i = 0; i < 2; i++)
+                       reg[i] = be32_to_cpu(reg[i]);
+       }
 
-       dev_read_u32_array(dev, "reg", reg, 2);
        addr = dev_translate_address(dev, reg);
 
        plat->addr = addr;
-       plat->size = reg[1];
+
+       if (data->little_endian)
+               plat->size = reg[3];
+       else
+               plat->size = reg[1];
+
        plat->ngpios = dev_read_u32_default(dev, "ngpios", 32);
 
        return 0;
@@ -198,6 +257,13 @@ static int mpc8xxx_gpio_probe(struct udevice *dev)
        if (!str)
                return -ENOMEM;
 
+       if (ofnode_device_is_compatible(dev->node, "fsl,qoriq-gpio")) {
+               unsigned long gpibe = data->addr + sizeof(struct ccsr_gpio)
+                       - sizeof(u32);
+
+               out_be32((unsigned int *)gpibe, 0xffffffff);
+       }
+
        uc_priv->bank_name = str;
        uc_priv->gpio_count = data->gpio_count;