Re: [PATCH 3/3] Disable linux-omap version of menelaus

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Felipe Balbi]

On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote:
> Fixes linker errors like this:
> 
> drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
> lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
> drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
> drivers/i2c/built-in.o: In function `menelaus_set_vio':
> lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'
> 
> Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> ---
> 
>  drivers/i2c/chips/Makefile |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
> index b451369..d8bef8c 100644
> --- a/drivers/i2c/chips/Makefile
> +++ b/drivers/i2c/chips/Makefile
> @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
>  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
>  obj-$(CONFIG_PCF8575)		+= pcf8575.o
>  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
> -obj-$(CONFIG_MENELAUS)		+= menelaus.o

and mmc is broken again

-- 
balbi

[PATCH 0/3] Hacks to make Nokia N800 compile

[Kalle Valo]

In currently linux-omap tree n800_defconfig doesn't compile because of few
compiler and linker errors. Here are the fixes/hacks which I use. I'll send 
them in case anyone else is interested them.

---

Kalle Valo (3):
      Disable linux-omap version of menelaus
      tsub6010: fix omap compile
      n800-bt: include board-nokia.h


 arch/arm/mach-omap2/board-n800-bt.c |    1 +
 drivers/i2c/chips/Makefile          |    1 -
 drivers/usb/musb/tusb6010_omap.c    |    4 ++--
 3 files changed, 3 insertions(+), 3 deletions(-)

[PATCH 1/3] n800-bt: include board-nokia.h

[Kalle Valo]

Fixes compilation error:

arch/arm/mach-omap2/board-n800-bt.c: In function 'n800_bt_init':
arch/arm/mach-omap2/board-n800-bt.c:36: error: 'OMAP_TAG_NOKIA_BT' undeclared (first use in this function)
arch/arm/mach-omap2/board-n800-bt.c:36: error: (Each undeclared identifier is reported only once
arch/arm/mach-omap2/board-n800-bt.c:36: error: for each function it appears in.)
arch/arm/mach-omap2/board-n800-bt.c:36: error: invalid application of 'sizeof' to incomplete type 'struct omap_bluetooth_config'

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
---

 arch/arm/mach-omap2/board-n800-bt.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-n800-bt.c b/arch/arm/mach-omap2/board-n800-bt.c
index 61afd2b..da3a7bb 100644
--- a/arch/arm/mach-omap2/board-n800-bt.c
+++ b/arch/arm/mach-omap2/board-n800-bt.c
@@ -22,6 +22,7 @@
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <mach/board.h>
+#include <mach/board-nokia.h>
 
 static struct platform_device n800_bt_device = {
 	.name           = "hci_h4p",

[PATCH 2/3] tsub6010: fix omap compile

[Kalle Valo]

drivers/usb/musb/tusb6010_omap.c:18:26: error: asm/arch/dma.h: No such file or directory
drivers/usb/musb/tusb6010_omap.c:19:26: error: asm/arch/mux.h: No such file or directory

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
---

 drivers/usb/musb/tusb6010_omap.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
index 52f7f29..7e073a0 100644
--- a/drivers/usb/musb/tusb6010_omap.c
+++ b/drivers/usb/musb/tusb6010_omap.c
@@ -15,8 +15,8 @@
 #include <linux/usb.h>
 #include <linux/platform_device.h>
 #include <linux/dma-mapping.h>
-#include <asm/arch/dma.h>
-#include <asm/arch/mux.h>
+#include <mach/dma.h>
+#include <mach/mux.h>
 
 #include "musb_core.h"
 

[PATCH 3/3] Disable linux-omap version of menelaus

[Kalle Valo]

Fixes linker errors like this:

drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
drivers/i2c/built-in.o: In function `menelaus_set_vio':
lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'

Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
---

 drivers/i2c/chips/Makefile |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
index b451369..d8bef8c 100644
--- a/drivers/i2c/chips/Makefile
+++ b/drivers/i2c/chips/Makefile
@@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
 obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
 obj-$(CONFIG_PCF8575)		+= pcf8575.o
 obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
-obj-$(CONFIG_MENELAUS)		+= menelaus.o
 obj-$(CONFIG_SENSORS_TSL2550)	+= tsl2550.o
 obj-$(CONFIG_TWL4030_POWEROFF)	+= twl4030-poweroff.o
 obj-$(CONFIG_TWL4030_PWRBUTTON)	+= twl4030-pwrbutton.o

Re: [PATCH 0/3] Hacks to make Nokia N800 compile

[green]

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]

On Thu, 2009-01-22, 022, Kalle Valo wrote:
> In currently linux-omap tree n800_defconfig doesn't compile because of few
> compiler and linker errors. Here are the fixes/hacks which I use. I'll send 
> them in case anyone else is interested them.

Thanks; I hope to try this again soon on an N810.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 197 bytes --]

Re: [PATCH 1/3] n800-bt: include board-nokia.h

[Tony Lindgren]

* Kalle Valo <kalle.valo@nokia.com> [090122 05:20]:
> Fixes compilation error:
> 
> arch/arm/mach-omap2/board-n800-bt.c: In function 'n800_bt_init':
> arch/arm/mach-omap2/board-n800-bt.c:36: error: 'OMAP_TAG_NOKIA_BT' undeclared (first use in this function)
> arch/arm/mach-omap2/board-n800-bt.c:36: error: (Each undeclared identifier is reported only once
> arch/arm/mach-omap2/board-n800-bt.c:36: error: for each function it appears in.)
> arch/arm/mach-omap2/board-n800-bt.c:36: error: invalid application of 'sizeof' to incomplete type 'struct omap_bluetooth_config'

Thanks, pushing to l-o.

Tony

> Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> ---
> 
>  arch/arm/mach-omap2/board-n800-bt.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-n800-bt.c b/arch/arm/mach-omap2/board-n800-bt.c
> index 61afd2b..da3a7bb 100644
> --- a/arch/arm/mach-omap2/board-n800-bt.c
> +++ b/arch/arm/mach-omap2/board-n800-bt.c
> @@ -22,6 +22,7 @@
>  #include <linux/kernel.h>
>  #include <linux/platform_device.h>
>  #include <mach/board.h>
> +#include <mach/board-nokia.h>
>  
>  static struct platform_device n800_bt_device = {
>  	.name           = "hci_h4p",
> 
> --
> 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 2/3] tsub6010: fix omap compile

[Tony Lindgren]

* Kalle Valo <kalle.valo@nokia.com> [090122 05:21]:
> drivers/usb/musb/tusb6010_omap.c:18:26: error: asm/arch/dma.h: No such file or directory
> drivers/usb/musb/tusb6010_omap.c:19:26: error: asm/arch/mux.h: No such file or directory

Not touching this, Felipe needs to queue this up via linux-usb list.

Tony

> 
> Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> ---
> 
>  drivers/usb/musb/tusb6010_omap.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/usb/musb/tusb6010_omap.c b/drivers/usb/musb/tusb6010_omap.c
> index 52f7f29..7e073a0 100644
> --- a/drivers/usb/musb/tusb6010_omap.c
> +++ b/drivers/usb/musb/tusb6010_omap.c
> @@ -15,8 +15,8 @@
>  #include <linux/usb.h>
>  #include <linux/platform_device.h>
>  #include <linux/dma-mapping.h>
> -#include <asm/arch/dma.h>
> -#include <asm/arch/mux.h>
> +#include <mach/dma.h>
> +#include <mach/mux.h>
>  
>  #include "musb_core.h"
>  
> 
> --
> 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 3/3] Disable linux-omap version of menelaus

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [090122 05:27]:
> On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote:
> > Fixes linker errors like this:
> > 
> > drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
> > lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
> > drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
> > drivers/i2c/built-in.o: In function `menelaus_set_vio':
> > lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'
> > 
> > Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> > ---
> > 
> >  drivers/i2c/chips/Makefile |    1 -
> >  1 files changed, 0 insertions(+), 1 deletions(-)
> > 
> > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
> > index b451369..d8bef8c 100644
> > --- a/drivers/i2c/chips/Makefile
> > +++ b/drivers/i2c/chips/Makefile
> > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
> >  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
> >  obj-$(CONFIG_PCF8575)		+= pcf8575.o
> >  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
> > -obj-$(CONFIG_MENELAUS)		+= menelaus.o

I'll also remove drivers/i2c/chips/menelaus.c.

> and mmc is broken again

Hmm..

Tony

Re: [PATCH 2/3] tsub6010: fix omap compile

[Felipe Balbi]

On Thu, Jan 22, 2009 at 06:10:52PM -0800, Tony Lindgren wrote:
> * Kalle Valo <kalle.valo@nokia.com> [090122 05:21]:
> > drivers/usb/musb/tusb6010_omap.c:18:26: error: asm/arch/dma.h: No such file or directory
> > drivers/usb/musb/tusb6010_omap.c:19:26: error: asm/arch/mux.h: No such file or directory
> 
> Not touching this, Felipe needs to queue this up via linux-usb list.

sure, kalle, could you resend to linux-usb@vger.kernel.org ??

also, sure to Cc me

-- 
balbi

Re: [PATCH 2/3] tsub6010: fix omap compile

[Felipe Balbi]

On Fri, Jan 23, 2009 at 04:04:37PM +0200, Kalle Valo wrote:
> Tá bom :)

hehe :-)

-- 
balbi
--
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 2/3] tsub6010: fix omap compile

[Kalle Valo]

Felipe Balbi <felipe.balbi@nokia.com> writes:

> On Thu, Jan 22, 2009 at 06:10:52PM -0800, Tony Lindgren wrote:
>> * Kalle Valo <kalle.valo@nokia.com> [090122 05:21]:
>> > drivers/usb/musb/tusb6010_omap.c:18:26: error: asm/arch/dma.h: No such file or directory
>> > drivers/usb/musb/tusb6010_omap.c:19:26: error: asm/arch/mux.h: No such file or directory
>> 
>> Not touching this, Felipe needs to queue this up via linux-usb list.
>
> sure, kalle, could you resend to linux-usb@vger.kernel.org ??

Ok, I will.

> also, sure to Cc me

Tá bom :)

-- 
Kalle Valo
--
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 3/3] Disable linux-omap version of menelaus

[Felipe Balbi]

On Thu, Jan 22, 2009 at 06:23:34PM -0800, Tony Lindgren wrote:
> * Felipe Balbi <felipe.balbi@nokia.com> [090122 05:27]:
> > On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote:
> > > Fixes linker errors like this:
> > > 
> > > drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
> > > lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
> > > drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
> > > drivers/i2c/built-in.o: In function `menelaus_set_vio':
> > > lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'
> > > 
> > > Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> > > ---
> > > 
> > >  drivers/i2c/chips/Makefile |    1 -
> > >  1 files changed, 0 insertions(+), 1 deletions(-)
> > > 
> > > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
> > > index b451369..d8bef8c 100644
> > > --- a/drivers/i2c/chips/Makefile
> > > +++ b/drivers/i2c/chips/Makefile
> > > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
> > >  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
> > >  obj-$(CONFIG_PCF8575)		+= pcf8575.o
> > >  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
> > > -obj-$(CONFIG_MENELAUS)		+= menelaus.o
> 
> I'll also remove drivers/i2c/chips/menelaus.c.

why, did this driver make its way to mainline with a different name then
??

Where did Jean move it ?

-- 
balbi

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [090123 11:22]:
> On Thu, Jan 22, 2009 at 06:23:34PM -0800, Tony Lindgren wrote:
> > * Felipe Balbi <felipe.balbi@nokia.com> [090122 05:27]:
> > > On Thu, Jan 22, 2009 at 03:19:20PM +0200, Kalle Valo wrote:
> > > > Fixes linker errors like this:
> > > > 
> > > > drivers/i2c/built-in.o: In function `menelaus_set_vdcdc':
> > > > lp5521.c:(.text+0x3910): multiple definition of `menelaus_set_vdcdc'
> > > > drivers/mfd/built-in.o:menelaus.c:(.text+0x95c): first defined here
> > > > drivers/i2c/built-in.o: In function `menelaus_set_vio':
> > > > lp5521.c:(.text+0x3990): multiple definition of `menelaus_set_vio'
> > > > 
> > > > Signed-off-by: Kalle Valo <kalle.valo@nokia.com>
> > > > ---
> > > > 
> > > >  drivers/i2c/chips/Makefile |    1 -
> > > >  1 files changed, 0 insertions(+), 1 deletions(-)
> > > > 
> > > > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
> > > > index b451369..d8bef8c 100644
> > > > --- a/drivers/i2c/chips/Makefile
> > > > +++ b/drivers/i2c/chips/Makefile
> > > > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
> > > >  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
> > > >  obj-$(CONFIG_PCF8575)		+= pcf8575.o
> > > >  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
> > > > -obj-$(CONFIG_MENELAUS)		+= menelaus.o
> > 
> > I'll also remove drivers/i2c/chips/menelaus.c.
> 
> why, did this driver make its way to mainline with a different name then
> ??
> 
> Where did Jean move it ?

Dave has been busy again.. 88e75cc347f66bc20e3c2b920431fc07253d69be.

Tony

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Felipe Balbi]

On Fri, Jan 23, 2009 at 11:23:25AM -0800, Tony Lindgren wrote:
> Dave has been busy again.. 88e75cc347f66bc20e3c2b920431fc07253d69be.

aaa ok, it's difficult to follow Dave, heh :-)

-- 
balbi

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Kalle Valo]

Tony Lindgren <tony@atomide.com> writes:

>> > diff --git a/drivers/i2c/chips/Makefile b/drivers/i2c/chips/Makefile
>> > index b451369..d8bef8c 100644
>> > --- a/drivers/i2c/chips/Makefile
>> > +++ b/drivers/i2c/chips/Makefile
>> > @@ -18,7 +18,6 @@ obj-$(CONFIG_SENSORS_PCA9539)	+= pca9539.o
>> >  obj-$(CONFIG_SENSORS_PCF8574)	+= pcf8574.o
>> >  obj-$(CONFIG_PCF8575)		+= pcf8575.o
>> >  obj-$(CONFIG_SENSORS_PCF8591)	+= pcf8591.o
>> > -obj-$(CONFIG_MENELAUS)		+= menelaus.o
>
> I'll also remove drivers/i2c/chips/menelaus.c.

Thanks. It's nice to see drivers going to upstream.

-- 
Kalle Valo

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[David Brownell]

On Monday 26 January 2009, Kalle Valo wrote:
> > I'll also remove drivers/i2c/chips/menelaus.c.
> 
> Thanks. It's nice to see drivers going to upstream.

That driver has been upstream for quite a long time now.
This change was just helping scrub drivers/i2c/chips,
since it's going away.

That means all drivers which the OMAP tree has in that
directory should be pushed upstream, or at least moved
to a better home, soon ... :)

- Dave

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [090126 13:41]:
> On Monday 26 January 2009, Kalle Valo wrote:
> > > I'll also remove drivers/i2c/chips/menelaus.c.
> > 
> > Thanks. It's nice to see drivers going to upstream.
> 
> That driver has been upstream for quite a long time now.
> This change was just helping scrub drivers/i2c/chips,
> since it's going away.
> 
> That means all drivers which the OMAP tree has in that
> directory should be pushed upstream, or at least moved
> to a better home, soon ... :)

Or else we'll just remove them until somebody patches them back
against the mainline tree.

Tony

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[David Brownell]

On Monday 26 January 2009, Tony Lindgren wrote:
> > 
> > That means all drivers which the OMAP tree has in that
> > directory should be pushed upstream, or at least moved
> > to a better home, soon ... :)
> 
> Or else we'll just remove them until somebody patches them back
> against the mainline tree.

Right:

 - lp5521.c
 - tsl2563.c
 - twl4030-madc.c
 - twl4030-poweroff.c
 - twl4030-pwrbutton.c

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Felipe Balbi]

On Mon, Jan 26, 2009 at 03:17:03PM -0800, David Brownell wrote:
> On Monday 26 January 2009, Tony Lindgren wrote:
> > > 
> > > That means all drivers which the OMAP tree has in that
> > > directory should be pushed upstream, or at least moved
> > > to a better home, soon ... :)
> > 
> > Or else we'll just remove them until somebody patches them back
> > against the mainline tree.
> 
> Right:
> 
>  - lp5521.c
>  - tsl2563.c

at least these two I had patched them and moved to other locations,
looks the patches weren't applied.

-- 
balbi

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [090126 15:19]:
> On Mon, Jan 26, 2009 at 03:17:03PM -0800, David Brownell wrote:
> > On Monday 26 January 2009, Tony Lindgren wrote:
> > > > 
> > > > That means all drivers which the OMAP tree has in that
> > > > directory should be pushed upstream, or at least moved
> > > > to a better home, soon ... :)
> > > 
> > > Or else we'll just remove them until somebody patches them back
> > > against the mainline tree.
> > 
> > Right:
> > 
> >  - lp5521.c
> >  - tsl2563.c
> 
> at least these two I had patched them and moved to other locations,
> looks the patches weren't applied.

Maybe try to send them to the right drivers lists for mainline
integration?

Tony

Re: [PATCH 3/3] Disable linux-omap version of menelaus

[Felipe Balbi]

On Mon, Jan 26, 2009 at 03:27:50PM -0800, Tony Lindgren wrote:
> * Felipe Balbi <me@felipebalbi.com> [090126 15:19]:
> > On Mon, Jan 26, 2009 at 03:17:03PM -0800, David Brownell wrote:
> > > On Monday 26 January 2009, Tony Lindgren wrote:
> > > > > 
> > > > > That means all drivers which the OMAP tree has in that
> > > > > directory should be pushed upstream, or at least moved
> > > > > to a better home, soon ... :)
> > > > 
> > > > Or else we'll just remove them until somebody patches them back
> > > > against the mainline tree.
> > > 
> > > Right:
> > > 
> > >  - lp5521.c
> > >  - tsl2563.c
> > 
> > at least these two I had patched them and moved to other locations,
> > looks the patches weren't applied.
> 
> Maybe try to send them to the right drivers lists for mainline
> integration?

but then you'd have to drop them from l-o ;-)

-- 
balbi