Commit 5597afad authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'omap-for-v4.4/fixes-rc2' of... 

Merge tag 'omap-for-v4.4/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes

Merge "Fixes for omaps for v4.4-rc cycle" from Tony Lindgren:

- A series of audio changes for dra7 that missed the merge window but turned
  out to be necessary to fix a boot time imprecise external abort error and to
  getaudio working

- Fix l4 related boot time errors for dm81xx

- Use lockless cldm/pwrdm api in omap4_boot_secondary

- Remove t410 custom abort handler that is no longer needed and may
  hide other critical errors

- Mark cpuidle tracepoints as _rcuidle

- Fix module alias for omap-ocp2scp

* tag 'omap-for-v4.4/fixes-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP4+: SMP: use lockless clkdm/pwrdm api in omap4_boot_secondary
  arm: omap2+: add missing HWMOD_NO_IDLEST in 81xx hwmod data
  ARM: OMAP2+: remove custom abort handler for t410
  ARM: OMAP: DRA7: hwmod: Add data for McASP3
  ARM: OMAP2+: hwmod: Add hwmod flag for HWMOD_OPT_CLKS_NEEDED
  ARM: dts: dra7: Fix McASP3 node regarding to clocks
  bus: omap-ocp2scp: Fix module alias
  ARM: OMAP2+: PM: Denote the cpuidle tracepoints as _rcuidle()
parents e6b66dfb 918af9f9

arch/arm/boot/dts/dra7.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -1459,8 +1459,8 @@ 
			interrupt-names = "tx", "rx";

			dmas = <&sdma_xbar 133>, <&sdma_xbar 132>;

			dma-names = "tx", "rx";

			clocks = <&mcasp3_ahclkx_mux>;

			clock-names = "fck";

			clocks = <&mcasp3_aux_gfclk_mux>, <&mcasp3_ahclkx_mux>;

			clock-names = "fck", "ahclkx";

			status = "disabled";

		};

arch/arm/mach-omap2/omap-smp.c

+3 −3
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ static int omap4_boot_secondary(unsigned int cpu, struct task_struct *idle) 
		 * Ensure that CPU power state is set to ON to avoid CPU

		 * powerdomain transition on wfi

		 */

		clkdm_wakeup(cpu1_clkdm);

		omap_set_pwrdm_state(cpu1_pwrdm, PWRDM_POWER_ON);

		clkdm_allow_idle(cpu1_clkdm);

		clkdm_wakeup_nolock(cpu1_clkdm);

		pwrdm_set_next_pwrst(cpu1_pwrdm, PWRDM_POWER_ON);

		clkdm_allow_idle_nolock(cpu1_clkdm);



		if (IS_PM44XX_ERRATUM(PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD)) {

			while (gic_dist_disabled()) {

arch/arm/mach-omap2/omap_hwmod.c

+36 −30
Original line number Diff line number Diff line
@@ -890,6 +890,36 @@ static int _init_opt_clks(struct omap_hwmod *oh) 
	return ret;

}



static void _enable_optional_clocks(struct omap_hwmod *oh)

{

	struct omap_hwmod_opt_clk *oc;

	int i;



	pr_debug("omap_hwmod: %s: enabling optional clocks\n", oh->name);



	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)

		if (oc->_clk) {

			pr_debug("omap_hwmod: enable %s:%s\n", oc->role,

				 __clk_get_name(oc->_clk));

			clk_enable(oc->_clk);

		}

}



static void _disable_optional_clocks(struct omap_hwmod *oh)

{

	struct omap_hwmod_opt_clk *oc;

	int i;



	pr_debug("omap_hwmod: %s: disabling optional clocks\n", oh->name);



	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)

		if (oc->_clk) {

			pr_debug("omap_hwmod: disable %s:%s\n", oc->role,

				 __clk_get_name(oc->_clk));

			clk_disable(oc->_clk);

		}

}



/**

 * _enable_clocks - enable hwmod main clock and interface clocks

 * @oh: struct omap_hwmod *
@@ -917,6 +947,9 @@ static int _enable_clocks(struct omap_hwmod *oh) 
			clk_enable(os->_clk);

	}



	if (oh->flags & HWMOD_OPT_CLKS_NEEDED)

		_enable_optional_clocks(oh);



	/* The opt clocks are controlled by the device driver. */



	return 0;
@@ -948,41 +981,14 @@ static int _disable_clocks(struct omap_hwmod *oh) 
			clk_disable(os->_clk);

	}



	if (oh->flags & HWMOD_OPT_CLKS_NEEDED)

		_disable_optional_clocks(oh);



	/* The opt clocks are controlled by the device driver. */



	return 0;

}



static void _enable_optional_clocks(struct omap_hwmod *oh)

{

	struct omap_hwmod_opt_clk *oc;

	int i;



	pr_debug("omap_hwmod: %s: enabling optional clocks\n", oh->name);



	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)

		if (oc->_clk) {

			pr_debug("omap_hwmod: enable %s:%s\n", oc->role,

				 __clk_get_name(oc->_clk));

			clk_enable(oc->_clk);

		}

}



static void _disable_optional_clocks(struct omap_hwmod *oh)

{

	struct omap_hwmod_opt_clk *oc;

	int i;



	pr_debug("omap_hwmod: %s: disabling optional clocks\n", oh->name);



	for (i = oh->opt_clks_cnt, oc = oh->opt_clks; i > 0; i--, oc++)

		if (oc->_clk) {

			pr_debug("omap_hwmod: disable %s:%s\n", oc->role,

				 __clk_get_name(oc->_clk));

			clk_disable(oc->_clk);

		}

}



/**

 * _omap4_enable_module - enable CLKCTRL modulemode on OMAP4

 * @oh: struct omap_hwmod *

arch/arm/mach-omap2/omap_hwmod.h

+3 −0
Original line number Diff line number Diff line
@@ -523,6 +523,8 @@ struct omap_hwmod_omap4_prcm { 
 * HWMOD_RECONFIG_IO_CHAIN: omap_hwmod code needs to reconfigure wake-up 

 *     events by calling _reconfigure_io_chain() when a device is enabled

 *     or idled.

 * HWMOD_OPT_CLKS_NEEDED: The optional clocks are needed for the module to

 *     operate and they need to be handled at the same time as the main_clk.

 */

#define HWMOD_SWSUP_SIDLE			(1 << 0)

#define HWMOD_SWSUP_MSTANDBY			(1 << 1)
@@ -538,6 +540,7 @@ struct omap_hwmod_omap4_prcm { 
#define HWMOD_FORCE_MSTANDBY			(1 << 11)

#define HWMOD_SWSUP_SIDLE_ACT			(1 << 12)

#define HWMOD_RECONFIG_IO_CHAIN			(1 << 13)

#define HWMOD_OPT_CLKS_NEEDED			(1 << 14)



/*

 * omap_hwmod._int_flags definitions

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+56 −0
Original line number Diff line number Diff line
@@ -1297,6 +1297,44 @@ static struct omap_hwmod dra7xx_mcspi4_hwmod = { 
	.dev_attr	= &mcspi4_dev_attr,

};



/*

 * 'mcasp' class

 *

 */

static struct omap_hwmod_class_sysconfig dra7xx_mcasp_sysc = {

	.sysc_offs	= 0x0004,

	.sysc_flags	= SYSC_HAS_SIDLEMODE,

	.idlemodes	= (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),

	.sysc_fields	= &omap_hwmod_sysc_type3,

};



static struct omap_hwmod_class dra7xx_mcasp_hwmod_class = {

	.name	= "mcasp",

	.sysc	= &dra7xx_mcasp_sysc,

};



/* mcasp3 */

static struct omap_hwmod_opt_clk mcasp3_opt_clks[] = {

	{ .role = "ahclkx", .clk = "mcasp3_ahclkx_mux" },

};



static struct omap_hwmod dra7xx_mcasp3_hwmod = {

	.name		= "mcasp3",

	.class		= &dra7xx_mcasp_hwmod_class,

	.clkdm_name	= "l4per2_clkdm",

	.main_clk	= "mcasp3_aux_gfclk_mux",

	.flags		= HWMOD_OPT_CLKS_NEEDED,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET,

			.context_offs = DRA7XX_RM_L4PER2_MCASP3_CONTEXT_OFFSET,

			.modulemode   = MODULEMODE_SWCTRL,

		},

	},

	.opt_clks	= mcasp3_opt_clks,

	.opt_clks_cnt	= ARRAY_SIZE(mcasp3_opt_clks),

};



/*

 * 'mmc' class

 *
@@ -2566,6 +2604,22 @@ static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = { 
	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4_per2 -> mcasp3 */

static struct omap_hwmod_ocp_if dra7xx_l4_per2__mcasp3 = {

	.master		= &dra7xx_l4_per2_hwmod,

	.slave		= &dra7xx_mcasp3_hwmod,

	.clk		= "l4_root_clk_div",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l3_main_1 -> mcasp3 */

static struct omap_hwmod_ocp_if dra7xx_l3_main_1__mcasp3 = {

	.master		= &dra7xx_l3_main_1_hwmod,

	.slave		= &dra7xx_mcasp3_hwmod,

	.clk		= "l3_iclk_div",

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};



/* l4_per1 -> elm */

static struct omap_hwmod_ocp_if dra7xx_l4_per1__elm = {

	.master		= &dra7xx_l4_per1_hwmod,
@@ -3308,6 +3362,8 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = { 
	&dra7xx_l4_wkup__dcan1,

	&dra7xx_l4_per2__dcan2,

	&dra7xx_l4_per2__cpgmac0,

	&dra7xx_l4_per2__mcasp3,

	&dra7xx_l3_main_1__mcasp3,

	&dra7xx_gmac__mdio,

	&dra7xx_l4_cfg__dma_system,

	&dra7xx_l3_main_1__dss,

CRA Git | Maintained and supported by SUSTech CRA and CCSE