ARM: OMAP5/DRA7: minor fixes
cover ARM: OMAP5/DRA7: minor fixes
Hi,
While doing a SoC only build for DRA7, a few bugs did pop up. The following series provides necessary fixups for the same.
Nishanth Menon (4):
ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
ARM: omap2+: board-generic: Remove stale of_irq macros
ARM: DRA7: Select missing options for SoC only build
ARM: OMAP5: Cleanup options for SoC only build
arch/arm/mach-omap2/Kconfig | 6 +++++- arch/arm/mach-omap2/board-generic.c | 7 ------- arch/arm/mach-omap2/pm.h | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-)
Signature · 1 line
1.7.9.5
PATCH 1/4 ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
OMAP5 and DRA7 reuse the same pm44xx_erratum variable so, enable the same, else PM features such as Suspend to ram is broken in a SoC only build configuration.
--- arch/arm/mach-omap2/pm.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/pm.h +2 -1
@@ -103,7 +103,8 @@ static inline void enable_omap3630_toggle_l2_on_restore(void) { }#define PM_OMAP4_ROM_SMP_BOOT_ERRATUM_GICD (1 << 0)#define PM_OMAP4_CPU_OSWR_DISABLE (1 << 1) -#if defined(CONFIG_PM ) && defined(CONFIG_ARCH_OMAP4 ) +#if defined(CONFIG_PM ) && (defined(CONFIG_ARCH_OMAP4 ) ||\ + defined(CONFIG_SOC_OMAP5 ) || defined(CONFIG_SOC_DRA7XX ))extern u16 pm44xx_errata;#define IS_PM44XX_ERRATUM (id) (pm44xx_errata & (id))#else
Signature · 1 line
1.7.9.5
PATCH 2/4 ARM: omap2+: board-generic: Remove stale of_irq macros
In reply to Nishanth MenonWhen commit c4082d499fa2 ("ARM: omap2+: board-generic: clean up the irq data from board file") cleaned up the direct usage of gic_of_init and omap_intc_of_init, it failed to clean up the macros properly.
Since these macros are no longer used, lets just remove them.
--- arch/arm/mach-omap2/board-generic.c | 7 ------- 1 file changed, 7 deletions(-)
arch/arm/mach-omap2/board-generic.c +0 -7
@@ -20,13 +20,6 @@#include "common.h" -#if !(defined(CONFIG_ARCH_OMAP2 ) || defined(CONFIG_ARCH_OMAP3 )) -#define intc_of_init NULL -#endif -#ifndef CONFIG_ARCH_OMAP4 -#define gic_of_init NULL -#endif -static const struct of_device_id omap_dt_match_table[]__initconst = { { .compatible ="simple-bus" , }, { .compatible ="ti,omap-infra" , },
Signature · 1 line
1.7.9.5
PATCH 3/4 ARM: DRA7: Select missing options for SoC only build
In reply to Nishanth MenonDRA7 does use OPP, uses OMAP interconnect and also does require SCU. These are missing in the SoC only build of DRA7 breaking various PM features in DRA7 only build.
--- arch/arm/mach-omap2/Kconfig | 3 +++ 1 file changed, 3 insertions(+)
arch/arm/mach-omap2/Kconfig +3 -0
@@ -70,10 +70,13 @@ config SOC_DRA7XX select ARCH_OMAP2PLUS select ARM_CPU_SUSPEND if PM select ARM_GIC + select HAVE_ARM_SCU if SMP select HAVE_ARM_ARCH_TIMER select IRQ_CROSSBAR select ARM_ERRATA_798181 if SMP + select OMAP_INTERCONNECT select OMAP_INTERCONNECT_BARRIER + select PM_OPP if PM config ARCH_OMAP2PLUS bool
Signature · 1 line
1.7.9.5
PATCH 4/4 ARM: OMAP5: Cleanup options for SoC only build
In reply to Nishanth MenonOMAP5 SoC has Cortex-A15 which does not use TWD timer. It uses ARCH_TIMER instead, clean up unwanted configuration and enable OMAP_INTERCONNECT and OPP which is necessary for expected functionality on the SoC.
--- arch/arm/mach-omap2/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm/mach-omap2/Kconfig +2 -1
@@ -44,10 +44,11 @@ config SOC_OMAP5 select ARM_CPU_SUSPEND if PM select ARM_GIC select HAVE_ARM_SCU if SMP - select HAVE_ARM_TWD if SMP select HAVE_ARM_ARCH_TIMER select ARM_ERRATA_798181 if SMP + select OMAP_INTERCONNECT select OMAP_INTERCONNECT_BARRIER + select PM_OPP if PM config SOC_AM33XX bool "TI AM33XX"
Signature · 1 line
1.7.9.5
Tony Lindgren
maintainerQuoted 11 lines · Nishanth Menon
Hi,
While doing a SoC only build for DRA7, a few bugs did pop up. The following series provides necessary fixups for the same.
Nishanth Menon (4):
ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
ARM: omap2+: board-generic: Remove staleof_irqmacros
ARM: DRA7: Select missing options for SoC only build
ARM: OMAP5: Cleanup options for SoC only build
Quoted 4 lines
arch/arm/mach-omap2/Kconfig | 6 +++++- arch/arm/mach-omap2/board-generic.c | 7 ------- arch/arm/mach-omap2/pm.h | 3 ++- 3 files changed, 7 insertions(+), 9 deletions(-)
Applying all into omap-for-v4.3/fixes thanks.
Tony