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

Commit c9713630 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into omap/soc

parents deee6d53 4390f5b2

arch/arm/mach-omap2/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -76,8 +76,13 @@ config SOC_OMAP3430 
	default y

	select ARCH_OMAP_OTG



config SOC_OMAPTI816X

	bool "TI816X support"

config SOC_OMAPTI81XX

	bool "TI81XX support"

	depends on ARCH_OMAP3

	default y



config SOC_OMAPAM33XX

	bool "AM33XX support"

	depends on ARCH_OMAP3

	default y
@@ -314,7 +319,7 @@ config MACH_OMAP_3630SDP 


config MACH_TI8168EVM

	bool "TI8168 Evaluation Module"

	depends on SOC_OMAPTI816X

	depends on SOC_OMAPTI81XX

	default y



config MACH_OMAP_4430SDP

arch/arm/mach-omap2/board-ti8168evm.c

+3 −8
Original line number Diff line number Diff line
@@ -35,17 +35,12 @@ static void __init ti8168_evm_init(void) 
	omap_board_config_size = ARRAY_SIZE(ti8168_evm_config);

}



static void __init ti8168_evm_map_io(void)

{

	omapti816x_map_common_io();

}



MACHINE_START(TI8168EVM, "ti8168evm")

	/* Maintainer: Texas Instruments */

	.atag_offset	= 0x100,

	.map_io		= ti8168_evm_map_io,

	.init_early	= ti816x_init_early,

	.init_irq	= ti816x_init_irq,

	.map_io		= ti81xx_map_io,

	.init_early	= ti81xx_init_early,

	.init_irq	= ti81xx_init_irq,

	.timer		= &omap3_timer,

	.init_machine	= ti8168_evm_init,

MACHINE_END

arch/arm/mach-omap2/clock.c

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ 
#include "cm-regbits-24xx.h"

#include "cm-regbits-34xx.h"



u8 cpu_mask;

u16 cpu_mask;



/*

 * clkdm_control: if true, then when a clock is enabled in the

arch/arm/mach-omap2/clock.h

+1 −1
Original line number Diff line number Diff line
@@ -132,7 +132,7 @@ void omap2_clk_print_new_rates(const char *hfclkin_ck_name, 
			       const char *core_ck_name,

			       const char *mpu_ck_name);



extern u8 cpu_mask;

extern u16 cpu_mask;



extern const struct clkops clkops_omap2_dflt_wait;

extern const struct clkops clkops_dummy;

arch/arm/mach-omap2/clock3xxx_data.c

+5 −1
Original line number Diff line number Diff line
@@ -3517,6 +3517,10 @@ int __init omap3xxx_clk_init(void) 
	} else if (cpu_is_ti816x()) {

		cpu_mask = RATE_IN_TI816X;

		cpu_clkflg = CK_TI816X;

	} else if (cpu_is_am33xx()) {

		cpu_mask = RATE_IN_AM33XX;

	} else if (cpu_is_ti814x()) {

		cpu_mask = RATE_IN_TI814X;

	} else if (cpu_is_omap34xx()) {

		if (omap_rev() == OMAP3430_REV_ES1_0) {

			cpu_mask = RATE_IN_3430ES1;
@@ -3600,7 +3604,7 @@ int __init omap3xxx_clk_init(void) 
	 * Lock DPLL5 -- here only until other device init code can

	 * handle this

	 */

	if (!cpu_is_ti816x() && (omap_rev() >= OMAP3430_REV_ES2_0))

	if (!cpu_is_ti81xx() && (omap_rev() >= OMAP3430_REV_ES2_0))

		omap3_clk_lock_dpll5();



	/* Avoid sleeping during omap3_core_dpll_m2_set_rate() */