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

Commit 08d047a4 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'for-v3.11-rc/omap-fixes-b' of... 

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

From Paul Walmsley via Tony Lindgren:
Some OMAP hwmod fixes for v3.11-rc.  Mostly intended to fix an earlyprintk
regression and an AM33xx cpgmac power management regression.

Basic build, boot, and PM tests are available here:

http://www.pwsan.com/omap/testlogs/hwmod_fixes_a_v3.11-rc/20130730042132/

The tests include temporary fixes for the unrelated 2430SDP and OMAP3
boot regressions, which are not part of this signed tag.

* tag 'for-v3.11-rc/omap-fixes-b' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending

:
  ARM: OMAP2+: hwmod: AM335x: fix cpgmac address space
  ARM: OMAP2+: hwmod: rt address space index for DT
  ARM: OMAP2+: Sync hwmod state with the pm_runtime and omap_device state
  ARM: OMAP2+: Avoid idling memory controllers with no drivers
  ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bbbeaef3 50c2a3a1

arch/arm/mach-omap2/omap_device.c

+18 −0
Original line number Diff line number Diff line
@@ -129,6 +129,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev) 
	struct device_node *node = pdev->dev.of_node;

	const char *oh_name;

	int oh_cnt, i, ret = 0;

	bool device_active = false;



	oh_cnt = of_property_count_strings(node, "ti,hwmods");

	if (oh_cnt <= 0) {
@@ -152,6 +153,8 @@ static int omap_device_build_from_dt(struct platform_device *pdev) 
			goto odbfd_exit1;

		}

		hwmods[i] = oh;

		if (oh->flags & HWMOD_INIT_NO_IDLE)

			device_active = true;

	}



	od = omap_device_alloc(pdev, hwmods, oh_cnt);
@@ -172,6 +175,11 @@ static int omap_device_build_from_dt(struct platform_device *pdev) 


	pdev->dev.pm_domain = &omap_device_pm_domain;



	if (device_active) {

		omap_device_enable(pdev);

		pm_runtime_set_active(&pdev->dev);

	}



odbfd_exit1:

	kfree(hwmods);

odbfd_exit:
@@ -842,6 +850,7 @@ static int __init omap_device_late_idle(struct device *dev, void *data) 
{

	struct platform_device *pdev = to_platform_device(dev);

	struct omap_device *od = to_omap_device(pdev);

	int i;



	if (!od)

		return 0;
@@ -850,6 +859,15 @@ static int __init omap_device_late_idle(struct device *dev, void *data) 
	 * If omap_device state is enabled, but has no driver bound,

	 * idle it.

	 */



	/*

	 * Some devices (like memory controllers) are always kept

	 * enabled, and should not be idled even with no drivers.

	 */

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

		if (od->hwmods[i]->flags & HWMOD_INIT_NO_IDLE)

			return 0;



	if (od->_driver_status != BUS_NOTIFY_BOUND_DRIVER) {

		if (od->_state == OMAP_DEVICE_STATE_ENABLED) {

			dev_warn(dev, "%s: enabled but no driver.  Idling\n",

arch/arm/mach-omap2/omap_hwmod.c

+1 −1
Original line number Diff line number Diff line
@@ -2386,7 +2386,7 @@ static void __init _init_mpu_rt_base(struct omap_hwmod *oh, void *data) 


		np = of_dev_hwmod_lookup(of_find_node_by_name(NULL, "ocp"), oh);

		if (np)

			va_start = of_iomap(np, 0);

			va_start = of_iomap(np, oh->mpu_rt_idx);

	} else {

		va_start = ioremap(mem->pa_start, mem->pa_end - mem->pa_start);

	}

arch/arm/mach-omap2/omap_hwmod.h

+50 −0
Original line number Diff line number Diff line
@@ -95,6 +95,54 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type3; 
#define MODULEMODE_HWCTRL		1

#define MODULEMODE_SWCTRL		2



#define DEBUG_OMAP2UART1_FLAGS	0

#define DEBUG_OMAP2UART2_FLAGS	0

#define DEBUG_OMAP2UART3_FLAGS	0

#define DEBUG_OMAP3UART3_FLAGS	0

#define DEBUG_OMAP3UART4_FLAGS	0

#define DEBUG_OMAP4UART3_FLAGS	0

#define DEBUG_OMAP4UART4_FLAGS	0

#define DEBUG_TI81XXUART1_FLAGS	0

#define DEBUG_TI81XXUART2_FLAGS	0

#define DEBUG_TI81XXUART3_FLAGS	0

#define DEBUG_AM33XXUART1_FLAGS	0



#define DEBUG_OMAPUART_FLAGS	(HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET)



#if defined(CONFIG_DEBUG_OMAP2UART1)

#undef DEBUG_OMAP2UART1_FLAGS

#define DEBUG_OMAP2UART1_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP2UART2)

#undef DEBUG_OMAP2UART2_FLAGS

#define DEBUG_OMAP2UART2_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP2UART3)

#undef DEBUG_OMAP2UART3_FLAGS

#define DEBUG_OMAP2UART3_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP3UART3)

#undef DEBUG_OMAP3UART3_FLAGS

#define DEBUG_OMAP3UART3_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP3UART4)

#undef DEBUG_OMAP3UART4_FLAGS

#define DEBUG_OMAP3UART4_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP4UART3)

#undef DEBUG_OMAP4UART3_FLAGS

#define DEBUG_OMAP4UART3_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_OMAP4UART4)

#undef DEBUG_OMAP4UART4_FLAGS

#define DEBUG_OMAP4UART4_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_TI81XXUART1)

#undef DEBUG_TI81XXUART1_FLAGS

#define DEBUG_TI81XXUART1_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_TI81XXUART2)

#undef DEBUG_TI81XXUART2_FLAGS

#define DEBUG_TI81XXUART2_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_TI81XXUART3)

#undef DEBUG_TI81XXUART3_FLAGS

#define DEBUG_TI81XXUART3_FLAGS DEBUG_OMAPUART_FLAGS

#elif defined(CONFIG_DEBUG_AM33XXUART1)

#undef DEBUG_AM33XXUART1_FLAGS

#define DEBUG_AM33XXUART1_FLAGS DEBUG_OMAPUART_FLAGS

#endif



/**

 * struct omap_hwmod_mux_info - hwmod specific mux configuration
@@ -568,6 +616,7 @@ struct omap_hwmod_link { 
 * @voltdm: pointer to voltage domain (filled in at runtime)

 * @dev_attr: arbitrary device attributes that can be passed to the driver

 * @_sysc_cache: internal-use hwmod flags

 * @mpu_rt_idx: index of device address space for register target (for DT boot)

 * @_mpu_rt_va: cached register target start address (internal use)

 * @_mpu_port: cached MPU register target slave (internal use)

 * @opt_clks_cnt: number of @opt_clks
@@ -617,6 +666,7 @@ struct omap_hwmod { 
	struct list_head		node;

	struct omap_hwmod_ocp_if	*_mpu_port;

	u16				flags;

	u8				mpu_rt_idx;

	u8				response_lat;

	u8				rst_lines_cnt;

	u8				opt_clks_cnt;

arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c

+3 −3
Original line number Diff line number Diff line
@@ -512,7 +512,7 @@ struct omap_hwmod omap2xxx_uart1_hwmod = { 
	.mpu_irqs	= omap2_uart1_mpu_irqs,

	.sdma_reqs	= omap2_uart1_sdma_reqs,

	.main_clk	= "uart1_fck",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= DEBUG_OMAP2UART1_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.prcm		= {

		.omap2 = {

			.module_offs = CORE_MOD,
@@ -532,7 +532,7 @@ struct omap_hwmod omap2xxx_uart2_hwmod = { 
	.mpu_irqs	= omap2_uart2_mpu_irqs,

	.sdma_reqs	= omap2_uart2_sdma_reqs,

	.main_clk	= "uart2_fck",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= DEBUG_OMAP2UART2_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.prcm		= {

		.omap2 = {

			.module_offs = CORE_MOD,
@@ -552,7 +552,7 @@ struct omap_hwmod omap2xxx_uart3_hwmod = { 
	.mpu_irqs	= omap2_uart3_mpu_irqs,

	.sdma_reqs	= omap2_uart3_sdma_reqs,

	.main_clk	= "uart3_fck",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= DEBUG_OMAP2UART3_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.prcm		= {

		.omap2 = {

			.module_offs = CORE_MOD,

arch/arm/mach-omap2/omap_hwmod_33xx_data.c

+2 −1
Original line number Diff line number Diff line
@@ -562,6 +562,7 @@ static struct omap_hwmod am33xx_cpgmac0_hwmod = { 
	.clkdm_name	= "cpsw_125mhz_clkdm",

	.flags		= (HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY),

	.main_clk	= "cpsw_125mhz_gclk",

	.mpu_rt_idx	= 1,

	.prcm		= {

		.omap4	= {

			.clkctrl_offs	= AM33XX_CM_PER_CPGMAC0_CLKCTRL_OFFSET,
@@ -1512,7 +1513,7 @@ static struct omap_hwmod am33xx_uart1_hwmod = { 
	.name		= "uart1",

	.class		= &uart_class,

	.clkdm_name	= "l4_wkup_clkdm",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= DEBUG_AM33XXUART1_FLAGS | HWMOD_SWSUP_SIDLE_ACT,

	.main_clk	= "dpll_per_m2_div4_wkupdm_ck",

	.prcm		= {

		.omap4	= {