Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-26 14:40:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

gpio: mpc8xxx: Make compatible with more SoCs

Browse source 
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>
This commit is contained in:
Mario Six 2018-01-15 11:07:49 +01:00 committed by Tom Rini
parent 3c21683480
commit f9c7fde260
1 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/gpio/mpc8xxx_gpio.c
View file

@ -11,8 +11,8 @@
#include <common.h> #include <common.h>
#include <dm.h> #include <dm.h>
#include <asm/gpio.h>
#include <mapmem.h> #include <mapmem.h>
#include <asm/gpio.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -37,6 +37,12 @@ struct mpc8xxx_gpio_data {
* for output pins * for output pins
*/ */
u32 dat_shadow; u32 dat_shadow;
ulong type;
};
enum {
MPC8XXX_GPIO_TYPE,
MPC5121_GPIO_TYPE,
}; };
inline u32 gpio_mask(uint gpio) 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, static int mpc8xxx_gpio_direction_output(struct udevice *dev, uint gpio,
int value) 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); 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_data *priv = dev_get_priv(dev);
struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev); struct mpc8xxx_gpio_plat *plat = dev_get_platdata(dev);
unsigned long size = plat->size; unsigned long size = plat->size;
ulong driver_data = dev_get_driver_data(dev);
if (size == 0) if (size == 0)
size = 0x100; size = 0x100;
@ -237,7 +250,13 @@ static const struct dm_gpio_ops gpio_mpc8xxx_ops = {
}; };
static const struct udevice_id mpc8xxx_gpio_ids[] = { 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 */ } { /* sentinel */ }
}; };