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

Commit 887eafd2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 

Pull ARM SoC fixes from Arnd Bergmann:
 -  multiple omap2+ bug fixes
 - a regression on ux500 dt support
 - a build failure on shmobile

* tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: OMAP2+: omap2plus_defconfig: EHCI driver is not stable, disable it
  ARM: shmobile: fix platsmp.c build when ARCH_SH73A0=n
  ARM: ux500: Over-ride the DT device naming scheme for pinctrl
  ARM: ux500: Fix build errors/warnings when MACH_UX500_DT is not set
  of: address: Don't fail a lookup just because a node has no reg property
  ARM: OMAP2+: hwmod code/clockdomain data: fix 32K sync timer
parents 8daf4ded 9861e955

arch/arm/configs/omap2plus_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -176,7 +176,6 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y 
CONFIG_USB_DEVICEFS=y

CONFIG_USB_SUSPEND=y

CONFIG_USB_MON=y

CONFIG_USB_EHCI_HCD=y

CONFIG_USB_WDM=y

CONFIG_USB_STORAGE=y

CONFIG_USB_LIBUSUAL=y

arch/arm/mach-omap2/clockdomain.h

+4 −0
Original line number Diff line number Diff line
@@ -31,12 +31,16 @@ 
 *

 * CLKDM_NO_AUTODEPS: Prevent "autodeps" from being added/removed from this

 *     clockdomain.  (Currently, this applies to OMAP3 clockdomains only.)

 * CLKDM_ACTIVE_WITH_MPU: The PRCM guarantees that this clockdomain is

 *     active whenever the MPU is active.  True for interconnects and

 *     the WKUP clockdomains.

 */

#define CLKDM_CAN_FORCE_SLEEP			(1 << 0)

#define CLKDM_CAN_FORCE_WAKEUP			(1 << 1)

#define CLKDM_CAN_ENABLE_AUTO			(1 << 2)

#define CLKDM_CAN_DISABLE_AUTO			(1 << 3)

#define CLKDM_NO_AUTODEPS			(1 << 4)

#define CLKDM_ACTIVE_WITH_MPU			(1 << 5)



#define CLKDM_CAN_HWSUP		(CLKDM_CAN_ENABLE_AUTO | CLKDM_CAN_DISABLE_AUTO)

#define CLKDM_CAN_SWSUP		(CLKDM_CAN_FORCE_SLEEP | CLKDM_CAN_FORCE_WAKEUP)

arch/arm/mach-omap2/clockdomains2xxx_3xxx_data.c

+1 −0
Original line number Diff line number Diff line
@@ -88,4 +88,5 @@ struct clockdomain wkup_common_clkdm = { 
	.name		= "wkup_clkdm",

	.pwrdm		= { .name = "wkup_pwrdm" },

	.dep_bit	= OMAP_EN_WKUP_SHIFT,

	.flags		= CLKDM_ACTIVE_WITH_MPU,

};

arch/arm/mach-omap2/clockdomains44xx_data.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static struct clockdomain l4_wkup_44xx_clkdm = { 
	.cm_inst	  = OMAP4430_PRM_WKUP_CM_INST,

	.clkdm_offs	  = OMAP4430_PRM_WKUP_CM_WKUP_CDOFFS,

	.dep_bit	  = OMAP4430_L4WKUP_STATDEP_SHIFT,

	.flags		  = CLKDM_CAN_HWSUP,

	.flags		  = CLKDM_CAN_HWSUP | CLKDM_ACTIVE_WITH_MPU,

};



static struct clockdomain emu_sys_44xx_clkdm = {

arch/arm/mach-omap2/omap_hwmod.c

+24 −8
Original line number Diff line number Diff line
@@ -1124,15 +1124,18 @@ static struct omap_hwmod_addr_space * __init _find_mpu_rt_addr_space(struct omap 
 * _enable_sysc - try to bring a module out of idle via OCP_SYSCONFIG

 * @oh: struct omap_hwmod *

 *

 * If module is marked as SWSUP_SIDLE, force the module out of slave

 * idle; otherwise, configure it for smart-idle.  If module is marked

 * as SWSUP_MSUSPEND, force the module out of master standby;

 * otherwise, configure it for smart-standby.  No return value.

 * Ensure that the OCP_SYSCONFIG register for the IP block represented

 * by @oh is set to indicate to the PRCM that the IP block is active.

 * Usually this means placing the module into smart-idle mode and

 * smart-standby, but if there is a bug in the automatic idle handling

 * for the IP block, it may need to be placed into the force-idle or

 * no-idle variants of these modes.  No return value.

 */

static void _enable_sysc(struct omap_hwmod *oh)

{

	u8 idlemode, sf;

	u32 v;

	bool clkdm_act;



	if (!oh->class->sysc)

		return;
@@ -1141,6 +1144,14 @@ static void _enable_sysc(struct omap_hwmod *oh) 
	sf = oh->class->sysc->sysc_flags;



	if (sf & SYSC_HAS_SIDLEMODE) {

		clkdm_act = ((oh->clkdm &&

			      oh->clkdm->flags & CLKDM_ACTIVE_WITH_MPU) ||

			     (oh->_clk && oh->_clk->clkdm &&

			      oh->_clk->clkdm->flags & CLKDM_ACTIVE_WITH_MPU));

		if (clkdm_act && !(oh->class->sysc->idlemodes &

				   (SIDLE_SMART | SIDLE_SMART_WKUP)))

			idlemode = HWMOD_IDLEMODE_FORCE;

		else

			idlemode = (oh->flags & HWMOD_SWSUP_SIDLE) ?

				HWMOD_IDLEMODE_NO : HWMOD_IDLEMODE_SMART;

		_set_slave_idlemode(oh, idlemode, &v);
@@ -1208,8 +1219,13 @@ static void _idle_sysc(struct omap_hwmod *oh) 
	sf = oh->class->sysc->sysc_flags;



	if (sf & SYSC_HAS_SIDLEMODE) {

		idlemode = (oh->flags & HWMOD_SWSUP_SIDLE) ?

			HWMOD_IDLEMODE_FORCE : HWMOD_IDLEMODE_SMART;

		/* XXX What about HWMOD_IDLEMODE_SMART_WKUP? */

		if (oh->flags & HWMOD_SWSUP_SIDLE ||

		    !(oh->class->sysc->idlemodes &

		      (SIDLE_SMART | SIDLE_SMART_WKUP)))

			idlemode = HWMOD_IDLEMODE_FORCE;

		else

			idlemode = HWMOD_IDLEMODE_SMART;

		_set_slave_idlemode(oh, idlemode, &v);

	}