| Message ID | 1437391715-1344-12-git-send-email-Peng.Fan@freescale.com |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On 20/07/2015 13:28, Peng Fan wrote: > i.MX6UL does not have GPIO6/7, so do not include them for i.MX6UL. > > Signed-off-by: Peng Fan <Peng.Fan@freescale.com> > --- > > Changes v3: > none > > Changes v2: > none > > drivers/gpio/mxc_gpio.c | 4 ++++ > 1 file changed, 4 insertions(+) > > diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c > index 2012f99..57a650f 100644 > --- a/drivers/gpio/mxc_gpio.c > +++ b/drivers/gpio/mxc_gpio.c > @@ -45,11 +45,15 @@ static unsigned long gpio_ports[] = { > #endif > #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) > [4] = GPIO5_BASE_ADDR, > +#ifndef CONFIG_MX6UL > [5] = GPIO6_BASE_ADDR, > #endif > +#endif > #if defined(CONFIG_MX53) || defined(CONFIG_MX6) > +#ifndef CONFIG_MX6UL > [6] = GPIO7_BASE_ADDR, > #endif > +#endif > }; > > static int mxc_gpio_direction(unsigned int gpio, > Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 2012f99..57a650f 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -45,11 +45,15 @@ static unsigned long gpio_ports[] = { #endif #if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) [4] = GPIO5_BASE_ADDR, +#ifndef CONFIG_MX6UL [5] = GPIO6_BASE_ADDR, #endif +#endif #if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#ifndef CONFIG_MX6UL [6] = GPIO7_BASE_ADDR, #endif +#endif }; static int mxc_gpio_direction(unsigned int gpio,
i.MX6UL does not have GPIO6/7, so do not include them for i.MX6UL. Signed-off-by: Peng Fan <Peng.Fan@freescale.com> --- Changes v3: none Changes v2: none drivers/gpio/mxc_gpio.c | 4 ++++ 1 file changed, 4 insertions(+)