FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu Kernel Team

 
 
LinkBack Thread Tools
 
Old 04-29-2010, 12:08 PM
Mike Rapoport
 
Default OMAP3: beagle: make beagleboard boot with CONFIG_OMAP_MUX

Enabling CONFIG_OMAP_MUX prevents boot on BeaglBoard.
Provide temporaty fix until the problem is properly resolved.

Signed-off-by: Mike Rapoport <mike@compulab.co.il>
---
arch/arm/mach-omap2/board-omap3beagle.c | 8 ++++++++
arch/arm/mach-omap2/mux.c | 3 +++
2 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 8e936e1..dd3ed80 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -46,6 +46,14 @@
#include <plat/timer-gp.h>
#include <plat/display.h>

+/*
+ FIXME: ugly fix to enable beagleboard boot with CONFIG_OMAP_MUX enabled.
+ undefining it here makes calls to omap_mux_* noops
+*/
+#ifdef CONFIG_OMAP_MUX
+#undef CONFIG_OMAP_MUX
+#endif
+
#include "mux.h"
#include "mmc-twl4030.h"

diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 5fef73f..5e7978f 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -69,6 +69,9 @@ void omap_mux_write(u16 val, u16 reg)

void omap_mux_write_array(struct omap_board_mux *board_mux)
{
+ if (!board_mux)
+ return;
+
while (board_mux->reg_offset != OMAP_MUX_TERMINATOR) {
omap_mux_write(board_mux->value, board_mux->reg_offset);
board_mux++;
--
1.6.6.2


--
kernel-team mailing list
kernel-team@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/kernel-team
 

Thread Tools




All times are GMT. The time now is 05:02 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org