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

Commit 2879e43f authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'omap-for-v4.2/soc-pt1-take2' of... 

Merge tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

Omap hwmod changes for v4.2 via Paul Walmsley <paul@pwsan.com>:

Several OMAP2+ hwmod changes for v4.2.  One patch cleans up a nasty
interaction between the OMAP GPMC and the hwmod code when debugging is
enabled.  IP block integration data has been added for the AM43xx EMIF
RAM controller.  There's also a fix for the omap-aes driver when used in
QEMU.  And finally, some changes to the OMAP3 hwmod code to support the
use of the security IP blocks (AES and SHA) on GP devices, or when they've
specifically been enabled in the DT data.

Basic build, boot, and power management test results are here:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v4.2/20150601192349/

* tag 'omap-for-v4.2/soc-pt1-take2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP3: Fix crypto support for HS devices
  ARM: OMAP2+: Return correct error values from device and hwmod
  ARM: OMAP: AM43xx hwmod: Add data for am43xx emif hwmod
  memory: omap-gpmc: Add Kconfig option for debug
parents 4d48614e 436bbc12

arch/arm/mach-omap2/omap_device.c

+17 −13
Original line number Diff line number Diff line
@@ -224,13 +224,13 @@ static int _omap_device_notifier_call(struct notifier_block *nb, 
 */

static int _omap_device_enable_hwmods(struct omap_device *od)

{

	int ret = 0;

	int i;



	for (i = 0; i < od->hwmods_cnt; i++)

		omap_hwmod_enable(od->hwmods[i]);

		ret |= omap_hwmod_enable(od->hwmods[i]);



	/* XXX pass along return value here? */

	return 0;

	return ret;

}



/**
@@ -241,13 +241,13 @@ static int _omap_device_enable_hwmods(struct omap_device *od) 
 */

static int _omap_device_idle_hwmods(struct omap_device *od)

{

	int ret = 0;

	int i;



	for (i = 0; i < od->hwmods_cnt; i++)

		omap_hwmod_idle(od->hwmods[i]);

		ret |= omap_hwmod_idle(od->hwmods[i]);



	/* XXX pass along return value here? */

	return 0;

	return ret;

}



/* Public functions for use by core code */
@@ -595,18 +595,20 @@ static int _od_runtime_suspend(struct device *dev) 
	int ret;



	ret = pm_generic_runtime_suspend(dev);



	if (!ret)

		omap_device_idle(pdev);



	if (ret)

		return ret;



	return omap_device_idle(pdev);

}



static int _od_runtime_resume(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	int ret;



	omap_device_enable(pdev);

	ret = omap_device_enable(pdev);

	if (ret)

		return ret;



	return pm_generic_runtime_resume(dev);

}
@@ -743,6 +745,7 @@ int omap_device_enable(struct platform_device *pdev) 


	ret = _omap_device_enable_hwmods(od);



	if (ret == 0)

		od->_state = OMAP_DEVICE_STATE_ENABLED;



	return ret;
@@ -773,6 +776,7 @@ int omap_device_idle(struct platform_device *pdev) 


	ret = _omap_device_idle_hwmods(od);



	if (ret == 0)

		od->_state = OMAP_DEVICE_STATE_IDLE;



	return ret;

arch/arm/mach-omap2/omap_hwmod.c

+6 −4
Original line number Diff line number Diff line
@@ -3318,16 +3318,17 @@ int omap_hwmod_enable(struct omap_hwmod *oh) 
 */

int omap_hwmod_idle(struct omap_hwmod *oh)

{

	int r;

	unsigned long flags;



	if (!oh)

		return -EINVAL;



	spin_lock_irqsave(&oh->_lock, flags);

	_idle(oh);

	r = _idle(oh);

	spin_unlock_irqrestore(&oh->_lock, flags);



	return 0;

	return r;

}



/**
@@ -3340,16 +3341,17 @@ int omap_hwmod_idle(struct omap_hwmod *oh) 
 */

int omap_hwmod_shutdown(struct omap_hwmod *oh)

{

	int r;

	unsigned long flags;



	if (!oh)

		return -EINVAL;



	spin_lock_irqsave(&oh->_lock, flags);

	_shutdown(oh);

	r = _shutdown(oh);

	spin_unlock_irqrestore(&oh->_lock, flags);



	return 0;

	return r;

}



/*

arch/arm/mach-omap2/omap_hwmod.h

+6 −0
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3; 


#define DEBUG_OMAPUART_FLAGS	(HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET)



#ifdef CONFIG_OMAP_GPMC_DEBUG

#define DEBUG_OMAP_GPMC_HWMOD_FLAGS	HWMOD_INIT_NO_RESET

#else

#define DEBUG_OMAP_GPMC_HWMOD_FLAGS	0

#endif



#if defined(CONFIG_DEBUG_OMAP2UART1)

#undef DEBUG_OMAP2UART1_FLAGS

#define DEBUG_OMAP2UART1_FLAGS DEBUG_OMAPUART_FLAGS

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+2 −10
Original line number Diff line number Diff line
@@ -762,16 +762,8 @@ struct omap_hwmod omap2xxx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &omap2xxx_gpmc_hwmod_class,

	.main_clk	= "gpmc_fck",

	/*

	 * XXX HWMOD_INIT_NO_RESET should not be needed for this IP

	 * block.  It is not being added due to any known bugs with

	 * resetting the GPMC IP block, but rather because any timings

	 * set by the bootloader are not being correctly programmed by

	 * the kernel from the board file or DT data.

	 * HWMOD_INIT_NO_RESET should be removed ASAP.

	 */

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_NO_IDLEST),

	/* Skip reset for CONFIG_OMAP_GPMC_DEBUG for bootloader timings */

	.flags		= HWMOD_NO_IDLEST | DEBUG_OMAP_GPMC_HWMOD_FLAGS,

	.prcm		= {

		.omap2	= {

			.prcm_reg_id = 3,

arch/arm/mach-omap2/omap_hwmod_33xx_43xx_common_data.h

+1 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ extern struct omap_hwmod am33xx_uart5_hwmod; 
extern struct omap_hwmod am33xx_uart6_hwmod;

extern struct omap_hwmod am33xx_wd_timer1_hwmod;



extern struct omap_hwmod_class am33xx_emif_hwmod_class;

extern struct omap_hwmod_class am33xx_l4_hwmod_class;

extern struct omap_hwmod_class am33xx_wkup_m3_hwmod_class;

extern struct omap_hwmod_class am33xx_control_hwmod_class;