Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d48af15e authored by Tony Lindgren's avatar Tony Lindgren Committed by Russell King
Browse files

[PATCH] ARM: 2802/1: OMAP update 8/11: Update OMAP arch files 



Patch from Tony Lindgren

This patch by various OMAP developers syncs the OMAP
specific arch files with the linux-omap tree.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5e1c5ff4

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -223,7 +223,9 @@ source "arch/arm/mach-pxa/Kconfig" 


source "arch/arm/mach-sa1100/Kconfig"



source "arch/arm/mach-omap/Kconfig"

source "arch/arm/plat-omap/Kconfig"



source "arch/arm/mach-omap1/Kconfig"



source "arch/arm/mach-s3c2410/Kconfig"

arch/arm/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -91,7 +91,8 @@ textaddr-$(CONFIG_ARCH_FORTUNET) := 0xc0008000 
 machine-$(CONFIG_ARCH_IOP3XX)	   := iop3xx

 machine-$(CONFIG_ARCH_IXP4XX)	   := ixp4xx

 machine-$(CONFIG_ARCH_IXP2000)    := ixp2000

 machine-$(CONFIG_ARCH_OMAP)	   := omap

 machine-$(CONFIG_ARCH_OMAP1)	   := omap1

  incdir-$(CONFIG_ARCH_OMAP)	   := omap

 machine-$(CONFIG_ARCH_S3C2410)	   := s3c2410

 machine-$(CONFIG_ARCH_LH7A40X)	   := lh7a40x

 machine-$(CONFIG_ARCH_VERSATILE)  := versatile
@@ -142,6 +143,9 @@ core-$(CONFIG_FPE_NWFPE) += arch/arm/nwfpe/ 
core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)

core-$(CONFIG_VFP)		+= arch/arm/vfp/



# If we have a common platform directory, then include it in the build.

core-$(CONFIG_ARCH_OMAP)	+= arch/arm/plat-omap/



drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/

drivers-$(CONFIG_ARCH_CLPS7500)	+= drivers/acorn/char/

drivers-$(CONFIG_ARCH_L7200)	+= drivers/acorn/char/

arch/arm/mach-omap1/board-generic.c

+2 −3
Original line number Diff line number Diff line
@@ -26,8 +26,7 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/usb.h>

#include <asm/arch/board.h>



#include "common.h"

#include <asm/arch/common.h>



static int __initdata generic_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
@@ -84,7 +83,7 @@ static void __init omap_generic_init(void) 


static void __init omap_generic_map_io(void)

{

	omap_map_io();

	omap_map_common_io()

}



MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")

arch/arm/mach-omap1/board-h2.c

+2 −3
Original line number Diff line number Diff line
@@ -35,8 +35,7 @@ 
#include <asm/arch/gpio.h>

#include <asm/arch/tc.h>

#include <asm/arch/usb.h>



#include "common.h"

#include <asm/arch/common.h>



extern int omap_gpio_init(void);
@@ -172,7 +171,7 @@ static void __init h2_init(void) 


static void __init h2_map_io(void)

{

	omap_map_io();

	omap_map_common_io();

	omap_serial_init(h2_serial_ports);

}

arch/arm/mach-omap1/board-h3.c

+2 −3
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ 
#include <asm/arch/mux.h>

#include <asm/arch/tc.h>

#include <asm/arch/usb.h>



#include "common.h"

#include <asm/arch/common.h>



extern int omap_gpio_init(void);
@@ -190,7 +189,7 @@ void h3_init_irq(void) 


static void __init h3_map_io(void)

{

	omap_map_io();

	omap_map_common_io();

	omap_serial_init(h3_serial_ports);

}