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

Commit 4fb85d35 authored by Paul Walmsley's avatar Paul Walmsley
Browse files

Merge branch 'clock_devel_3.7' into hwmod_prcm_clock_a_3.7 

Conflicts:
	arch/arm/mach-omap2/clkt34xx_dpll3m2.c
	arch/arm/mach-omap2/clkt_clksel.c
	arch/arm/mach-omap2/clock.c
parents 1e2ee2a6 a86c0b98

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ static inline void __init apollon_init_smc91x(void) 
		return;

		return;

	}

	}





	clk_enable(gpmc_fck);

	clk_prepare_enable(gpmc_fck);

	rate = clk_get_rate(gpmc_fck);

	rate = clk_get_rate(gpmc_fck);





	eth_cs = APOLLON_ETH_CS;

	eth_cs = APOLLON_ETH_CS;
@@ -246,7 +246,7 @@ static inline void __init apollon_init_smc91x(void) 
		gpmc_cs_free(APOLLON_ETH_CS);

		gpmc_cs_free(APOLLON_ETH_CS);

	}

	}

out:

out:

	clk_disable(gpmc_fck);

	clk_disable_unprepare(gpmc_fck);

	clk_put(gpmc_fck);

	clk_put(gpmc_fck);

}

}

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

+3 −3
Original line number Original line Diff line number Diff line
@@ -265,9 +265,9 @@ static inline void __init h4_init_debug(void) 
		return;

		return;

	}

	}





	clk_enable(gpmc_fck);

	clk_prepare_enable(gpmc_fck);

	rate = clk_get_rate(gpmc_fck);

	rate = clk_get_rate(gpmc_fck);

	clk_disable(gpmc_fck);

	clk_disable_unprepare(gpmc_fck);

	clk_put(gpmc_fck);

	clk_put(gpmc_fck);





	if (is_gpmc_muxed())

	if (is_gpmc_muxed())
@@ -311,7 +311,7 @@ static inline void __init h4_init_debug(void) 
		gpmc_cs_free(eth_cs);

		gpmc_cs_free(eth_cs);





out:

out:

	clk_disable(gpmc_fck);

	clk_disable_unprepare(gpmc_fck);

	clk_put(gpmc_fck);

	clk_put(gpmc_fck);

}

}

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,7 @@ static void __init omap4_ehci_init(void) 
		return;

		return;

	}

	}

	clk_set_rate(phy_ref_clk, 19200000);

	clk_set_rate(phy_ref_clk, 19200000);

	clk_enable(phy_ref_clk);

	clk_prepare_enable(phy_ref_clk);





	/* disable the power to the usb hub prior to init and reset phy+hub */

	/* disable the power to the usb hub prior to init and reset phy+hub */

	ret = gpio_request_array(panda_ehci_gpios,

	ret = gpio_request_array(panda_ehci_gpios,

arch/arm/mach-omap2/clkt2xxx_apll.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ static int omap2_clk_apll_enable(struct clk *clk, u32 status_mask) 
	omap2_cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);

	omap2_cm_write_mod_reg(cval, PLL_MOD, CM_CLKEN);





	omap2_cm_wait_idlest(cm_idlest_pll, status_mask,

	omap2_cm_wait_idlest(cm_idlest_pll, status_mask,

			     OMAP24XX_CM_IDLEST_VAL, clk->name);

			     OMAP24XX_CM_IDLEST_VAL, __clk_get_name(clk));





	/*

	/*

	 * REVISIT: Should we return an error code if omap2_wait_clock_ready()

	 * REVISIT: Should we return an error code if omap2_wait_clock_ready()

arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -68,14 +68,15 @@ unsigned long omap2_table_mpu_recalc(struct clk *clk) 
long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)

long omap2_round_to_table_rate(struct clk *clk, unsigned long rate)

{

{

	const struct prcm_config *ptr;

	const struct prcm_config *ptr;

	long highest_rate;

	long highest_rate, sys_clk_rate;





	highest_rate = -EINVAL;

	highest_rate = -EINVAL;

	sys_clk_rate = __clk_get_rate(sclk);





	for (ptr = rate_table; ptr->mpu_speed; ptr++) {

	for (ptr = rate_table; ptr->mpu_speed; ptr++) {

		if (!(ptr->flags & cpu_mask))

		if (!(ptr->flags & cpu_mask))

			continue;

			continue;

		if (ptr->xtal_speed != sclk->rate)

		if (ptr->xtal_speed != sys_clk_rate)

			continue;

			continue;





		highest_rate = ptr->mpu_speed;

		highest_rate = ptr->mpu_speed;
@@ -94,12 +95,15 @@ int omap2_select_table_rate(struct clk *clk, unsigned long rate) 
	const struct prcm_config *prcm;

	const struct prcm_config *prcm;

	unsigned long found_speed = 0;

	unsigned long found_speed = 0;

	unsigned long flags;

	unsigned long flags;

	long sys_clk_rate;



	sys_clk_rate = __clk_get_rate(sclk);





	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

	for (prcm = rate_table; prcm->mpu_speed; prcm++) {

		if (!(prcm->flags & cpu_mask))

		if (!(prcm->flags & cpu_mask))

			continue;

			continue;





		if (prcm->xtal_speed != sclk->rate)

		if (prcm->xtal_speed != sys_clk_rate)

			continue;

			continue;





		if (prcm->mpu_speed <= rate) {

		if (prcm->mpu_speed <= rate) {