* [PATCH 1/4] ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well
2015-09-09 21:18 [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Nishanth Menon
@ 2015-09-09 21:18 ` Nishanth Menon
2015-09-09 21:18 ` [PATCH 2/4] ARM: omap2+: board-generic: Remove stale of_irq macros Nishanth Menon
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2015-09-09 21:18 UTC (permalink / raw)
To: linux-arm-kernel
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.
Reported-by: Carlos Hernandez <ceh@ti•com>
Signed-off-by: Nishanth Menon <nm@ti•com>
---
arch/arm/mach-omap2/pm.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/pm.h b/arch/arm/mach-omap2/pm.h
index 425bfcd67db6..f5bae699baac 100644
--- a/arch/arm/mach-omap2/pm.h
+++ b/arch/arm/mach-omap2/pm.h
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ARM: omap2+: board-generic: Remove stale of_irq macros
2015-09-09 21:18 [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Nishanth Menon
2015-09-09 21:18 ` [PATCH 1/4] ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well Nishanth Menon
@ 2015-09-09 21:18 ` Nishanth Menon
2015-09-09 21:18 ` [PATCH 3/4] ARM: DRA7: Select missing options for SoC only build Nishanth Menon
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2015-09-09 21:18 UTC (permalink / raw)
To: linux-arm-kernel
When 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.
Fixes: c4082d499fa2 ("ARM: omap2+: board-generic: clean up the irq data from board file")
Reported-by: Carlos Hernandez <ceh@ti•com>
Signed-off-by: Nishanth Menon <nm@ti•com>
---
arch/arm/mach-omap2/board-generic.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 24c9afc9e8a7..6133eaac685d 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -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", },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] ARM: DRA7: Select missing options for SoC only build
2015-09-09 21:18 [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Nishanth Menon
2015-09-09 21:18 ` [PATCH 1/4] ARM: OMAP4+: PM: erratum is used by OMAP5 and DRA7 as well Nishanth Menon
2015-09-09 21:18 ` [PATCH 2/4] ARM: omap2+: board-generic: Remove stale of_irq macros Nishanth Menon
@ 2015-09-09 21:18 ` Nishanth Menon
2015-09-09 21:18 ` [PATCH 4/4] ARM: OMAP5: Cleanup " Nishanth Menon
2015-09-14 19:36 ` [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2015-09-09 21:18 UTC (permalink / raw)
To: linux-arm-kernel
DRA7 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.
Reported-by: Carlos Hernandez <ceh@ti•com>
Signed-off-by: Nishanth Menon <nm@ti•com>
---
arch/arm/mach-omap2/Kconfig | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 07d2e100caab..403022a38607 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -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
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] ARM: OMAP5: Cleanup options for SoC only build
2015-09-09 21:18 [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Nishanth Menon
` (2 preceding siblings ...)
2015-09-09 21:18 ` [PATCH 3/4] ARM: DRA7: Select missing options for SoC only build Nishanth Menon
@ 2015-09-09 21:18 ` Nishanth Menon
2015-09-14 19:36 ` [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Nishanth Menon @ 2015-09-09 21:18 UTC (permalink / raw)
To: linux-arm-kernel
OMAP5 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.
Reported-by: Carlos Hernandez <ceh@ti•com>
Reported-by: Felipe Balbi <balbi@ti•com>
Signed-off-by: Nishanth Menon <nm@ti•com>
---
arch/arm/mach-omap2/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 403022a38607..b3a0dff67e3f 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -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"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes
2015-09-09 21:18 [PATCH 0/4] ARM: OMAP5/DRA7: minor fixes Nishanth Menon
` (3 preceding siblings ...)
2015-09-09 21:18 ` [PATCH 4/4] ARM: OMAP5: Cleanup " Nishanth Menon
@ 2015-09-14 19:36 ` Tony Lindgren
4 siblings, 0 replies; 6+ messages in thread
From: Tony Lindgren @ 2015-09-14 19:36 UTC (permalink / raw)
To: linux-arm-kernel
* Nishanth Menon <nm@ti•com> [150909 14:21]:
> 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(-)
Applying all into omap-for-v4.3/fixes thanks.
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread