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

Commit 56213ca4 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

omap2/3: Multiboot compile fixes to compile in omap2 and omap3 



Allows compiling in omap2 and omap3.

Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 95561751

arch/arm/mach-omap2/Makefile

+8 −0
Original line number Diff line number Diff line
@@ -34,6 +34,10 @@ obj-$(CONFIG_ARCH_OMAP2420) += sram242x.o 
obj-$(CONFIG_ARCH_OMAP2430)		+= sram243x.o

obj-$(CONFIG_ARCH_OMAP3)		+= sram34xx.o



AFLAGS_sram242x.o			:=-Wa,-march=armv6

AFLAGS_sram243x.o			:=-Wa,-march=armv6

AFLAGS_sram34xx.o			:=-Wa,-march=armv7-a



# Pin multiplexing

obj-$(CONFIG_ARCH_OMAP3)		+= mux34xx.o
@@ -47,6 +51,10 @@ obj-$(CONFIG_ARCH_OMAP2) += pm24xx.o 
obj-$(CONFIG_ARCH_OMAP24XX)		+= sleep24xx.o

obj-$(CONFIG_ARCH_OMAP3)		+= pm34xx.o sleep34xx.o cpuidle34xx.o

obj-$(CONFIG_PM_DEBUG)			+= pm-debug.o



AFLAGS_sleep24xx.o			:=-Wa,-march=armv6

AFLAGS_sleep34xx.o			:=-Wa,-march=armv7-a



endif



# PRCM

arch/arm/mach-omap2/clock.h

+26 −0
Original line number Diff line number Diff line
@@ -83,6 +83,32 @@ int omap2_clksel_set_parent(struct clk *clk, struct clk *new_parent); 
u32 omap2_get_dpll_rate(struct clk *clk);

void omap2_init_dpll_parent(struct clk *clk);

int omap2_wait_clock_ready(void __iomem *reg, u32 cval, const char *name);





#ifdef CONFIG_ARCH_OMAP2

void omap2xxx_clk_prepare_for_reboot(void);

#else

static inline void omap2xxx_clk_prepare_for_reboot(void)

{

}

#endif



#ifdef CONFIG_ARCH_OMAP3

void omap3_clk_prepare_for_reboot(void);

#else

static inline void omap3_clk_prepare_for_reboot(void)

{

}

#endif



#ifdef CONFIG_ARCH_OMAP4

void omap4_clk_prepare_for_reboot(void);

#else

static inline void omap4_clk_prepare_for_reboot(void)

{

}

#endif



int omap2_dflt_clk_enable(struct clk *clk);

void omap2_dflt_clk_disable(struct clk *clk);

void omap2_clk_dflt_find_companion(struct clk *clk, void __iomem **other_reg,

arch/arm/mach-omap2/opp2xxx.h

+5 −0
Original line number Diff line number Diff line
@@ -417,7 +417,12 @@ struct prcm_config { 




extern const struct prcm_config omap2420_rate_table[];



#ifdef CONFIG_ARCH_OMAP2430

extern const struct prcm_config omap2430_rate_table[];

#else

#define omap2430_rate_table	NULL

#endif

extern const struct prcm_config *rate_table;

extern const struct prcm_config *curr_prcm_set;

arch/arm/plat-omap/Kconfig

+12 −4
Original line number Diff line number Diff line
@@ -7,27 +7,35 @@ config ARCH_OMAP_OTG 


choice

	prompt "OMAP System Type"

	default ARCH_OMAP1

	default ARCH_OMAP2PLUS



config ARCH_OMAP1

	bool "TI OMAP1"

	select COMMON_CLKDEV

	help

	  "Systems based on omap7xx, omap15xx or omap16xx"



config ARCH_OMAP2PLUS

	bool "TI OMAP2/3/4"

	select COMMON_CLKDEV

	help

	  "Systems based on omap24xx, omap34xx or omap44xx"



config ARCH_OMAP2

	bool "TI OMAP2"

	depends on ARCH_OMAP2PLUS

	select CPU_V6

	select COMMON_CLKDEV



config ARCH_OMAP3

	bool "TI OMAP3"

	depends on ARCH_OMAP2PLUS

	select CPU_V7

	select COMMON_CLKDEV



config ARCH_OMAP4

	bool "TI OMAP4"

	depends on ARCH_OMAP2PLUS

	select CPU_V7

	select ARM_GIC

	select COMMON_CLKDEV



endchoice

arch/arm/plat-omap/gpio.c

+1 −1
Original line number Diff line number Diff line
@@ -1630,7 +1630,7 @@ static int gpio_2irq(struct gpio_chip *chip, unsigned offset) 
/*---------------------------------------------------------------------*/



static int initialized;

#if !(defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4))

#if defined(CONFIG_ARCH_OMAP1) || defined(CONFIG_ARCH_OMAP2)

static struct clk * gpio_ick;

#endif