[PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Felipe Balbi]

Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
compilation of board-n800-mmc.c, this patch fixes it.

Still n810 doesn't boot anymore with current linux-omap.
Will look into that soon.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/board-n800-mmc.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
index 2cf8213..2c5c97c 100644
--- a/arch/arm/mach-omap2/board-n800-mmc.c
+++ b/arch/arm/mach-omap2/board-n800-mmc.c
@@ -336,7 +336,7 @@ void __init n800_mmc_init(void)
 
 {
 	if (machine_is_nokia_n810()) {
-		n800_mmc1_data.slots[0].name = "external";
+		mmc1_data.slots[0].name = "external";
 
 		/*
 		 * Some Samsung Movinand chips do not like open-ended
@@ -344,8 +344,8 @@ void __init n800_mmc_init(void)
 		 * while doing so. Reducing the number of blocks in
 		 * the transfer or delays in clock disable do not help
 		 */
-		n800_mmc1_data.slots[1].name = "internal";
-		n800_mmc1_data.slots[1].ban_openended = 1;
+		mmc1_data.slots[1].name = "internal";
+		mmc1_data.slots[1].ban_openended = 1;
 	}
 
 	if (omap_request_gpio(slot_switch_gpio) < 0)
-- 
1.6.0.2.307.gc427

Re: [PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [081006 12:10]:
> Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
> compilation of board-n800-mmc.c, this patch fixes it.

Thanks, pushing.

> Still n810 doesn't boot anymore with current linux-omap.
> Will look into that soon.

Could it be because of the removal of the 0 byte I2C hack?

Tony

> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  arch/arm/mach-omap2/board-n800-mmc.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800-mmc.c b/arch/arm/mach-omap2/board-n800-mmc.c
> index 2cf8213..2c5c97c 100644
> --- a/arch/arm/mach-omap2/board-n800-mmc.c
> +++ b/arch/arm/mach-omap2/board-n800-mmc.c
> @@ -336,7 +336,7 @@ void __init n800_mmc_init(void)
>  
>  {
>  	if (machine_is_nokia_n810()) {
> -		n800_mmc1_data.slots[0].name = "external";
> +		mmc1_data.slots[0].name = "external";
>  
>  		/*
>  		 * Some Samsung Movinand chips do not like open-ended
> @@ -344,8 +344,8 @@ void __init n800_mmc_init(void)
>  		 * while doing so. Reducing the number of blocks in
>  		 * the transfer or delays in clock disable do not help
>  		 */
> -		n800_mmc1_data.slots[1].name = "internal";
> -		n800_mmc1_data.slots[1].ban_openended = 1;
> +		mmc1_data.slots[1].name = "internal";
> +		mmc1_data.slots[1].ban_openended = 1;
>  	}
>  
>  	if (omap_request_gpio(slot_switch_gpio) < 0)
> -- 
> 1.6.0.2.307.gc427
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Felipe Balbi]

On Mon, Oct 06, 2008 at 12:21:38PM +0300, Tony Lindgren wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [081006 12:10]:
> > Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
> > compilation of board-n800-mmc.c, this patch fixes it.
> 
> Thanks, pushing.
> 
> > Still n810 doesn't boot anymore with current linux-omap.
> > Will look into that soon.
> 
> Could it be because of the removal of the 0 byte I2C hack?

could be but I don't really think so. I'll try reverting that hack and
see if it works.

-- 
balbi

Re: [PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Jarkko Nikula]

On Mon,  6 Oct 2008 12:09:22 +0300
"ext Felipe Balbi" <felipe.balbi@nokia.com> wrote:

> Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
> compilation of board-n800-mmc.c, this patch fixes it.
> 
> Still n810 doesn't boot anymore with current linux-omap.
> Will look into that soon.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  arch/arm/mach-omap2/board-n800-mmc.c |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
Heh, I did the very same patch already last week :-)

http://marc.info/?l=linux-omap&m=122286380121424&w=2

I'm not sure but I think N810 was booting then. Or I was using N800.


Jarkko

Re: [PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Felipe Balbi]

On Mon, Oct 06, 2008 at 01:32:27PM +0300, Jarkko Nikula wrote:
> On Mon,  6 Oct 2008 12:09:22 +0300
> "ext Felipe Balbi" <felipe.balbi@nokia.com> wrote:
> 
> > Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
> > compilation of board-n800-mmc.c, this patch fixes it.
> > 
> > Still n810 doesn't boot anymore with current linux-omap.
> > Will look into that soon.
> > 
> > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > ---
> >  arch/arm/mach-omap2/board-n800-mmc.c |    6 +++---
> >  1 files changed, 3 insertions(+), 3 deletions(-)
> > 
> Heh, I did the very same patch already last week :-)
> 
> http://marc.info/?l=linux-omap&m=122286380121424&w=2
> 
> I'm not sure but I think N810 was booting then. Or I was using N800.

cool, let's push your patch then ;-)

-- 
balbi

Re: [PATCH] omap: mmc: fix compile breakage on board-n800-mmc.c

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [081006 14:50]:
> On Mon, Oct 06, 2008 at 01:32:27PM +0300, Jarkko Nikula wrote:
> > On Mon,  6 Oct 2008 12:09:22 +0300
> > "ext Felipe Balbi" <felipe.balbi@nokia.com> wrote:
> > 
> > > Commit 81d2c7d87a9c1eb724788fce7312922effa1b1ae broke
> > > compilation of board-n800-mmc.c, this patch fixes it.
> > > 
> > > Still n810 doesn't boot anymore with current linux-omap.
> > > Will look into that soon.
> > > 
> > > Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> > > ---
> > >  arch/arm/mach-omap2/board-n800-mmc.c |    6 +++---
> > >  1 files changed, 3 insertions(+), 3 deletions(-)
> > > 
> > Heh, I did the very same patch already last week :-)
> > 
> > http://marc.info/?l=linux-omap&m=122286380121424&w=2
> > 
> > I'm not sure but I think N810 was booting then. Or I was using N800.
> 
> cool, let's push your patch then ;-)

Sorry already pushed Felipe's version.

Tony