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

Commit 1c2e1fd1 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'omap-fixes-for-v3.4-rc3' of... 

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

Fix regression for bad uart muxing and oops when PM is not set.
Revert one softreset regression and few other minor fixes.

* tag 'omap-fixes-for-v3.4-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP1: DMTIMER: fix broken timer clock source selection
  ARM: OMAP: serial: Fix the ocp smart idlemode handling bug
  ARM: OMAP2+: UART: Fix incorrect population of default uart pads
  ARM: OMAP: sram: fix BUG in dpll code for !PM case
  ARM: OMAP2/3: VENC hwmods: Remove OCPIF_SWSUP_IDLE flag from VENC slave interface
  ARM: OMAP2+: hwmod: Revert "ARM: OMAP2+: hwmod: Make omap_hwmod_softreset wait for reset status"
  ARM: OMAP2+: hwmod: add softreset delay field and OMAP4 data
  ARM: OMAP1: mux: add missing include
parents 888073d4 6aaec67d

arch/arm/mach-omap1/mux.c

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/io.h>

#include <linux/spinlock.h>



#include <mach/hardware.h>



#include <plat/mux.h>

arch/arm/mach-omap1/timer.c

+2 −2
Original line number Diff line number Diff line
@@ -47,9 +47,9 @@ static int omap1_dm_timer_set_src(struct platform_device *pdev, 
	int n = (pdev->id - 1) << 1;

	u32 l;



	l = __raw_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);

	l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);

	l |= source << n;

	__raw_writel(l, MOD_CONF_CTRL_1);

	omap_writel(l, MOD_CONF_CTRL_1);



	return 0;

}

arch/arm/mach-omap2/omap_hwmod.c

+15 −2
Original line number Diff line number Diff line
@@ -1422,6 +1422,9 @@ static int _ocp_softreset(struct omap_hwmod *oh) 
		goto dis_opt_clks;

	_write_sysconfig(v, oh);



	if (oh->class->sysc->srst_udelay)

		udelay(oh->class->sysc->srst_udelay);



	if (oh->class->sysc->sysc_flags & SYSS_HAS_RESET_STATUS)

		omap_test_timeout((omap_hwmod_read(oh,

						    oh->class->sysc->syss_offs)
@@ -1903,10 +1906,20 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs) 
 */

int omap_hwmod_softreset(struct omap_hwmod *oh)

{

	if (!oh)

	u32 v;

	int ret;



	if (!oh || !(oh->_sysc_cache))

		return -EINVAL;



	return _ocp_softreset(oh);

	v = oh->_sysc_cache;

	ret = _set_softreset(oh, &v);

	if (ret)

		goto error;

	_write_sysconfig(v, oh);



error:

	return ret;

}



/**

arch/arm/mach-omap2/omap_hwmod_2420_data.c

+0 −1
Original line number Diff line number Diff line
@@ -1000,7 +1000,6 @@ static struct omap_hwmod_ocp_if omap2420_l4_core__dss_venc = { 
			.flags	= OMAP_FIREWALL_L4,

		}

	},

	.flags		= OCPIF_SWSUP_IDLE,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};

arch/arm/mach-omap2/omap_hwmod_2430_data.c

+0 −1
Original line number Diff line number Diff line
@@ -1049,7 +1049,6 @@ static struct omap_hwmod_ocp_if omap2430_l4_core__dss_venc = { 
	.slave		= &omap2430_dss_venc_hwmod,

	.clk		= "dss_ick",

	.addr		= omap2_dss_venc_addrs,

	.flags		= OCPIF_SWSUP_IDLE,

	.user		= OCP_USER_MPU | OCP_USER_SDMA,

};