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

Commit 2cd1f483 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge tag 'omap-fixes-a2-for-v3.8-rc' of... 

Merge tag 'omap-fixes-a2-for-v3.8-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into omap-for-v3.8-rc2/fixes

Some OMAP PRCM and sparse fixes against v3.8-rc1.  A basic set of test
logs are available here:

    http://www.pwsan.com/omap/testlogs/prcm_fixes_b_3.8-rc/20130102120724/

The 3730 Beagle XM here has an intermittent failure mounting SD root,
but the suspicion right now is that this is due to a failing SD card,
rather than any change introduced by these patches.

This second version includes a few changes requested by Tony Lindgren.
parents d1c3ed66 7e7fff82

arch/arm/mach-omap2/cclock3xxx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,8 @@ static const struct clk_ops emu_src_ck_ops = { 
	.recalc_rate	= &omap2_clksel_recalc,

	.get_parent	= &omap2_clksel_find_parent_index,

	.set_parent	= &omap2_clksel_set_parent,

	.enable		= &omap2_clkops_enable_clkdm,

	.disable	= &omap2_clkops_disable_clkdm,

};



static struct clk emu_src_ck;

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+2 −2
Original line number Diff line number Diff line
@@ -2515,7 +2515,7 @@ static struct omap_hwmod_ocp_if am33xx_l4_hs__cpgmac0 = { 
	.user		= OCP_USER_MPU,

};



struct omap_hwmod_addr_space am33xx_mdio_addr_space[] = {

static struct omap_hwmod_addr_space am33xx_mdio_addr_space[] = {

	{

		.pa_start	= 0x4A101000,

		.pa_end		= 0x4A101000 + SZ_256 - 1,
@@ -2523,7 +2523,7 @@ struct omap_hwmod_addr_space am33xx_mdio_addr_space[] = { 
	{ }

};



struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = {

static struct omap_hwmod_ocp_if am33xx_cpgmac0__mdio = {

	.master		= &am33xx_cpgmac0_hwmod,

	.slave		= &am33xx_mdio_hwmod,

	.addr		= am33xx_mdio_addr_space,

arch/arm/mach-omap2/prm2xxx.c

+85 −3
Original line number Diff line number Diff line
@@ -27,6 +27,14 @@ 
#include "cm2xxx_3xxx.h"

#include "prm-regbits-24xx.h"



/*

 * OMAP24xx PM_PWSTCTRL_*.POWERSTATE and PM_PWSTST_*.LASTSTATEENTERED bits -

 * these are reversed from the bits used on OMAP3+

 */

#define OMAP24XX_PWRDM_POWER_ON			0x0

#define OMAP24XX_PWRDM_POWER_RET		0x1

#define OMAP24XX_PWRDM_POWER_OFF		0x3



/*

 * omap2xxx_prm_reset_src_map - map from bits in the PRM_RSTST_WKUP

 *   hardware register (which are specific to the OMAP2xxx SoCs) to
@@ -67,6 +75,34 @@ static u32 omap2xxx_prm_read_reset_sources(void) 
	return r;

}



/**

 * omap2xxx_pwrst_to_common_pwrst - convert OMAP2xxx pwrst to common pwrst

 * @omap2xxx_pwrst: OMAP2xxx hardware power state to convert

 *

 * Return the common power state bits corresponding to the OMAP2xxx

 * hardware power state bits @omap2xxx_pwrst, or -EINVAL upon error.

 */

static int omap2xxx_pwrst_to_common_pwrst(u8 omap2xxx_pwrst)

{

	u8 pwrst;



	switch (omap2xxx_pwrst) {

	case OMAP24XX_PWRDM_POWER_OFF:

		pwrst = PWRDM_POWER_OFF;

		break;

	case OMAP24XX_PWRDM_POWER_RET:

		pwrst = PWRDM_POWER_RET;

		break;

	case OMAP24XX_PWRDM_POWER_ON:

		pwrst = PWRDM_POWER_ON;

		break;

	default:

		return -EINVAL;

	}



	return pwrst;

}



/**

 * omap2xxx_prm_dpll_reset - use DPLL reset to reboot the OMAP SoC

 *
@@ -97,10 +133,56 @@ int omap2xxx_clkdm_wakeup(struct clockdomain *clkdm) 
	return 0;

}



static int omap2xxx_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)

{

	u8 omap24xx_pwrst;



	switch (pwrst) {

	case PWRDM_POWER_OFF:

		omap24xx_pwrst = OMAP24XX_PWRDM_POWER_OFF;

		break;

	case PWRDM_POWER_RET:

		omap24xx_pwrst = OMAP24XX_PWRDM_POWER_RET;

		break;

	case PWRDM_POWER_ON:

		omap24xx_pwrst = OMAP24XX_PWRDM_POWER_ON;

		break;

	default:

		return -EINVAL;

	}



	omap2_prm_rmw_mod_reg_bits(OMAP_POWERSTATE_MASK,

				   (omap24xx_pwrst << OMAP_POWERSTATE_SHIFT),

				   pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);

	return 0;

}



static int omap2xxx_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)

{

	u8 omap2xxx_pwrst;



	omap2xxx_pwrst = omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

						       OMAP2_PM_PWSTCTRL,

						       OMAP_POWERSTATE_MASK);



	return omap2xxx_pwrst_to_common_pwrst(omap2xxx_pwrst);

}



static int omap2xxx_pwrdm_read_pwrst(struct powerdomain *pwrdm)

{

	u8 omap2xxx_pwrst;



	omap2xxx_pwrst = omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

						       OMAP2_PM_PWSTST,

						       OMAP_POWERSTATEST_MASK);



	return omap2xxx_pwrst_to_common_pwrst(omap2xxx_pwrst);

}



struct pwrdm_ops omap2_pwrdm_operations = {

	.pwrdm_set_next_pwrst	= omap2_pwrdm_set_next_pwrst,

	.pwrdm_read_next_pwrst	= omap2_pwrdm_read_next_pwrst,

	.pwrdm_read_pwrst	= omap2_pwrdm_read_pwrst,

	.pwrdm_set_next_pwrst	= omap2xxx_pwrdm_set_next_pwrst,

	.pwrdm_read_next_pwrst	= omap2xxx_pwrdm_read_next_pwrst,

	.pwrdm_read_pwrst	= omap2xxx_pwrdm_read_pwrst,

	.pwrdm_set_logic_retst	= omap2_pwrdm_set_logic_retst,

	.pwrdm_set_mem_onst	= omap2_pwrdm_set_mem_onst,

	.pwrdm_set_mem_retst	= omap2_pwrdm_set_mem_retst,

arch/arm/mach-omap2/prm2xxx_3xxx.c

+0 −22
Original line number Diff line number Diff line
@@ -103,28 +103,6 @@ int omap2_prm_deassert_hardreset(s16 prm_mod, u8 rst_shift, u8 st_shift) 
/* Powerdomain low-level functions */



/* Common functions across OMAP2 and OMAP3 */

int omap2_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)

{

	omap2_prm_rmw_mod_reg_bits(OMAP_POWERSTATE_MASK,

				   (pwrst << OMAP_POWERSTATE_SHIFT),

				   pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);

	return 0;

}



int omap2_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)

{

	return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

					     OMAP2_PM_PWSTCTRL,

					     OMAP_POWERSTATE_MASK);

}



int omap2_pwrdm_read_pwrst(struct powerdomain *pwrdm)

{

	return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

					     OMAP2_PM_PWSTST,

					     OMAP_POWERSTATEST_MASK);

}



int omap2_pwrdm_set_mem_onst(struct powerdomain *pwrdm, u8 bank,

								u8 pwrst)

{

arch/arm/mach-omap2/prm3xxx.c

+25 −3
Original line number Diff line number Diff line
@@ -277,6 +277,28 @@ static u32 omap3xxx_prm_read_reset_sources(void) 


/* Powerdomain low-level functions */



static int omap3_pwrdm_set_next_pwrst(struct powerdomain *pwrdm, u8 pwrst)

{

	omap2_prm_rmw_mod_reg_bits(OMAP_POWERSTATE_MASK,

				   (pwrst << OMAP_POWERSTATE_SHIFT),

				   pwrdm->prcm_offs, OMAP2_PM_PWSTCTRL);

	return 0;

}



static int omap3_pwrdm_read_next_pwrst(struct powerdomain *pwrdm)

{

	return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

					     OMAP2_PM_PWSTCTRL,

					     OMAP_POWERSTATE_MASK);

}



static int omap3_pwrdm_read_pwrst(struct powerdomain *pwrdm)

{

	return omap2_prm_read_mod_bits_shift(pwrdm->prcm_offs,

					     OMAP2_PM_PWSTST,

					     OMAP_POWERSTATEST_MASK);

}



/* Applicable only for OMAP3. Not supported on OMAP2 */

static int omap3_pwrdm_read_prev_pwrst(struct powerdomain *pwrdm)

{
@@ -355,9 +377,9 @@ static int omap3_pwrdm_disable_hdwr_sar(struct powerdomain *pwrdm) 
}



struct pwrdm_ops omap3_pwrdm_operations = {

	.pwrdm_set_next_pwrst	= omap2_pwrdm_set_next_pwrst,

	.pwrdm_read_next_pwrst	= omap2_pwrdm_read_next_pwrst,

	.pwrdm_read_pwrst	= omap2_pwrdm_read_pwrst,

	.pwrdm_set_next_pwrst	= omap3_pwrdm_set_next_pwrst,

	.pwrdm_read_next_pwrst	= omap3_pwrdm_read_next_pwrst,

	.pwrdm_read_pwrst	= omap3_pwrdm_read_pwrst,

	.pwrdm_read_prev_pwrst	= omap3_pwrdm_read_prev_pwrst,

	.pwrdm_set_logic_retst	= omap2_pwrdm_set_logic_retst,

	.pwrdm_read_logic_pwrst	= omap3_pwrdm_read_logic_pwrst,