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

Commit 56fecc7d authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'omap/fixes-non-critical' into next/dt2 



Merging in dependencies for the omap/dt branch.

* omap/fixes-non-critical:
  ARM: OMAP2+: fix typo "CONFIG_BRIDGE_DVFS"
  ARM: OMAP1: remove "config MACH_OMAP_HTCWIZARD"
  ARM: OMAP: dpll: enable bypass clock only when attempting dpll bypass
  ARM: OMAP2+: powerdomain: avoid testing whether an unsigned char is less than 0
  ARM: OMAP2+: hwmod: Remove unused _HWMOD_WAKEUP_ENABLED flag
  ARM: OMAP2+: am335x: Change the wdt1 func clk src to per_32k clk
  ARM: OMAP2+: AM33xx: hwmod: Add missing sysc definition to wdt1 entry
  ARM: OMAP: fix typo "CONFIG_SMC91x_MODULE"
  ARM: OMAP5: clock: No Freqsel on OMAP5 devices too
  ARM: OMAP5: Make errata i688 workaround available
  ARM: OMAP5: Update SAR memory layout for WakeupGen
  ARM: OMAP5: Update SAR RAM base address
  ARM: OMAP5: Reuse prm read_inst/write_inst
  ARM: OMAP5: prm: Allow prm init to succeed
  ARM: OMAP5: timer: Update the clocksource name as per clock data
  ARM: OMAP5: Update SOC id detection code for ES2

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 535409d9 10561248

arch/arm/mach-omap1/Kconfig

+0 −6
Original line number Diff line number Diff line
@@ -55,12 +55,6 @@ config MACH_OMAP_H3 
	  TI OMAP 1710 H3 board support. Say Y here if you have such

	  a board.



config MACH_OMAP_HTCWIZARD

	bool "HTC Wizard"

	depends on ARCH_OMAP850

	help

	  HTC Wizard smartphone support (AKA QTEK 9100, ...)



config MACH_HERALD

	bool "HTC Herald"

	depends on ARCH_OMAP850

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/board-2430sdp.c

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ static void __init sdp2430_display_init(void) 
	omap_display_init(&sdp2430_dss_data);

}



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)

#if IS_ENABLED(CONFIG_SMC91X)



static struct omap_smc91x_platform_data board_smc91x_data = {

	.cs		= 5,

arch/arm/mach-omap2/board-h4.c

+1 −1
Original line number Diff line number Diff line
@@ -246,7 +246,7 @@ static u32 is_gpmc_muxed(void) 
		return 0;

}



#if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91x_MODULE)

#if IS_ENABLED(CONFIG_SMC91X)



static struct omap_smc91x_platform_data board_smc91x_data = {

	.cs		= 1,

arch/arm/mach-omap2/cclock33xx_data.c

+8 −0
Original line number Diff line number Diff line
@@ -958,6 +958,14 @@ int __init am33xx_clk_init(void) 


	clk_set_parent(&timer3_fck, &sys_clkin_ck);

	clk_set_parent(&timer6_fck, &sys_clkin_ck);

	/*

	 * The On-Chip 32K RC Osc clock is not an accurate clock-source as per

	 * the design/spec, so as a result, for example, timer which supposed

	 * to get expired @60Sec, but will expire somewhere ~@40Sec, which is

	 * not expected by any use-case, so change WDT1 clock source to PRCM

	 * 32KHz clock.

	 */

	clk_set_parent(&wdt1_fck, &clkdiv32k_ick);



	return 0;

}