Hacks to make Nokia N800 compile

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 <[email protected]>

---

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

arch/arm/mach-omap2/board-n800-bt.c +1 -1

index 61afd2b..da3a7bb 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

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 <[email protected]>

---

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

drivers/usb/musb/tusb6010_omap.c +2 -3

index 52f7f29..7e073a0 100644
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

Quoted 2 lines · 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

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

Quoted 5 lines · Tony Lindgren

Quoted 2 lines · 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

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

sure, kalle, could you resend to [email protected] ??

also, sure to Cc me

Tá bom :)

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 <[email protected]>

---

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

drivers/i2c/chips/Makefile +0 -0

index b451369..d8bef8c 100644

Quoted 14 lines · 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 <[email protected]>

---

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

drivers/i2c/chips/Makefile obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o · line 21

Quoted 9 lines

drivers/i2c/chips/Makefile +0 -1

index b451369..d8bef8c 100644
@@ -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

Quoted 15 lines · Felipe Balbi

Quoted 14 lines · 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 <[email protected]>

---

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

Quoted 9 lines

drivers/i2c/chips/Makefile obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o · line 21

Quoted 9 lines

drivers/i2c/chips/Makefile +0 -1

index b451369..d8bef8c 100644
@@ -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.

Quoted 16 lines · Tony Lindgren

Quoted 15 lines · Felipe Balbi

Quoted 14 lines · 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 <[email protected]>

---

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

Quoted 11 lines

Quoted 9 lines

drivers/i2c/chips/Makefile obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o · line 21

Quoted 9 lines

drivers/i2c/chips/Makefile +0 -1

index b451369..d8bef8c 100644
@@ -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.

Quoted 9 lines

drivers/i2c/chips/Makefile obj-$(CONFIG_SENSORS_PCA9539) += pca9539.o · line 21

Quoted 9 lines

drivers/i2c/chips/Makefile +0 -1

index b451369..d8bef8c 100644
@@ -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.

Quoted 1 line

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

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

Quoted 3 lines · Kalle Valo

Quoted 1 line

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 ... :)

Quoted 4 lines

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.

Quoted 5 lines · Tony Lindgren

Quoted 4 lines

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 ... :)

Quoted 2 lines

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

Right:

- lp5521.c
- tsl2563.c

Quoted 9 lines · David Brownell

Quoted 7 lines · Tony Lindgren

Quoted 4 lines

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.

Quoted 4 lines

Right:

- lp5521.c
- tsl2563.c

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

Quoted 12 lines · Felipe Balbi

Quoted 11 lines · David Brownell

Quoted 7 lines · Tony Lindgren

Quoted 4 lines

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:

Quoted 5 lines

Quoted 2 lines

- 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?

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.