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

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

[ARM] 3455/1: ARM: OMAP: 7/8 Misc updates, take 2 



Patch from Tony Lindgren

Update misc OMAP core code from linux-omap tree:

- McBSP updates by Samuel Ortiz, Andrzej Zaborowski
- Whitespace cleanups by Ladislav Michl
- Other fixes by various linux-omap developers

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

arch/arm/mach-omap1/Makefile

+9 −2
Original line number Diff line number Diff line
@@ -3,7 +3,13 @@ 
#



# Common support

obj-y := io.o id.o clock.o irq.o time.o mux.o serial.o devices.o

obj-y := io.o id.o clock.o irq.o mux.o serial.o devices.o



obj-$(CONFIG_OMAP_MPU_TIMER)		+= time.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o



led-y := leds.o



# Specific board support
@@ -14,8 +20,9 @@ obj-$(CONFIG_MACH_OMAP_PERSEUS2) += board-perseus2.o 
obj-$(CONFIG_MACH_OMAP_OSK)		+= board-osk.o

obj-$(CONFIG_MACH_OMAP_H3)		+= board-h3.o

obj-$(CONFIG_MACH_VOICEBLUE)		+= board-voiceblue.o

obj-$(CONFIG_MACH_NETSTAR)		+= board-netstar.o

obj-$(CONFIG_MACH_OMAP_PALMTE)		+= board-palmte.o

obj-$(CONFIG_MACH_NOKIA770)		+= board-nokia770.o

obj-$(CONFIG_MACH_AMS_DELTA)		+= board-ams-delta.o



ifeq ($(CONFIG_ARCH_OMAP15XX),y)

# Innovator-1510 FPGA

arch/arm/mach-omap1/io.c

+3 −1
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <asm/io.h>

#include <asm/arch/mux.h>

#include <asm/arch/tc.h>

#include <asm/arch/omapfb.h>



extern int omap1_clk_init(void);

extern void omap_check_revision(void);
@@ -110,7 +111,7 @@ void __init omap1_map_common_io(void) 
	}

#endif

#ifdef CONFIG_ARCH_OMAP15XX

	if (cpu_is_omap1510()) {

	if (cpu_is_omap15xx()) {

		iotable_init(omap1510_io_desc, ARRAY_SIZE(omap1510_io_desc));

	}

#endif
@@ -121,6 +122,7 @@ void __init omap1_map_common_io(void) 
#endif



	omap_sram_init();

	omapfb_reserve_mem();

}



/*

arch/arm/mach-omap1/irq.c

+9 −9
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ struct omap_irq_bank { 
	unsigned long wake_enable;

};



static unsigned int irq_bank_count = 0;

static unsigned int irq_bank_count;

static struct omap_irq_bank *irq_banks;



static inline unsigned int irq_bank_readl(int bank, int offset)

arch/arm/mach-omap1/serial.c

+3 −3
Original line number Diff line number Diff line
@@ -30,9 +30,9 @@ 
#include <asm/arch/pm.h>

#endif



static struct clk * uart1_ck = NULL;

static struct clk * uart2_ck = NULL;

static struct clk * uart3_ck = NULL;

static struct clk * uart1_ck;

static struct clk * uart2_ck;

static struct clk * uart3_ck;



static inline unsigned int omap_serial_in(struct plat_serial8250_port *up,

					  int offset)

arch/arm/mach-omap2/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -3,11 +3,15 @@ 
#



# Common support

obj-y := irq.o id.o io.o sram-fn.o clock.o mux.o devices.o serial.o

obj-y := irq.o id.o io.o sram-fn.o memory.o prcm.o clock.o mux.o devices.o serial.o



obj-$(CONFIG_OMAP_MPU_TIMER)		+= timer-gp.o



# Power Management

obj-$(CONFIG_PM) += pm.o sleep.o



# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

obj-$(CONFIG_MACH_OMAP_APOLLON)		+= board-apollon.o