Commit 10561248 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branch 'for_3.10/omap5_generic_updates' of... 

Merge branch 'for_3.10/omap5_generic_updates' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux into omap-for-v3.10/fixes-non-critical
parents d29778a0 ecf51648

arch/arm/mach-omap2/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -408,7 +408,7 @@ config OMAP3_SDRC_AC_TIMING 


config OMAP4_ERRATA_I688

	bool "OMAP4 errata: Async Bridge Corruption"

	depends on ARCH_OMAP4 && !ARCH_MULTIPLATFORM

	depends on (ARCH_OMAP4 || SOC_OMAP5) && !ARCH_MULTIPLATFORM

	select ARCH_HAS_BARRIERS

	help

	  If a data is stalled inside asynchronous bridge because of back

arch/arm/mach-omap2/dpll3xxx.c

+5 −6
Original line number Diff line number Diff line
@@ -307,10 +307,10 @@ static int omap3_noncore_dpll_program(struct clk_hw_omap *clk, u16 freqsel) 
	_omap3_noncore_dpll_bypass(clk);



	/*

	 * Set jitter correction. No jitter correction for OMAP4 and 3630

	 * since freqsel field is no longer present

	 * Set jitter correction. Jitter correction applicable for OMAP343X

	 * only since freqsel field is no longer present on other devices.

	 */

	if (!soc_is_am33xx() && !cpu_is_omap44xx() && !cpu_is_omap3630()) {

	if (cpu_is_omap343x()) {

		v = __raw_readl(dd->control_reg);

		v &= ~dd->freqsel_mask;

		v |= freqsel << __ffs(dd->freqsel_mask);
@@ -502,9 +502,8 @@ int omap3_noncore_dpll_set_rate(struct clk_hw *hw, unsigned long rate, 
		if (dd->last_rounded_rate == 0)

			return -EINVAL;



		/* No freqsel on AM335x, OMAP4 and OMAP3630 */

		if (!soc_is_am33xx() && !cpu_is_omap44xx() &&

		    !cpu_is_omap3630()) {

		/* Freqsel is available only on OMAP343X devices */

		if (cpu_is_omap343x()) {

			freqsel = _omap3_dpll_compute_freqsel(clk,

						dd->last_rounded_n);

			WARN_ON(!freqsel);

arch/arm/mach-omap2/id.c

+9 −3
Original line number Diff line number Diff line
@@ -529,22 +529,28 @@ void __init omap5xxx_check_revision(void) 
	case 0xb942:

		switch (rev) {

		case 0:

		default:

			omap_revision = OMAP5430_REV_ES1_0;

			break;

		case 1:

		default:

			omap_revision = OMAP5430_REV_ES2_0;

		}

		break;



	case 0xb998:

		switch (rev) {

		case 0:

		default:

			omap_revision = OMAP5432_REV_ES1_0;

			break;

		case 1:

		default:

			omap_revision = OMAP5432_REV_ES2_0;

		}

		break;



	default:

		/* Unknown default to latest silicon rev as default*/

		omap_revision = OMAP5430_REV_ES1_0;

		omap_revision = OMAP5430_REV_ES2_0;

	}



	pr_info("OMAP%04x ES%d.0\n",

arch/arm/mach-omap2/io.c

+9 −0
Original line number Diff line number Diff line
@@ -271,6 +271,14 @@ static struct map_desc omap54xx_io_desc[] __initdata = { 
		.length		= L4_PER_54XX_SIZE,

		.type		= MT_DEVICE,

	},

#ifdef CONFIG_OMAP4_ERRATA_I688

	{

		.virtual	= OMAP4_SRAM_VA,

		.pfn		= __phys_to_pfn(OMAP4_SRAM_PA),

		.length		= PAGE_SIZE,

		.type		= MT_MEMORY_SO,

	},

#endif

};

#endif
@@ -323,6 +331,7 @@ void __init omap4_map_io(void) 
void __init omap5_map_io(void)

{

	iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));

	omap_barriers_init();

}

#endif

/*

arch/arm/mach-omap2/omap4-common.c

+8 −2
Original line number Diff line number Diff line
@@ -240,15 +240,21 @@ void __iomem *omap4_get_sar_ram_base(void) 
 */

static int __init omap4_sar_ram_init(void)

{

	unsigned long sar_base;



	/*

	 * To avoid code running on other OMAPs in

	 * multi-omap builds

	 */

	if (!cpu_is_omap44xx())

	if (cpu_is_omap44xx())

		sar_base = OMAP44XX_SAR_RAM_BASE;

	else if (soc_is_omap54xx())

		sar_base = OMAP54XX_SAR_RAM_BASE;

	else

		return -ENOMEM;



	/* Static mapping, never released */

	sar_ram_base = ioremap(OMAP44XX_SAR_RAM_BASE, SZ_16K);

	sar_ram_base = ioremap(sar_base, SZ_16K);

	if (WARN_ON(!sar_ram_base))

		return -ENOMEM;