Commit d846c1a6 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-for-v3.20/fixes-not-urgent-pt2' of... 

Merge tag 'omap-for-v3.20/fixes-not-urgent-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/fixes-non-critical

Merge "omap non-urgent fixes for v3.20, part 2" from Tony Lindgren:

Non-critical fixes for omap hwmod code via Paul Walmsley <paul@pwsan.com>:

First set of OMAP2+ hwmod patches for Linux v3.20.  These are mostly
fixes for warnings, although there's one DRA7xx patch that fixes
CONFIG_DEBUG_LL for AM572x/DRA7xx SoCs that use UART3 for console,
such as the BeagleBoard-X15.

These patches entered Linux-next starting with the next-20150121 tag.

Basic build, boot, and PM test results can be found here:

http://www.pwsan.com/omap/testlogs/omap-hwmod-a-for-v3.20/20150121142621/

* tag 'omap-for-v3.20/fixes-not-urgent-pt2' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
  ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
  ARM: AM43xx: hwmod: set DSS submodule parent hwmods
  ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
  MAINTAINERS: add maintainer for OMAP hwmod data

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents b2cb793c 20d9448a

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -6890,6 +6890,12 @@ L: linux-omap@vger.kernel.org 
S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod.*



OMAP HWMOD DATA

M:	Paul Walmsley <paul@pwsan.com>

L:	linux-omap@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-omap2/omap_hwmod*data*



OMAP HWMOD DATA FOR OMAP4-BASED DEVICES

M:	Benoît Cousson <bcousson@baylibre.com>

L:	linux-omap@vger.kernel.org

arch/arm/mach-omap2/omap_hwmod.c

+2 −2
Original line number Diff line number Diff line
@@ -2155,7 +2155,7 @@ static int _enable(struct omap_hwmod *oh) 
		if (soc_ops.disable_module)

			soc_ops.disable_module(oh);

		_disable_clocks(oh);

		pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",

		pr_err("omap_hwmod: %s: _wait_target_ready failed: %d\n",

		       oh->name, r);



		if (oh->clkdm)

arch/arm/mach-omap2/omap_hwmod_43xx_data.c

+2 −0
Original line number Diff line number Diff line
@@ -498,6 +498,7 @@ static struct omap_hwmod am43xx_dss_dispc_hwmod = { 
		},

	},

	.dev_attr	= &am43xx_dss_dispc_dev_attr,

	.parent_hwmod	= &am43xx_dss_core_hwmod,

};



/* rfbi */
@@ -512,6 +513,7 @@ static struct omap_hwmod am43xx_dss_rfbi_hwmod = { 
			.clkctrl_offs = AM43XX_CM_PER_DSS_CLKCTRL_OFFSET,

		},

	},

	.parent_hwmod	= &am43xx_dss_core_hwmod,

};



/* Interfaces */

arch/arm/mach-omap2/omap_hwmod_7xx_data.c

+3 −2
Original line number Diff line number Diff line
@@ -819,7 +819,8 @@ static struct omap_hwmod dra7xx_gpmc_hwmod = { 
	.name		= "gpmc",

	.class		= &dra7xx_gpmc_hwmod_class,

	.clkdm_name	= "l3main1_clkdm",

	.flags		= HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,

	.flags		= (HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET |

			   HWMOD_SWSUP_SIDLE),

	.main_clk	= "l3_iclk_div",

	.prcm = {

		.omap4 = {
@@ -2017,7 +2018,7 @@ static struct omap_hwmod dra7xx_uart3_hwmod = { 
	.class		= &dra7xx_uart_hwmod_class,

	.clkdm_name	= "l4per_clkdm",

	.main_clk	= "uart3_gfclk_mux",

	.flags		= HWMOD_SWSUP_SIDLE_ACT,

	.flags		= HWMOD_SWSUP_SIDLE_ACT | DEBUG_OMAP4UART3_FLAGS,

	.prcm = {

		.omap4 = {

			.clkctrl_offs = DRA7XX_CM_L4PER_UART3_CLKCTRL_OFFSET,

CRA Git | Maintained and supported by SUSTech CRA and CCSE