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

Commit 808601b7 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'integration-2.6.38-for-tony' of git://git.pwsan.com/linux-2.6 into omap-for-linus

parents c10abbb2 f17f9726

arch/arm/mach-omap1/clock_data.c

+8 −9
Original line number Diff line number Diff line
@@ -823,12 +823,10 @@ int __init omap1_clk_init(void) 
			crystal_type = info->system_clock_type;

	}



#if defined(CONFIG_ARCH_OMAP730) || defined(CONFIG_ARCH_OMAP850)

	if (cpu_is_omap7xx())

		ck_ref.rate = 13000000;

#elif defined(CONFIG_ARCH_OMAP16XX)

	if (crystal_type == 2)

	if (cpu_is_omap16xx() && crystal_type == 2)

		ck_ref.rate = 19200000;

#endif



	pr_info("Clocks: ARM_SYSST: 0x%04x DPLL_CTL: 0x%04x ARM_CKCTL: "

		"0x%04x\n", omap_readw(ARM_SYSST), omap_readw(DPLL_CTL),
@@ -883,10 +881,11 @@ int __init omap1_clk_init(void) 
	       ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,

	       arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);



#if defined(CONFIG_MACH_OMAP_PERSEUS2) || defined(CONFIG_MACH_OMAP_FSAMPLE)

	if (machine_is_omap_perseus2() || machine_is_omap_fsample()) {

		/* Select slicer output as OMAP input clock */

	omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1, OMAP7XX_PCC_UPLD_CTRL);

#endif

		omap_writew(omap_readw(OMAP7XX_PCC_UPLD_CTRL) & ~0x1,

				OMAP7XX_PCC_UPLD_CTRL);

	}



	/* Amstrad Delta wants BCLK high when inactive */

	if (machine_is_ams_delta())

arch/arm/mach-omap2/Makefile

+36 −12
Original line number Diff line number Diff line
@@ -4,19 +4,17 @@ 


# Common support

obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer-gp.o pm.o \

	 common.o gpio.o dma.o

	 common.o gpio.o dma.o wd_timer.o



omap-2-3-common				= irq.o sdrc.o prm2xxx_3xxx.o

omap-2-3-common				= irq.o sdrc.o

hwmod-common				= omap_hwmod.o \

					  omap_hwmod_common_data.o

prcm-common				= prcm.o powerdomain.o

clock-common				= clock.o clock_common_data.o \

					  clockdomain.o clkt_dpll.o \

					  clkt_clksel.o

					  clkt_dpll.o clkt_clksel.o



obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(prcm-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP4) += $(prcm-common) prm44xx.o $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP2) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP3) += $(omap-2-3-common) $(hwmod-common)

obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common)



obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o
@@ -74,10 +72,36 @@ endif 
endif



# PRCM

obj-$(CONFIG_ARCH_OMAP2)		+= cm.o

obj-$(CONFIG_ARCH_OMAP3)		+= cm.o

obj-$(CONFIG_ARCH_OMAP4)		+= cm4xxx.o



obj-$(CONFIG_ARCH_OMAP2)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

obj-$(CONFIG_ARCH_OMAP3)		+= prcm.o cm2xxx_3xxx.o prm2xxx_3xxx.o

# XXX The presence of cm2xxx_3xxx.o on the line below is temporary and

# will be removed once the OMAP4 part of the codebase is converted to

# use OMAP4-specific PRCM functions.

obj-$(CONFIG_ARCH_OMAP4)		+= prcm.o cm2xxx_3xxx.o cminst44xx.o \

					   cm44xx.o prcm_mpu44xx.o \

					   prminst44xx.o



# OMAP powerdomain framework

powerdomain-common			+= powerdomain.o powerdomain-common.o

obj-$(CONFIG_ARCH_OMAP2)		+= $(powerdomain-common) \

					   powerdomain2xxx_3xxx.o \

					   powerdomains2xxx_data.o \

					   powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= $(powerdomain-common) \

					   powerdomain2xxx_3xxx.o \

					   powerdomains3xxx_data.o \

					   powerdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(powerdomain-common) \

					   powerdomain44xx.o \

					   powerdomains44xx_data.o



# PRCM clockdomain control

obj-$(CONFIG_ARCH_OMAP2)		+= clockdomain.o \

					   clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP3)		+= clockdomain.o \

					   clockdomains2xxx_3xxx_data.o

obj-$(CONFIG_ARCH_OMAP4)		+= clockdomain.o \

					   clockdomains44xx_data.o

# Clock framework

obj-$(CONFIG_ARCH_OMAP2)		+= $(clock-common) clock2xxx.o \

					   clkt2xxx_sys.o \

arch/arm/mach-omap2/board-2430sdp.c

+2 −1
Original line number Diff line number Diff line
@@ -143,7 +143,8 @@ static void __init omap_2430sdp_init_irq(void) 
{

	omap_board_config = sdp2430_config;

	omap_board_config_size = ARRAY_SIZE(sdp2430_config);

	omap2_init_common_hw(NULL, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(NULL, NULL);

	omap_init_irq();

}

arch/arm/mach-omap2/board-3430sdp.c

+2 −1
Original line number Diff line number Diff line
@@ -326,7 +326,8 @@ static void __init omap_3430sdp_init_irq(void) 
	omap_board_config = sdp3430_config;

	omap_board_config_size = ARRAY_SIZE(sdp3430_config);

	omap3_pm_init_cpuidle(omap3_cpuidle_params_table);

	omap2_init_common_hw(hyb18m512160af6_sdrc_params, NULL);

	omap2_init_common_infrastructure();

	omap2_init_common_devices(hyb18m512160af6_sdrc_params, NULL);

	omap_init_irq();

}

arch/arm/mach-omap2/board-3630sdp.c

+3 −2
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static void __init omap_sdp_init_irq(void) 
{

	omap_board_config = sdp_config;

	omap_board_config_size = ARRAY_SIZE(sdp_config);

	omap2_init_common_hw(h8mbx00u0mer0em_sdrc_params,

	omap2_init_common_infrastructure();

	omap2_init_common_devices(h8mbx00u0mer0em_sdrc_params,

				  h8mbx00u0mer0em_sdrc_params);

	omap_init_irq();

}