[PATCH] ARM: OMAP: Fix broken N770 build

[PATCH] ARM: OMAP: Fix broken N770 build

[Dirk Behme]

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


Make build of N770 work again.

Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>


[-- Attachment #2: n770_fixes_patch.txt --]
[-- Type: text/plain, Size: 2695 bytes --]

Index: linux-osk/arch/arm/mach-omap1/board-nokia770.c
===================================================================
--- linux-osk.orig/arch/arm/mach-omap1/board-nokia770.c
+++ linux-osk/arch/arm/mach-omap1/board-nokia770.c
@@ -76,7 +76,7 @@ static struct omap_kp_platform_data noki
 	.rows		= 8,
 	.cols		= 8,
 	.keymap		= nokia770_keymap,
-	.keymapsize	= ARRAY_SIZE(nokia770_keymap)
+	.keymapsize	= ARRAY_SIZE(nokia770_keymap),
 	.delay		= 4,
 };
 
Index: linux-osk/arch/arm/configs/n770_defconfig
===================================================================
--- linux-osk.orig/arch/arm/configs/n770_defconfig
+++ linux-osk/arch/arm/configs/n770_defconfig
@@ -790,8 +790,47 @@ CONFIG_SPI_OMAP_UWIRE=y
 #
 # Hardware Monitoring support
 #
-# CONFIG_HWMON is not set
+CONFIG_HWMON=y
 # CONFIG_HWMON_VID is not set
+# CONFIG_SENSORS_ABITUGURU is not set
+# CONFIG_SENSORS_ADM1021 is not set
+# CONFIG_SENSORS_ADM1025 is not set
+# CONFIG_SENSORS_ADM1026 is not set
+# CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
+# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
+# CONFIG_SENSORS_DS1621 is not set
+# CONFIG_SENSORS_F71805F is not set
+# CONFIG_SENSORS_FSCHER is not set
+# CONFIG_SENSORS_FSCPOS is not set
+# CONFIG_SENSORS_GL518SM is not set
+# CONFIG_SENSORS_GL520SM is not set
+# CONFIG_SENSORS_IT87 is not set
+# CONFIG_SENSORS_LM63 is not set
+# CONFIG_SENSORS_LM70 is not set
+# CONFIG_SENSORS_LM75 is not set
+# CONFIG_SENSORS_LM77 is not set
+# CONFIG_SENSORS_LM78 is not set
+# CONFIG_SENSORS_LM80 is not set
+# CONFIG_SENSORS_LM83 is not set
+# CONFIG_SENSORS_LM85 is not set
+# CONFIG_SENSORS_LM87 is not set
+# CONFIG_SENSORS_LM90 is not set
+# CONFIG_SENSORS_LM92 is not set
+# CONFIG_SENSORS_MAX1619 is not set
+# CONFIG_SENSORS_PC87360 is not set
+# CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47M192 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
+# CONFIG_SENSORS_VT1211 is not set
+# CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83791D is not set
+# CONFIG_SENSORS_W83792D is not set
+# CONFIG_SENSORS_W83L785TS is not set
+# CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
 # Misc devices
Index: linux-osk/drivers/cbus/tahvo-usb.c
===================================================================
--- linux-osk.orig/drivers/cbus/tahvo-usb.c
+++ linux-osk/drivers/cbus/tahvo-usb.c
@@ -36,7 +36,7 @@
 #include <linux/usb_ch9.h>
 #include <linux/usb_gadget.h>
 #include <linux/usb.h>
-#include <linux/usb_otg.h>
+#include <linux/usb/otg.h>
 #include <linux/i2c.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>


[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] ARM: OMAP: Fix broken N770 build

[Tony Lindgren]

* Dirk Behme <dirk.behme@googlemail.com> [061106 21:28]:
> 
> Make build of N770 work again.
> 
> Signed-off-by: Dirk Behme <dirk.behme_at_gmail.com>
> 

Pushing today, I split it into two patches as tahvo-usb is not
in the mainline. Also left out the defconfig changes as they
don't seem to do anything. Let me know if something is needed
on the defconfig.

Regards,

Tony

Re: [PATCH] ARM: OMAP: Fix broken N770 build

[Dirk Behme]

Tony Lindgren wrote:
> Also left out the defconfig changes as they
> don't seem to do anything. Let me know if something is needed
> on the defconfig.

In -rc4 CONFIG_HWMON wasn't evaluated to y necessary to 
build stuff cleanly. Seems that in -rc5 this is fixed. Now, 
CONFIG_HWMON is default y and n770_defconfig builds fine 
without the defconfig patch.

Thanks for updates,

Dirk

Btw: Last warning I see with n770_defconfig in our code is

arch/arm/plat-omap/sti/sti-console.c: In function 
'sti_channel_puts':
arch/arm/plat-omap/sti/sti-console.c:48: warning: value 
computed is not used
arch/arm/plat-omap/sti/sti-console.c:57: warning: value 
computed is not used

Anybody with an idea here?

Re: [PATCH] ARM: OMAP: Fix broken N770 build

[David Weinehall]

On Sat, Nov 11, 2006 at 07:07:17AM +0100, Dirk Behme wrote:
> Tony Lindgren wrote:
> >Also left out the defconfig changes as they
> >don't seem to do anything. Let me know if something is needed
> >on the defconfig.
> 
> In -rc4 CONFIG_HWMON wasn't evaluated to y necessary to 
> build stuff cleanly. Seems that in -rc5 this is fixed. Now, 
> CONFIG_HWMON is default y and n770_defconfig builds fine 
> without the defconfig patch.
> 
> Thanks for updates,
> 
> Dirk
> 
> Btw: Last warning I see with n770_defconfig in our code is
> 
> arch/arm/plat-omap/sti/sti-console.c: In function 
> 'sti_channel_puts':
> arch/arm/plat-omap/sti/sti-console.c:48: warning: value 
> computed is not used
> arch/arm/plat-omap/sti/sti-console.c:57: warning: value 
> computed is not used
> 
> Anybody with an idea here?

Well, at least you don't need to worry about that warning...
I'm pretty certain you don't have an sti-console anyway.


Regards: David
-- 
 /) David Weinehall <tao@acc.umu.se> /) Northern lights wander      (\
//  Maintainer of the v2.0 kernel   //  Dance across the winter sky //
\)  http://www.acc.umu.se/~tao/    (/   Full colour fire           (/