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

Merge tag 'omap-for-v3.15/soc-signed' of... 

Merge tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/soc

OMAP SoC changes from Tony Lindgren:

Few SoC related improvments for omaps.

* tag 'omap-for-v3.15/soc-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap

:
  ARM: OMAP2+: remove OMAP_PACKAGE_ZAC and OMAP_PACKAGE_ZAF
  ARM: OMAP2+: AM43x: Use gptimer as clocksource
  ARM: OMAP2+: AM43x: determine features
  ARM: OMAP2+: AM43x: Add ID for ES1.1
  ARM: OMAP2+: AM43x: enable in default config

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents c381585f 9b91bd81

arch/arm/configs/omap2plus_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ CONFIG_ARCH_OMAP3=y 
CONFIG_ARCH_OMAP4=y

CONFIG_SOC_OMAP5=y

CONFIG_SOC_AM33XX=y

CONFIG_SOC_AM43XX=y

CONFIG_SOC_DRA7XX=y

CONFIG_ARM_THUMBEE=y

CONFIG_ARM_ERRATA_411920=y

arch/arm/mach-omap2/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -165,12 +165,6 @@ config SOC_TI81XX 
	depends on ARCH_OMAP3

	default y



config OMAP_PACKAGE_ZAF

       bool



config OMAP_PACKAGE_ZAC

       bool



config OMAP_PACKAGE_CBC

       bool
@@ -284,7 +278,6 @@ config MACH_NOKIA_N8X0 
	select MACH_NOKIA_N800

	select MACH_NOKIA_N810

	select MACH_NOKIA_N810_WIMAX

	select OMAP_PACKAGE_ZAC



config MACH_NOKIA_RX51

	bool "Nokia N900 (RX-51) phone"

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

+1 −1
Original line number Diff line number Diff line
@@ -229,7 +229,7 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)") 
	.init_late	= am43xx_init_late,

	.init_irq	= omap_gic_of_init,

	.init_machine	= omap_generic_init,

	.init_time	= omap3_sync32k_timer_init,

	.init_time	= omap3_gptimer_timer_init,

	.dt_compat	= am43_boards_compat,

MACHINE_END

#endif

arch/arm/mach-omap2/id.c

+14 −2
Original line number Diff line number Diff line
@@ -465,9 +465,19 @@ void __init omap3xxx_check_revision(void) 
		}

		break;

	case 0xb98c:

		switch (rev) {

		case 0:

			omap_revision = AM437X_REV_ES1_0;

			cpu_rev = "1.0";

			break;

		case 1:

		/* FALLTHROUGH */

		default:

			omap_revision = AM437X_REV_ES1_1;

			cpu_rev = "1.1";

			break;

		}

		break;

	case 0xb8f2:

		switch (rev) {

		case 0:
@@ -657,6 +667,8 @@ static const char * __init omap_get_family(void) 
		return kasprintf(GFP_KERNEL, "OMAP4");

	else if (soc_is_omap54xx())

		return kasprintf(GFP_KERNEL, "OMAP5");

	else if (soc_is_am43xx())

		return kasprintf(GFP_KERNEL, "AM43xx");

	else

		return kasprintf(GFP_KERNEL, "Unknown");

}

arch/arm/mach-omap2/io.c

+1 −0
Original line number Diff line number Diff line
@@ -613,6 +613,7 @@ void __init am43xx_init_early(void) 
	omap_prm_base_init();

	omap_cm_base_init();

	omap3xxx_check_revision();

	am33xx_check_features();

	am43xx_powerdomains_init();

	am43xx_clockdomains_init();

	am43xx_hwmod_init();

CRA Git | Maintained and supported by SUSTech CRA and CCSE