* [U-Boot] [RESEND PATCH v2 2/7] gpio: pca953x_gpio: Make live-tree compatible
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:51 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 3/7] gpio: mpc85xx_gpio: Fix style violations Mario Six
` (5 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
Make the pca953x_gpio driver compatible with a live device tree.
Reviewed-by: Simon Glass <sjg@chromium.org>
Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
v1 -> v2:
None
---
drivers/gpio/pca953x_gpio.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/gpio/pca953x_gpio.c b/drivers/gpio/pca953x_gpio.c
index 5ea1e05eed..a8a5a89c05 100644
--- a/drivers/gpio/pca953x_gpio.c
+++ b/drivers/gpio/pca953x_gpio.c
@@ -50,8 +50,6 @@ enum {
#define MAX_BANK 5
#define BANK_SZ 8
-DECLARE_GLOBAL_DATA_PTR;
-
/*
* struct pca953x_info - Data for pca953x
*
@@ -253,7 +251,7 @@ static int pca953x_probe(struct udevice *dev)
ulong driver_data;
int ret;
- addr = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev), "reg", 0);
+ addr = dev_read_addr(dev);
if (addr == 0)
return -ENODEV;
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [RESEND PATCH v2 3/7] gpio: mpc85xx_gpio: Fix style violations
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 2/7] gpio: pca953x_gpio: Make live-tree compatible Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:51 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 4/7] gpio: mpc85xx: Rename driver file to mpc8xxx Mario Six
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
Fix some style violations in the MPC85XX GPIO driver.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
v1 -> v2:
None
---
drivers/gpio/mpc85xx_gpio.c | 42 ++++++++++++++++++++++--------------------
1 file changed, 22 insertions(+), 20 deletions(-)
diff --git a/drivers/gpio/mpc85xx_gpio.c b/drivers/gpio/mpc85xx_gpio.c
index cfeb6e7632..4566c091b7 100644
--- a/drivers/gpio/mpc85xx_gpio.c
+++ b/drivers/gpio/mpc85xx_gpio.c
@@ -34,11 +34,13 @@ struct mpc85xx_gpio_data {
uint gpio_count;
/* The GPDAT register cannot be used to determine the value of output
* pins on MPC8572/MPC8536, so we shadow it and use the shadowed value
- * for output pins */
+ * for output pins
+ */
u32 dat_shadow;
};
-inline u32 gpio_mask(unsigned gpio) {
+inline u32 gpio_mask(uint gpio)
+{
return (1U << (31 - (gpio)));
}
@@ -92,7 +94,7 @@ static inline void mpc85xx_gpio_open_drain_off(struct ccsr_gpio *base,
clrbits_be32(&base->gpodr, gpios);
}
-static int mpc85xx_gpio_direction_input(struct udevice *dev, unsigned gpio)
+static int mpc85xx_gpio_direction_input(struct udevice *dev, uint gpio)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
@@ -100,8 +102,7 @@ static int mpc85xx_gpio_direction_input(struct udevice *dev, unsigned gpio)
return 0;
}
-static int mpc85xx_gpio_set_value(struct udevice *dev, unsigned gpio,
- int value)
+static int mpc85xx_gpio_set_value(struct udevice *dev, uint gpio, int value)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
@@ -115,46 +116,46 @@ static int mpc85xx_gpio_set_value(struct udevice *dev, unsigned gpio,
return 0;
}
-static int mpc85xx_gpio_direction_output(struct udevice *dev, unsigned gpio,
+static int mpc85xx_gpio_direction_output(struct udevice *dev, uint gpio,
int value)
{
return mpc85xx_gpio_set_value(dev, gpio, value);
}
-static int mpc85xx_gpio_get_value(struct udevice *dev, unsigned gpio)
+static int mpc85xx_gpio_get_value(struct udevice *dev, uint gpio)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
if (!!mpc85xx_gpio_get_dir(data->base, gpio_mask(gpio))) {
/* Output -> use shadowed value */
return !!(data->dat_shadow & gpio_mask(gpio));
- } else {
- /* Input -> read value from GPDAT register */
- return !!mpc85xx_gpio_get_val(data->base, gpio_mask(gpio));
}
+
+ /* Input -> read value from GPDAT register */
+ return !!mpc85xx_gpio_get_val(data->base, gpio_mask(gpio));
}
-static int mpc85xx_gpio_get_open_drain(struct udevice *dev, unsigned gpio)
+static int mpc85xx_gpio_get_open_drain(struct udevice *dev, uint gpio)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
return !!mpc85xx_gpio_open_drain_val(data->base, gpio_mask(gpio));
}
-static int mpc85xx_gpio_set_open_drain(struct udevice *dev, unsigned gpio,
+static int mpc85xx_gpio_set_open_drain(struct udevice *dev, uint gpio,
int value)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
- if (value) {
+ if (value)
mpc85xx_gpio_open_drain_on(data->base, gpio_mask(gpio));
- } else {
+ else
mpc85xx_gpio_open_drain_off(data->base, gpio_mask(gpio));
- }
+
return 0;
}
-static int mpc85xx_gpio_get_function(struct udevice *dev, unsigned gpio)
+static int mpc85xx_gpio_get_function(struct udevice *dev, uint gpio)
{
struct mpc85xx_gpio_data *data = dev_get_priv(dev);
int dir;
@@ -164,14 +165,15 @@ static int mpc85xx_gpio_get_function(struct udevice *dev, unsigned gpio)
}
#if CONFIG_IS_ENABLED(OF_CONTROL)
-static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev) {
+static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev)
+{
struct mpc85xx_gpio_plat *plat = dev_get_platdata(dev);
fdt_addr_t addr;
fdt_size_t size;
addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob,
- dev_of_offset(dev), "reg", 0, &size, false);
-
+ dev_of_offset(dev),
+ "reg", 0, &size, false);
plat->addr = addr;
plat->size = size;
plat->ngpios = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
@@ -229,7 +231,7 @@ static const struct dm_gpio_ops gpio_mpc85xx_ops = {
.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,
+ .get_function = mpc85xx_gpio_get_function,
};
static const struct udevice_id mpc85xx_gpio_ids[] = {
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [RESEND PATCH v2 4/7] gpio: mpc85xx: Rename driver file to mpc8xxx
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 2/7] gpio: pca953x_gpio: Make live-tree compatible Mario Six
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 3/7] gpio: mpc85xx_gpio: Fix style violations Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:51 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 5/7] gpio: mpc8xxx: Rename Kconfig option, structures, and functions Mario Six
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
In preparation to making the MPC85xx GPIO driver useable for a broader
range of SoCs, rename the driver file.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
v1 -> v2:
None
---
drivers/gpio/Makefile | 2 +-
drivers/gpio/{mpc85xx_gpio.c => mpc8xxx_gpio.c} | 0
2 files changed, 1 insertion(+), 1 deletion(-)
rename drivers/gpio/{mpc85xx_gpio.c => mpc8xxx_gpio.c} (100%)
diff --git a/drivers/gpio/Makefile b/drivers/gpio/Makefile
index 8525679091..6c08d4c66c 100644
--- 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) += mpc85xx_gpio.o
+obj-$(CONFIG_MPC85XX_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/mpc85xx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
similarity index 100%
rename from drivers/gpio/mpc85xx_gpio.c
rename to drivers/gpio/mpc8xxx_gpio.c
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [RESEND PATCH v2 5/7] gpio: mpc8xxx: Rename Kconfig option, structures, and functions
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
` (2 preceding siblings ...)
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 4/7] gpio: mpc85xx: Rename driver file to mpc8xxx Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:52 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 6/7] gpio: mpc8xxx: Make compatible with more SoCs Mario Six
` (2 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
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>
---
v1 -> v2:
None
---
arch/powerpc/include/asm/arch-mpc85xx/gpio.h | 2 +-
drivers/gpio/Kconfig | 9 +--
drivers/gpio/Makefile | 2 +-
drivers/gpio/mpc8xxx_gpio.c | 116 ++++++++++++++-------------
4 files changed, 64 insertions(+), 65 deletions(-)
diff --git a/arch/powerpc/include/asm/arch-mpc85xx/gpio.h b/arch/powerpc/include/asm/arch-mpc85xx/gpio.h
index 76faa22c8b..b2ba31e623 100644
--- 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 b4e859e40c..b121979ddd 100644
--- 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 6c08d4c66c..266c9588ff 100644
--- 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 4566c091b7..e4ebbc117c 100644
--- 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),
};
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [U-Boot, RESEND, v2, 5/7] gpio: mpc8xxx: Rename Kconfig option, structures, and functions
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 5/7] gpio: mpc8xxx: Rename Kconfig option, structures, and functions Mario Six
@ 2018-01-28 18:52 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2018-01-28 18:52 UTC (permalink / raw)
To: u-boot
On Mon, Jan 15, 2018 at 11:07:48AM +0100, Mario Six wrote:
> 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>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180128/89540bac/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [RESEND PATCH v2 6/7] gpio: mpc8xxx: Make compatible with more SoCs
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
` (3 preceding siblings ...)
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 5/7] gpio: mpc8xxx: Rename Kconfig option, structures, and functions Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:52 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 7/7] gpio: mpc8xxx: Make live-tree compatible Mario Six
2018-01-28 18:51 ` [U-Boot] [U-Boot, RESEND, v2, 1/7] gpio: pca953x_gpio: Fix style violations Tom Rini
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
Finally, make the mpc8xxx driver capable of handling more GPIO devices;
this entails adding a special case for the MPC5121 SoC, and adding a set
of new compatible strings.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
v1 -> v2:
None
---
drivers/gpio/mpc8xxx_gpio.c | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index e4ebbc117c..0aa72ecd9f 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -11,8 +11,8 @@
#include <common.h>
#include <dm.h>
-#include <asm/gpio.h>
#include <mapmem.h>
+#include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -37,6 +37,12 @@ struct mpc8xxx_gpio_data {
* for output pins
*/
u32 dat_shadow;
+ ulong type;
+};
+
+enum {
+ MPC8XXX_GPIO_TYPE,
+ MPC5121_GPIO_TYPE,
};
inline u32 gpio_mask(uint gpio)
@@ -119,6 +125,12 @@ static int mpc8xxx_gpio_set_value(struct udevice *dev, uint gpio, int value)
static int mpc8xxx_gpio_direction_output(struct udevice *dev, uint gpio,
int value)
{
+ struct mpc8xxx_gpio_data *data = dev_get_priv(dev);
+
+ /* GPIO 28..31 are input only on MPC5121 */
+ if (data->type == MPC5121_GPIO_TYPE && gpio >= 28)
+ return -EINVAL;
+
return mpc8xxx_gpio_set_value(dev, gpio, value);
}
@@ -188,6 +200,7 @@ static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev)
struct mpc8xxx_gpio_data *priv = dev_get_priv(dev);
struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
unsigned long size = plat->size;
+ ulong driver_data = dev_get_driver_data(dev);
if (size == 0)
size = 0x100;
@@ -237,7 +250,13 @@ static const struct dm_gpio_ops gpio_mpc8xxx_ops = {
};
static const struct udevice_id mpc8xxx_gpio_ids[] = {
- { .compatible = "fsl,pq3-gpio" },
+ { .compatible = "fsl,pq3-gpio", .data = MPC8XXX_GPIO_TYPE },
+ { .compatible = "fsl,mpc8308-gpio", .data = MPC8XXX_GPIO_TYPE },
+ { .compatible = "fsl,mpc8349-gpio", .data = MPC8XXX_GPIO_TYPE },
+ { .compatible = "fsl,mpc8572-gpio", .data = MPC8XXX_GPIO_TYPE},
+ { .compatible = "fsl,mpc8610-gpio", .data = MPC8XXX_GPIO_TYPE},
+ { .compatible = "fsl,mpc5121-gpio", .data = MPC5121_GPIO_TYPE, },
+ { .compatible = "fsl,qoriq-gpio", .data = MPC8XXX_GPIO_TYPE },
{ /* sentinel */ }
};
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [U-Boot, RESEND, v2, 6/7] gpio: mpc8xxx: Make compatible with more SoCs
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 6/7] gpio: mpc8xxx: Make compatible with more SoCs Mario Six
@ 2018-01-28 18:52 ` Tom Rini
0 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2018-01-28 18:52 UTC (permalink / raw)
To: u-boot
On Mon, Jan 15, 2018 at 11:07:49AM +0100, Mario Six wrote:
> Finally, make the mpc8xxx driver capable of handling more GPIO devices;
> this entails adding a special case for the MPC5121 SoC, and adding a set
> of new compatible strings.
>
> Signed-off-by: Mario Six <mario.six@gdsys.cc>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180128/3ada09c7/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread
* [U-Boot] [RESEND PATCH v2 7/7] gpio: mpc8xxx: Make live-tree compatible
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
` (4 preceding siblings ...)
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 6/7] gpio: mpc8xxx: Make compatible with more SoCs Mario Six
@ 2018-01-15 10:07 ` Mario Six
2018-01-28 18:52 ` [U-Boot] [U-Boot, RESEND, v2, " Tom Rini
2018-01-28 18:51 ` [U-Boot] [U-Boot, RESEND, v2, 1/7] gpio: pca953x_gpio: Fix style violations Tom Rini
6 siblings, 1 reply; 14+ messages in thread
From: Mario Six @ 2018-01-15 10:07 UTC (permalink / raw)
To: u-boot
Make the MPC8xxx GPIO driver compatible with a live device tree.
Signed-off-by: Mario Six <mario.six@gdsys.cc>
---
v1 -> v2:
None
---
drivers/gpio/mpc8xxx_gpio.c | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/drivers/gpio/mpc8xxx_gpio.c b/drivers/gpio/mpc8xxx_gpio.c
index 0aa72ecd9f..326fd1672d 100644
--- a/drivers/gpio/mpc8xxx_gpio.c
+++ b/drivers/gpio/mpc8xxx_gpio.c
@@ -14,8 +14,6 @@
#include <mapmem.h>
#include <asm/gpio.h>
-DECLARE_GLOBAL_DATA_PTR;
-
struct ccsr_gpio {
u32 gpdir;
u32 gpodr;
@@ -181,15 +179,14 @@ static int mpc8xxx_gpio_ofdata_to_platdata(struct udevice *dev)
{
struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
fdt_addr_t addr;
- fdt_size_t size;
+ u32 reg[2];
+
+ dev_read_u32_array(dev, "reg", reg, 2);
+ addr = dev_translate_address(dev, reg);
- addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob,
- dev_of_offset(dev),
- "reg", 0, &size, false);
plat->addr = addr;
- plat->size = size;
- plat->ngpios = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
- "ngpios", 32);
+ plat->size = reg[1];
+ plat->ngpios = dev_read_u32_default(dev, "ngpios", 32);
return 0;
}
@@ -206,7 +203,7 @@ static int mpc8xxx_gpio_platdata_to_priv(struct udevice *dev)
size = 0x100;
priv->addr = plat->addr;
- priv->base = map_sysmem(CONFIG_SYS_IMMR + plat->addr, size);
+ priv->base = map_sysmem(plat->addr, size);
if (!priv->base)
return -ENOMEM;
--
2.11.0
^ permalink raw reply related [flat|nested] 14+ messages in thread* [U-Boot] [U-Boot, RESEND, v2, 1/7] gpio: pca953x_gpio: Fix style violations
2018-01-15 10:07 [U-Boot] [RESEND PATCH v2 1/7] gpio: pca953x_gpio: Fix style violations Mario Six
` (5 preceding siblings ...)
2018-01-15 10:07 ` [U-Boot] [RESEND PATCH v2 7/7] gpio: mpc8xxx: Make live-tree compatible Mario Six
@ 2018-01-28 18:51 ` Tom Rini
6 siblings, 0 replies; 14+ messages in thread
From: Tom Rini @ 2018-01-28 18:51 UTC (permalink / raw)
To: u-boot
On Mon, Jan 15, 2018 at 11:07:44AM +0100, Mario Six wrote:
> Fix some style violations in the pca953x_gpio driver.
>
> Signed-off-by: Mario Six <mario.six@gdsys.cc>
Applied to u-boot/master, thanks!
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180128/0ff40ee4/attachment.sig>
^ permalink raw reply [flat|nested] 14+ messages in thread