diff mbox

[U-Boot,4/8] i.MX25: Has a GPIO4 too

Message ID 1334223234-23383-5-git-send-email-timo@exertus.fi
State Changes Requested
Delegated to: Stefano Babic
Headers show

Commit Message

Timo Ketola April 12, 2012, 9:33 a.m. UTC 
Signed-off-by: Timo Ketola <timo@exertus.fi>
---
 drivers/gpio/mxc_gpio.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Comments

Stefano Babic April 12, 2012, 11:15 a.m. UTC | #1 
On 12/04/2012 11:33, Timo Ketola wrote:
> Signed-off-by: Timo Ketola <timo@exertus.fi>
> ---
>  drivers/gpio/mxc_gpio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
> index df6bbbb..b5972fd 100644
> --- a/drivers/gpio/mxc_gpio.c
> +++ b/drivers/gpio/mxc_gpio.c
> @@ -40,7 +40,7 @@ static unsigned long gpio_ports[] = {
>  	[0] = GPIO1_BASE_ADDR,
>  	[1] = GPIO2_BASE_ADDR,
>  	[2] = GPIO3_BASE_ADDR,
> -#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
> +#if defined(CONFIG_MX25) || defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
>  	[3] = GPIO4_BASE_ADDR,
>  #endif
>  #if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)

Acked-by : Stefano Babic <sbabic@denx.de>

Best regards,
Stefano Babic
Wolfgang Denk April 12, 2012, 12:10 p.m. UTC | #2 
Dear "Timo Ketola",

In message <1334223234-23383-5-git-send-email-timo@exertus.fi> you wrote:
> Signed-off-by: Timo Ketola <timo@exertus.fi>
> ---
>  drivers/gpio/mxc_gpio.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
> index df6bbbb..b5972fd 100644
> --- a/drivers/gpio/mxc_gpio.c
> +++ b/drivers/gpio/mxc_gpio.c
> @@ -40,7 +40,7 @@ static unsigned long gpio_ports[] = {
>  	[0] = GPIO1_BASE_ADDR,
>  	[1] = GPIO2_BASE_ADDR,
>  	[2] = GPIO3_BASE_ADDR,
> -#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
> +#if defined(CONFIG_MX25) || defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)

line over 80 characters

Please make sure to run your patches through checkpatch !

Best regards,

Wolfgang Denk
Timo Ketola April 12, 2012, 12:20 p.m. UTC | #3 
On 12.04.2012 15:10, Wolfgang Denk wrote:
> Please make sure to run your patches through checkpatch !

Sorry about that.

Now I could use some help about how to best edit my commits...

--

Timo
Detlev Zundel April 12, 2012, 1:09 p.m. UTC | #4 
Hi Timo,

> On 12.04.2012 15:10, Wolfgang Denk wrote:
>> Please make sure to run your patches through checkpatch !
>
> Sorry about that.
>
> Now I could use some help about how to best edit my commits...

What works very nicely for me is to do the changes, do "git add" on them
and then do a 

COMMIT=<commit> ; git commit --squash=$COMMIT ; git rebase -i --autosquash ${COMMIT}^

(substitute <commit> with the commit-ID of the commit in question).  In
the editor you can decide to add more to the messages, or simply leave
them as is.

I'm sure you will find the details on how this works and why in the
manual ;)

Cheers
  Detlev
Timo Ketola April 13, 2012, 4:58 a.m. UTC | #5 
On 12.04.2012 16:09, Detlev Zundel wrote:
> What works very nicely for me is to do the changes, do "git add" on them
> and then do a
>
> COMMIT=<commit>  ; git commit --squash=$COMMIT ; git rebase -i --autosquash ${COMMIT}^

Thanks - thats the kind of handholding I'm missing...

--

Timo
diff mbox

Patch

diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c
index df6bbbb..b5972fd 100644
--- a/drivers/gpio/mxc_gpio.c
+++ b/drivers/gpio/mxc_gpio.c
@@ -40,7 +40,7 @@  static unsigned long gpio_ports[] = {
 	[0] = GPIO1_BASE_ADDR,
 	[1] = GPIO2_BASE_ADDR,
 	[2] = GPIO3_BASE_ADDR,
-#if defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
+#if defined(CONFIG_MX25) || defined(CONFIG_MX51) || defined(CONFIG_MX53) || defined(CONFIG_MX6Q)
 	[3] = GPIO4_BASE_ADDR,
 #endif
 #if defined(CONFIG_MX53) || defined(CONFIG_MX6Q)