[PATCH-V3 0/3] ARM: OMAP2+: Cleanup series in order to remove ARCH_OMAPx dependency

[PATCH-V3 0/3] ARM: OMAP2+: Cleanup series in order to remove ARCH_OMAPx dependency

[Vaibhav Hiremath]

In current implementation, some places we are still using
ARCH_OMAPx config option, making it difficult to add new devices;
for example, while adding am33xx device support I came across multiple
instances where I had to patch the existing code to make it work for
am33xx.

This patch tries to cleanup existing code for some of the
ARCH_OMAP2/3/4 dependency on the code.

NOTE: Patch series has been build tested for all possible
      combination of OMAP2, 3, 4 configurations.

History on Patch-series:
========================
Changes from V2:
	- Rebased against latest linux-omap/master
	- Removed [Patch 4/4], fixed it separately as independent patch.
	  Already in Mainline.
	- Fixed comments form KevinH, added Makefile rule for sdrc.c

Changes from V1:
	- Fixed comments from Tony
	- Config option name of SOC_HAS_SDRC changed to
	  SOC_HAS_OMAP2_SDRC
	- Config option name for SOC_HAS_DPLL_xxx flags
	  to SOC_HAS_OMAP3_DPLL_xxx.



Vaibhav Hiremath (3):
  ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add
    one entry
  ARM: OMAP2+: CLEANUP: Move omap3 dpll ops to dpll3xxx.c
  ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around
    __omap2_set_globals

 arch/arm/mach-omap2/Kconfig    |    8 ++++++++
 arch/arm/mach-omap2/Makefile   |    3 ++-
 arch/arm/mach-omap2/clock.c    |   18 ------------------
 arch/arm/mach-omap2/common.c   |    8 +-------
 arch/arm/mach-omap2/common.h   |    5 +++++
 arch/arm/mach-omap2/dpll3xxx.c |   14 ++++++++++++++
 arch/arm/plat-omap/Makefile    |    4 +---
 7 files changed, 31 insertions(+), 29 deletions(-)

[PATCH-V3 0/3] ARM: OMAP2+: Cleanup series in order to remove ARCH_OMAPx dependency

[Vaibhav Hiremath]

In current implementation, some places we are still using
ARCH_OMAPx config option, making it difficult to add new devices;
for example, while adding am33xx device support I came across multiple
instances where I had to patch the existing code to make it work for
am33xx.

This patch tries to cleanup existing code for some of the
ARCH_OMAP2/3/4 dependency on the code.

NOTE: Patch series has been build tested for all possible
      combination of OMAP2, 3, 4 configurations.

History on Patch-series:
========================
Changes from V2:
	- Rebased against latest linux-omap/master
	- Removed [Patch 4/4], fixed it separately as independent patch.
	  Already in Mainline.
	- Fixed comments form KevinH, added Makefile rule for sdrc.c

Changes from V1:
	- Fixed comments from Tony
	- Config option name of SOC_HAS_SDRC changed to
	  SOC_HAS_OMAP2_SDRC
	- Config option name for SOC_HAS_DPLL_xxx flags
	  to SOC_HAS_OMAP3_DPLL_xxx.



Vaibhav Hiremath (3):
  ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add
    one entry
  ARM: OMAP2+: CLEANUP: Move omap3 dpll ops to dpll3xxx.c
  ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around
    __omap2_set_globals

 arch/arm/mach-omap2/Kconfig    |    8 ++++++++
 arch/arm/mach-omap2/Makefile   |    3 ++-
 arch/arm/mach-omap2/clock.c    |   18 ------------------
 arch/arm/mach-omap2/common.c   |    8 +-------
 arch/arm/mach-omap2/common.h   |    5 +++++
 arch/arm/mach-omap2/dpll3xxx.c |   14 ++++++++++++++
 arch/arm/plat-omap/Makefile    |    4 +---
 7 files changed, 31 insertions(+), 29 deletions(-)

[PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Vaibhav Hiremath]

All OMAP2PLUS based devices, builds omap-device.o target;
so just add one entry so that there is no need to patch this file
for any future OMAP2+ devices.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>

NOTE: No code change from last version.
---
 arch/arm/plat-omap/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 6d87532..961bf85 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -10,9 +10,7 @@ obj-n :=
 obj-  :=

 # omap_device support (OMAP2+ only at the moment)
-obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
-obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
-obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
+obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o

 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
--
1.7.0.4

[PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Vaibhav Hiremath]

All OMAP2PLUS based devices, builds omap-device.o target;
so just add one entry so that there is no need to patch this file
for any future OMAP2+ devices.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>

NOTE: No code change from last version.
---
 arch/arm/plat-omap/Makefile |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 6d87532..961bf85 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -10,9 +10,7 @@ obj-n :=
 obj-  :=

 # omap_device support (OMAP2+ only at the moment)
-obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
-obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
-obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
+obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o

 obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
 obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
--
1.7.0.4

[PATCH-V3 2/3] ARM: OMAP2+: CLEANUP: Move omap3 dpll ops to dpll3xxx.c

[Vaibhav Hiremath]

In order to remove unnecessary idefs, move noncore and core
dpll ops to dpll3xxx.c file (where it should have been already).

The clkops (clkops_omap3_core_dpll_ops & clkops_omap3_noncore_dpll_ops)
is used in clock data files, and dependency is already handled by
Makefile rule.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>

NOTE: No code change from last version.
---
 arch/arm/mach-omap2/clock.c    |   18 ------------------
 arch/arm/mach-omap2/dpll3xxx.c |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 5c4e665..ea3f565 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -398,24 +398,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 	return omap2_clksel_set_parent(clk, new_parent);
 }

-/* OMAP3/4 non-CORE DPLL clkops */
-
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
-
-const struct clkops clkops_omap3_noncore_dpll_ops = {
-	.enable		= omap3_noncore_dpll_enable,
-	.disable	= omap3_noncore_dpll_disable,
-	.allow_idle	= omap3_dpll_allow_idle,
-	.deny_idle	= omap3_dpll_deny_idle,
-};
-
-const struct clkops clkops_omap3_core_dpll_ops = {
-	.allow_idle	= omap3_dpll_allow_idle,
-	.deny_idle	= omap3_dpll_deny_idle,
-};
-
-#endif
-
 /*
  * OMAP2+ clock reset and init functions
  */
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index f0f10be..ff6f237 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -628,3 +628,17 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk)
 		rate = clk->parent->rate * 2;
 	return rate;
 }
+
+/* OMAP3/4 non-CORE DPLL clkops */
+
+const struct clkops clkops_omap3_noncore_dpll_ops = {
+	.enable		= omap3_noncore_dpll_enable,
+	.disable	= omap3_noncore_dpll_disable,
+	.allow_idle	= omap3_dpll_allow_idle,
+	.deny_idle	= omap3_dpll_deny_idle,
+};
+
+const struct clkops clkops_omap3_core_dpll_ops = {
+	.allow_idle	= omap3_dpll_allow_idle,
+	.deny_idle	= omap3_dpll_deny_idle,
+};
--
1.7.0.4

[PATCH-V3 2/3] ARM: OMAP2+: CLEANUP: Move omap3 dpll ops to dpll3xxx.c

[Vaibhav Hiremath]

In order to remove unnecessary idefs, move noncore and core
dpll ops to dpll3xxx.c file (where it should have been already).

The clkops (clkops_omap3_core_dpll_ops & clkops_omap3_noncore_dpll_ops)
is used in clock data files, and dependency is already handled by
Makefile rule.

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>

NOTE: No code change from last version.
---
 arch/arm/mach-omap2/clock.c    |   18 ------------------
 arch/arm/mach-omap2/dpll3xxx.c |   14 ++++++++++++++
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
index 5c4e665..ea3f565 100644
--- a/arch/arm/mach-omap2/clock.c
+++ b/arch/arm/mach-omap2/clock.c
@@ -398,24 +398,6 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
 	return omap2_clksel_set_parent(clk, new_parent);
 }

-/* OMAP3/4 non-CORE DPLL clkops */
-
-#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
-
-const struct clkops clkops_omap3_noncore_dpll_ops = {
-	.enable		= omap3_noncore_dpll_enable,
-	.disable	= omap3_noncore_dpll_disable,
-	.allow_idle	= omap3_dpll_allow_idle,
-	.deny_idle	= omap3_dpll_deny_idle,
-};
-
-const struct clkops clkops_omap3_core_dpll_ops = {
-	.allow_idle	= omap3_dpll_allow_idle,
-	.deny_idle	= omap3_dpll_deny_idle,
-};
-
-#endif
-
 /*
  * OMAP2+ clock reset and init functions
  */
diff --git a/arch/arm/mach-omap2/dpll3xxx.c b/arch/arm/mach-omap2/dpll3xxx.c
index f0f10be..ff6f237 100644
--- a/arch/arm/mach-omap2/dpll3xxx.c
+++ b/arch/arm/mach-omap2/dpll3xxx.c
@@ -628,3 +628,17 @@ unsigned long omap3_clkoutx2_recalc(struct clk *clk)
 		rate = clk->parent->rate * 2;
 	return rate;
 }
+
+/* OMAP3/4 non-CORE DPLL clkops */
+
+const struct clkops clkops_omap3_noncore_dpll_ops = {
+	.enable		= omap3_noncore_dpll_enable,
+	.disable	= omap3_noncore_dpll_disable,
+	.allow_idle	= omap3_dpll_allow_idle,
+	.deny_idle	= omap3_dpll_deny_idle,
+};
+
+const struct clkops clkops_omap3_core_dpll_ops = {
+	.allow_idle	= omap3_dpll_allow_idle,
+	.deny_idle	= omap3_dpll_deny_idle,
+};
--
1.7.0.4

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Vaibhav Hiremath]

The function __omap2_set_globals() can be common across all
platforms/architectures, even in case of omap4, internally it
calls same set of functions as in __omap2_set_globals() function
(except for sdrc).
This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
so that we can reuse same function across omap2/3/4...

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>

Changes from V1:
	- Added Makefile rule to build sdrc.c file for new
	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
---
 arch/arm/mach-omap2/Kconfig  |    8 ++++++++
 arch/arm/mach-omap2/Makefile |    3 ++-
 arch/arm/mach-omap2/common.c |    8 +-------
 arch/arm/mach-omap2/common.h |    5 +++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 208b950..82d9d18 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
 	help
 	  Compile a kernel suitable for booting most boards

+config SOC_HAS_OMAP2_SDRC
+	bool "OMAP2 SDRAM Controller support"
+
 config ARCH_OMAP2
 	bool "TI OMAP2"
 	depends on ARCH_OMAP2PLUS
 	default y
 	select CPU_V6
 	select MULTI_IRQ_HANDLER
+	select SOC_HAS_OMAP2_SDRC

 config ARCH_OMAP3
 	bool "TI OMAP3"
@@ -39,6 +43,7 @@ config ARCH_OMAP3
 	select PM_OPP if PM
 	select ARM_CPU_SUSPEND if PM
 	select MULTI_IRQ_HANDLER
+	select SOC_HAS_OMAP2_SDRC

 config ARCH_OMAP4
 	bool "TI OMAP4"
@@ -66,16 +71,19 @@ config SOC_OMAP2420
 	depends on ARCH_OMAP2
 	default y
 	select OMAP_DM_TIMER
+	select SOC_HAS_OMAP2_SDRC

 config SOC_OMAP2430
 	bool "OMAP2430 support"
 	depends on ARCH_OMAP2
 	default y
+	select SOC_HAS_OMAP2_SDRC

 config SOC_OMAP3430
 	bool "OMAP3430 support"
 	depends on ARCH_OMAP3
 	default y
+	select SOC_HAS_OMAP2_SDRC

 config SOC_TI81XX
 	bool "TI81XX support"
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e5c17d3..3767164 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -6,7 +6,7 @@
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
 	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o

-omap-2-3-common				= irq.o sdrc.o
+omap-2-3-common				= irq.o
 hwmod-common				= omap_hwmod.o \
 					  omap_hwmod_common_data.o
 clock-common				= clock.o clock_common_data.o \
@@ -23,6 +23,7 @@ obj-y += mcbsp.o
 endif

 obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
+obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o

 # SMP support ONLY available for OMAP4

diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 8a6953a..7978e5e 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -29,8 +29,6 @@

 /* Global address base setup code */

-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-
 static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
 {
 	omap2_set_globals_tap(omap2_globals);
@@ -39,8 +37,6 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
 	omap2_set_globals_prcm(omap2_globals);
 }

-#endif
-
 #if defined(CONFIG_SOC_OMAP2420)

 static struct omap_globals omap242x_globals = {
@@ -171,9 +167,7 @@ static struct omap_globals omap4_globals = {

 void __init omap2_set_globals_443x(void)
 {
-	omap2_set_globals_tap(&omap4_globals);
-	omap2_set_globals_control(&omap4_globals);
-	omap2_set_globals_prcm(&omap4_globals);
+	__omap2_set_globals(&omap4_globals);
 }

 void __init omap4_map_io(void)
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 5d99c1b..404f172 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -174,7 +174,12 @@ void omap2_set_globals_am33xx(void);

 /* These get called from omap2_set_globals_xxxx(), do not call these */
 void omap2_set_globals_tap(struct omap_globals *);
+#if defined(CONFIG_SOC_HAS_OMAP2_SDRC)
 void omap2_set_globals_sdrc(struct omap_globals *);
+#else
+static inline void omap2_set_globals_sdrc(struct omap_globals *omap2_globals)
+{ }
+#endif
 void omap2_set_globals_control(struct omap_globals *);
 void omap2_set_globals_prcm(struct omap_globals *);

--
1.7.0.4

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Vaibhav Hiremath]

The function __omap2_set_globals() can be common across all
platforms/architectures, even in case of omap4, internally it
calls same set of functions as in __omap2_set_globals() function
(except for sdrc).
This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
so that we can reuse same function across omap2/3/4...

Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Kevin Hilman <khilman@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>

Changes from V1:
	- Added Makefile rule to build sdrc.c file for new
	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
---
 arch/arm/mach-omap2/Kconfig  |    8 ++++++++
 arch/arm/mach-omap2/Makefile |    3 ++-
 arch/arm/mach-omap2/common.c |    8 +-------
 arch/arm/mach-omap2/common.h |    5 +++++
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 208b950..82d9d18 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
 	help
 	  Compile a kernel suitable for booting most boards

+config SOC_HAS_OMAP2_SDRC
+	bool "OMAP2 SDRAM Controller support"
+
 config ARCH_OMAP2
 	bool "TI OMAP2"
 	depends on ARCH_OMAP2PLUS
 	default y
 	select CPU_V6
 	select MULTI_IRQ_HANDLER
+	select SOC_HAS_OMAP2_SDRC

 config ARCH_OMAP3
 	bool "TI OMAP3"
@@ -39,6 +43,7 @@ config ARCH_OMAP3
 	select PM_OPP if PM
 	select ARM_CPU_SUSPEND if PM
 	select MULTI_IRQ_HANDLER
+	select SOC_HAS_OMAP2_SDRC

 config ARCH_OMAP4
 	bool "TI OMAP4"
@@ -66,16 +71,19 @@ config SOC_OMAP2420
 	depends on ARCH_OMAP2
 	default y
 	select OMAP_DM_TIMER
+	select SOC_HAS_OMAP2_SDRC

 config SOC_OMAP2430
 	bool "OMAP2430 support"
 	depends on ARCH_OMAP2
 	default y
+	select SOC_HAS_OMAP2_SDRC

 config SOC_OMAP3430
 	bool "OMAP3430 support"
 	depends on ARCH_OMAP3
 	default y
+	select SOC_HAS_OMAP2_SDRC

 config SOC_TI81XX
 	bool "TI81XX support"
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index e5c17d3..3767164 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -6,7 +6,7 @@
 obj-y := id.o io.o control.o mux.o devices.o serial.o gpmc.o timer.o pm.o \
 	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o

-omap-2-3-common				= irq.o sdrc.o
+omap-2-3-common				= irq.o
 hwmod-common				= omap_hwmod.o \
 					  omap_hwmod_common_data.o
 clock-common				= clock.o clock_common_data.o \
@@ -23,6 +23,7 @@ obj-y += mcbsp.o
 endif

 obj-$(CONFIG_TWL4030_CORE) += omap_twl.o
+obj-$(CONFIG_SOC_HAS_OMAP2_SDRC)	+= sdrc.o

 # SMP support ONLY available for OMAP4

diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 8a6953a..7978e5e 100644
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -29,8 +29,6 @@

 /* Global address base setup code */

-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
-
 static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
 {
 	omap2_set_globals_tap(omap2_globals);
@@ -39,8 +37,6 @@ static void __init __omap2_set_globals(struct omap_globals *omap2_globals)
 	omap2_set_globals_prcm(omap2_globals);
 }

-#endif
-
 #if defined(CONFIG_SOC_OMAP2420)

 static struct omap_globals omap242x_globals = {
@@ -171,9 +167,7 @@ static struct omap_globals omap4_globals = {

 void __init omap2_set_globals_443x(void)
 {
-	omap2_set_globals_tap(&omap4_globals);
-	omap2_set_globals_control(&omap4_globals);
-	omap2_set_globals_prcm(&omap4_globals);
+	__omap2_set_globals(&omap4_globals);
 }

 void __init omap4_map_io(void)
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 5d99c1b..404f172 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -174,7 +174,12 @@ void omap2_set_globals_am33xx(void);

 /* These get called from omap2_set_globals_xxxx(), do not call these */
 void omap2_set_globals_tap(struct omap_globals *);
+#if defined(CONFIG_SOC_HAS_OMAP2_SDRC)
 void omap2_set_globals_sdrc(struct omap_globals *);
+#else
+static inline void omap2_set_globals_sdrc(struct omap_globals *omap2_globals)
+{ }
+#endif
 void omap2_set_globals_control(struct omap_globals *);
 void omap2_set_globals_prcm(struct omap_globals *);

--
1.7.0.4

Re: [PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Benoit Cousson]

Hi Vaibhav,

One small comment.

On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> The function __omap2_set_globals() can be common across all
> platforms/architectures, even in case of omap4, internally it
> calls same set of functions as in __omap2_set_globals() function
> (except for sdrc).
> This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> so that we can reuse same function across omap2/3/4...
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
>
> Changes from V1:
> 	- Added Makefile rule to build sdrc.c file for new
> 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> ---
>   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
>   arch/arm/mach-omap2/Makefile |    3 ++-
>   arch/arm/mach-omap2/common.c |    8 +-------
>   arch/arm/mach-omap2/common.h |    5 +++++
>   4 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 208b950..82d9d18 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
>   	help
>   	  Compile a kernel suitable for booting most boards
>
> +config SOC_HAS_OMAP2_SDRC
> +	bool "OMAP2 SDRAM Controller support"
> +
>   config ARCH_OMAP2
>   	bool "TI OMAP2"
>   	depends on ARCH_OMAP2PLUS
>   	default y
>   	select CPU_V6
>   	select MULTI_IRQ_HANDLER
> +	select SOC_HAS_OMAP2_SDRC
>
>   config ARCH_OMAP3
>   	bool "TI OMAP3"
> @@ -39,6 +43,7 @@ config ARCH_OMAP3
>   	select PM_OPP if PM
>   	select ARM_CPU_SUSPEND if PM
>   	select MULTI_IRQ_HANDLER
> +	select SOC_HAS_OMAP2_SDRC
>
>   config ARCH_OMAP4
>   	bool "TI OMAP4"
> @@ -66,16 +71,19 @@ config SOC_OMAP2420
>   	depends on ARCH_OMAP2
>   	default y
>   	select OMAP_DM_TIMER
> +	select SOC_HAS_OMAP2_SDRC

OMAP4 does not have the SDRC but the EMIF like TI8XX.

Regards,
Benoit

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Benoit Cousson]

Hi Vaibhav,

One small comment.

On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> The function __omap2_set_globals() can be common across all
> platforms/architectures, even in case of omap4, internally it
> calls same set of functions as in __omap2_set_globals() function
> (except for sdrc).
> This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> so that we can reuse same function across omap2/3/4...
>
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
>
> Changes from V1:
> 	- Added Makefile rule to build sdrc.c file for new
> 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> ---
>   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
>   arch/arm/mach-omap2/Makefile |    3 ++-
>   arch/arm/mach-omap2/common.c |    8 +-------
>   arch/arm/mach-omap2/common.h |    5 +++++
>   4 files changed, 16 insertions(+), 8 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 208b950..82d9d18 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
>   	help
>   	  Compile a kernel suitable for booting most boards
>
> +config SOC_HAS_OMAP2_SDRC
> +	bool "OMAP2 SDRAM Controller support"
> +
>   config ARCH_OMAP2
>   	bool "TI OMAP2"
>   	depends on ARCH_OMAP2PLUS
>   	default y
>   	select CPU_V6
>   	select MULTI_IRQ_HANDLER
> +	select SOC_HAS_OMAP2_SDRC
>
>   config ARCH_OMAP3
>   	bool "TI OMAP3"
> @@ -39,6 +43,7 @@ config ARCH_OMAP3
>   	select PM_OPP if PM
>   	select ARM_CPU_SUSPEND if PM
>   	select MULTI_IRQ_HANDLER
> +	select SOC_HAS_OMAP2_SDRC
>
>   config ARCH_OMAP4
>   	bool "TI OMAP4"
> @@ -66,16 +71,19 @@ config SOC_OMAP2420
>   	depends on ARCH_OMAP2
>   	default y
>   	select OMAP_DM_TIMER
> +	select SOC_HAS_OMAP2_SDRC

OMAP4 does not have the SDRC but the EMIF like TI8XX.

Regards,
Benoit

RE: [PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Hiremath, Vaibhav]

On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> Hi Vaibhav,
> 
> One small comment.
> 
> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> > The function __omap2_set_globals() can be common across all
> > platforms/architectures, even in case of omap4, internally it
> > calls same set of functions as in __omap2_set_globals() function
> > (except for sdrc).
> > This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> > so that we can reuse same function across omap2/3/4...
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> >
> > Changes from V1:
> > 	- Added Makefile rule to build sdrc.c file for new
> > 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> > ---
> >   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
> >   arch/arm/mach-omap2/Makefile |    3 ++-
> >   arch/arm/mach-omap2/common.c |    8 +-------
> >   arch/arm/mach-omap2/common.h |    5 +++++
> >   4 files changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 208b950..82d9d18 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
> >   	help
> >   	  Compile a kernel suitable for booting most boards
> >
> > +config SOC_HAS_OMAP2_SDRC
> > +	bool "OMAP2 SDRAM Controller support"
> > +
> >   config ARCH_OMAP2
> >   	bool "TI OMAP2"
> >   	depends on ARCH_OMAP2PLUS
> >   	default y
> >   	select CPU_V6
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP3
> >   	bool "TI OMAP3"
> > @@ -39,6 +43,7 @@ config ARCH_OMAP3
> >   	select PM_OPP if PM
> >   	select ARM_CPU_SUSPEND if PM
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP4
> >   	bool "TI OMAP4"
> > @@ -66,16 +71,19 @@ config SOC_OMAP2420
> >   	depends on ARCH_OMAP2
> >   	default y
> >   	select OMAP_DM_TIMER
> > +	select SOC_HAS_OMAP2_SDRC
> 
> OMAP4 does not have the SDRC but the EMIF like TI8XX.
> 

Good catch :) 

Will fix it and send next version shortly.

Thanks,
Vaibhav

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Hiremath, Vaibhav]

On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> Hi Vaibhav,
> 
> One small comment.
> 
> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> > The function __omap2_set_globals() can be common across all
> > platforms/architectures, even in case of omap4, internally it
> > calls same set of functions as in __omap2_set_globals() function
> > (except for sdrc).
> > This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> > so that we can reuse same function across omap2/3/4...
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> >
> > Changes from V1:
> > 	- Added Makefile rule to build sdrc.c file for new
> > 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> > ---
> >   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
> >   arch/arm/mach-omap2/Makefile |    3 ++-
> >   arch/arm/mach-omap2/common.c |    8 +-------
> >   arch/arm/mach-omap2/common.h |    5 +++++
> >   4 files changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 208b950..82d9d18 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
> >   	help
> >   	  Compile a kernel suitable for booting most boards
> >
> > +config SOC_HAS_OMAP2_SDRC
> > +	bool "OMAP2 SDRAM Controller support"
> > +
> >   config ARCH_OMAP2
> >   	bool "TI OMAP2"
> >   	depends on ARCH_OMAP2PLUS
> >   	default y
> >   	select CPU_V6
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP3
> >   	bool "TI OMAP3"
> > @@ -39,6 +43,7 @@ config ARCH_OMAP3
> >   	select PM_OPP if PM
> >   	select ARM_CPU_SUSPEND if PM
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP4
> >   	bool "TI OMAP4"
> > @@ -66,16 +71,19 @@ config SOC_OMAP2420
> >   	depends on ARCH_OMAP2
> >   	default y
> >   	select OMAP_DM_TIMER
> > +	select SOC_HAS_OMAP2_SDRC
> 
> OMAP4 does not have the SDRC but the EMIF like TI8XX.
> 

Good catch :) 

Will fix it and send next version shortly.

Thanks,
Vaibhav

RE: [PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Hiremath, Vaibhav]

On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> Hi Vaibhav,
> 
> One small comment.
> 
> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> > The function __omap2_set_globals() can be common across all
> > platforms/architectures, even in case of omap4, internally it
> > calls same set of functions as in __omap2_set_globals() function
> > (except for sdrc).
> > This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> > so that we can reuse same function across omap2/3/4...
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> >
> > Changes from V1:
> > 	- Added Makefile rule to build sdrc.c file for new
> > 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> > ---
> >   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
> >   arch/arm/mach-omap2/Makefile |    3 ++-
> >   arch/arm/mach-omap2/common.c |    8 +-------
> >   arch/arm/mach-omap2/common.h |    5 +++++
> >   4 files changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 208b950..82d9d18 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
> >   	help
> >   	  Compile a kernel suitable for booting most boards
> >
> > +config SOC_HAS_OMAP2_SDRC
> > +	bool "OMAP2 SDRAM Controller support"
> > +
> >   config ARCH_OMAP2
> >   	bool "TI OMAP2"
> >   	depends on ARCH_OMAP2PLUS
> >   	default y
> >   	select CPU_V6
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP3
> >   	bool "TI OMAP3"
> > @@ -39,6 +43,7 @@ config ARCH_OMAP3
> >   	select PM_OPP if PM
> >   	select ARM_CPU_SUSPEND if PM
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP4
> >   	bool "TI OMAP4"
> > @@ -66,16 +71,19 @@ config SOC_OMAP2420
> >   	depends on ARCH_OMAP2
> >   	default y
> >   	select OMAP_DM_TIMER
> > +	select SOC_HAS_OMAP2_SDRC
> 
> OMAP4 does not have the SDRC but the EMIF like TI8XX.
> 

Benoit,

This selection is happening for SOC_OMAP2420 and not for OMAP4.

Thanks,
Vaibhav

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Hiremath, Vaibhav]

On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> Hi Vaibhav,
> 
> One small comment.
> 
> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
> > The function __omap2_set_globals() can be common across all
> > platforms/architectures, even in case of omap4, internally it
> > calls same set of functions as in __omap2_set_globals() function
> > (except for sdrc).
> > This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
> > so that we can reuse same function across omap2/3/4...
> >
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> >
> > Changes from V1:
> > 	- Added Makefile rule to build sdrc.c file for new
> > 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
> > ---
> >   arch/arm/mach-omap2/Kconfig  |    8 ++++++++
> >   arch/arm/mach-omap2/Makefile |    3 ++-
> >   arch/arm/mach-omap2/common.c |    8 +-------
> >   arch/arm/mach-omap2/common.h |    5 +++++
> >   4 files changed, 16 insertions(+), 8 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> > index 208b950..82d9d18 100644
> > --- a/arch/arm/mach-omap2/Kconfig
> > +++ b/arch/arm/mach-omap2/Kconfig
> > @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
> >   	help
> >   	  Compile a kernel suitable for booting most boards
> >
> > +config SOC_HAS_OMAP2_SDRC
> > +	bool "OMAP2 SDRAM Controller support"
> > +
> >   config ARCH_OMAP2
> >   	bool "TI OMAP2"
> >   	depends on ARCH_OMAP2PLUS
> >   	default y
> >   	select CPU_V6
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP3
> >   	bool "TI OMAP3"
> > @@ -39,6 +43,7 @@ config ARCH_OMAP3
> >   	select PM_OPP if PM
> >   	select ARM_CPU_SUSPEND if PM
> >   	select MULTI_IRQ_HANDLER
> > +	select SOC_HAS_OMAP2_SDRC
> >
> >   config ARCH_OMAP4
> >   	bool "TI OMAP4"
> > @@ -66,16 +71,19 @@ config SOC_OMAP2420
> >   	depends on ARCH_OMAP2
> >   	default y
> >   	select OMAP_DM_TIMER
> > +	select SOC_HAS_OMAP2_SDRC
> 
> OMAP4 does not have the SDRC but the EMIF like TI8XX.
> 

Benoit,

This selection is happening for SOC_OMAP2420 and not for OMAP4.

Thanks,
Vaibhav

Re: [PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Benoit Cousson]

On 06/28/2012 05:39 PM, Hiremath, Vaibhav wrote:
> On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
>> Hi Vaibhav,
>>
>> One small comment.
>>
>> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
>>> The function __omap2_set_globals() can be common across all
>>> platforms/architectures, even in case of omap4, internally it
>>> calls same set of functions as in __omap2_set_globals() function
>>> (except for sdrc).
>>> This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
>>> so that we can reuse same function across omap2/3/4...
>>>
>>> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
>>> Cc: Tony Lindgren <tony@atomide.com>
>>> Cc: Kevin Hilman <khilman@ti.com>
>>> Cc: Paul Walmsley <paul@pwsan.com>
>>>
>>> Changes from V1:
>>> 	- Added Makefile rule to build sdrc.c file for new
>>> 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
>>> ---
>>>    arch/arm/mach-omap2/Kconfig  |    8 ++++++++
>>>    arch/arm/mach-omap2/Makefile |    3 ++-
>>>    arch/arm/mach-omap2/common.c |    8 +-------
>>>    arch/arm/mach-omap2/common.h |    5 +++++
>>>    4 files changed, 16 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
>>> index 208b950..82d9d18 100644
>>> --- a/arch/arm/mach-omap2/Kconfig
>>> +++ b/arch/arm/mach-omap2/Kconfig
>>> @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
>>>    	help
>>>    	  Compile a kernel suitable for booting most boards
>>>
>>> +config SOC_HAS_OMAP2_SDRC
>>> +	bool "OMAP2 SDRAM Controller support"
>>> +
>>>    config ARCH_OMAP2
>>>    	bool "TI OMAP2"
>>>    	depends on ARCH_OMAP2PLUS
>>>    	default y
>>>    	select CPU_V6
>>>    	select MULTI_IRQ_HANDLER
>>> +	select SOC_HAS_OMAP2_SDRC
>>>
>>>    config ARCH_OMAP3
>>>    	bool "TI OMAP3"
>>> @@ -39,6 +43,7 @@ config ARCH_OMAP3
>>>    	select PM_OPP if PM
>>>    	select ARM_CPU_SUSPEND if PM
>>>    	select MULTI_IRQ_HANDLER
>>> +	select SOC_HAS_OMAP2_SDRC
>>>
>>>    config ARCH_OMAP4
>>>    	bool "TI OMAP4"
>>> @@ -66,16 +71,19 @@ config SOC_OMAP2420
>>>    	depends on ARCH_OMAP2
>>>    	default y
>>>    	select OMAP_DM_TIMER
>>> +	select SOC_HAS_OMAP2_SDRC
>>
>> OMAP4 does not have the SDRC but the EMIF like TI8XX.
>>
>
> Benoit,
>
> This selection is happening for SOC_OMAP2420 and not for OMAP4.

Hehe, indeed, I missed the context and was fooled by the config ARCH_OMAP4.

I don't have any comment then :-)

Benoit

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Benoit Cousson]

On 06/28/2012 05:39 PM, Hiremath, Vaibhav wrote:
> On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
>> Hi Vaibhav,
>>
>> One small comment.
>>
>> On 06/28/2012 04:59 PM, Vaibhav Hiremath wrote:
>>> The function __omap2_set_globals() can be common across all
>>> platforms/architectures, even in case of omap4, internally it
>>> calls same set of functions as in __omap2_set_globals() function
>>> (except for sdrc).
>>> This patch adds new config flag SOC_HAS_OMAP2_SDRC to handle sdrc,
>>> so that we can reuse same function across omap2/3/4...
>>>
>>> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
>>> Cc: Tony Lindgren <tony@atomide.com>
>>> Cc: Kevin Hilman <khilman@ti.com>
>>> Cc: Paul Walmsley <paul@pwsan.com>
>>>
>>> Changes from V1:
>>> 	- Added Makefile rule to build sdrc.c file for new
>>> 	  option SOC_HAS_OMAP2_SDRC (as per Kevin's comment).
>>> ---
>>>    arch/arm/mach-omap2/Kconfig  |    8 ++++++++
>>>    arch/arm/mach-omap2/Makefile |    3 ++-
>>>    arch/arm/mach-omap2/common.c |    8 +-------
>>>    arch/arm/mach-omap2/common.h |    5 +++++
>>>    4 files changed, 16 insertions(+), 8 deletions(-)
>>>
>>> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
>>> index 208b950..82d9d18 100644
>>> --- a/arch/arm/mach-omap2/Kconfig
>>> +++ b/arch/arm/mach-omap2/Kconfig
>>> @@ -21,12 +21,16 @@ config ARCH_OMAP2PLUS_TYPICAL
>>>    	help
>>>    	  Compile a kernel suitable for booting most boards
>>>
>>> +config SOC_HAS_OMAP2_SDRC
>>> +	bool "OMAP2 SDRAM Controller support"
>>> +
>>>    config ARCH_OMAP2
>>>    	bool "TI OMAP2"
>>>    	depends on ARCH_OMAP2PLUS
>>>    	default y
>>>    	select CPU_V6
>>>    	select MULTI_IRQ_HANDLER
>>> +	select SOC_HAS_OMAP2_SDRC
>>>
>>>    config ARCH_OMAP3
>>>    	bool "TI OMAP3"
>>> @@ -39,6 +43,7 @@ config ARCH_OMAP3
>>>    	select PM_OPP if PM
>>>    	select ARM_CPU_SUSPEND if PM
>>>    	select MULTI_IRQ_HANDLER
>>> +	select SOC_HAS_OMAP2_SDRC
>>>
>>>    config ARCH_OMAP4
>>>    	bool "TI OMAP4"
>>> @@ -66,16 +71,19 @@ config SOC_OMAP2420
>>>    	depends on ARCH_OMAP2
>>>    	default y
>>>    	select OMAP_DM_TIMER
>>> +	select SOC_HAS_OMAP2_SDRC
>>
>> OMAP4 does not have the SDRC but the EMIF like TI8XX.
>>
>
> Benoit,
>
> This selection is happening for SOC_OMAP2420 and not for OMAP4.

Hehe, indeed, I missed the context and was fooled by the config ARCH_OMAP4.

I don't have any comment then :-)

Benoit

Re: [PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Tony Lindgren]

* Benoit Cousson <b-cousson@ti.com> [120628 08:46]:
> On 06/28/2012 05:39 PM, Hiremath, Vaibhav wrote:
> >On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> >>
> >>OMAP4 does not have the SDRC but the EMIF like TI8XX.
> >>
> >
> >Benoit,
> >
> >This selection is happening for SOC_OMAP2420 and not for OMAP4.
> 
> Hehe, indeed, I missed the context and was fooled by the config ARCH_OMAP4.
> 
> I don't have any comment then :-)

That's very close to Acked-by then?

Tony

[PATCH-V3 3/3] ARM: OMAP2+: CLEANUP: Remove unnecessary ifdef around __omap2_set_globals

[Tony Lindgren]

* Benoit Cousson <b-cousson@ti.com> [120628 08:46]:
> On 06/28/2012 05:39 PM, Hiremath, Vaibhav wrote:
> >On Thu, Jun 28, 2012 at 20:35:38, Cousson, Benoit wrote:
> >>
> >>OMAP4 does not have the SDRC but the EMIF like TI8XX.
> >>
> >
> >Benoit,
> >
> >This selection is happening for SOC_OMAP2420 and not for OMAP4.
> 
> Hehe, indeed, I missed the context and was fooled by the config ARCH_OMAP4.
> 
> I don't have any comment then :-)

That's very close to Acked-by then?

Tony

Re: [PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Tony Lindgren]

Hi

Applying these, but few comments below to make my life easier..

* Vaibhav Hiremath <hvaibhav@ti.com> [120628 08:04]:
> All OMAP2PLUS based devices, builds omap-device.o target;
> so just add one entry so that there is no need to patch this file
> for any future OMAP2+ devices.
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> 
> NOTE: No code change from last version.

Extra comments like this should be within the --- sections so they
down't show up when applying the patch. Otherwise I have to manually
edit every patch, which sucks.

Then, I'm leaving out the CLEANUP part in $Subject, that alone is not
a reason to patch anything. The description should say why the patch
is needed, which it does. If you want to specify that this should be
grouped in the clean-up branch, then that too could be mentioned within
the --- sections.

> ---
>  arch/arm/plat-omap/Makefile |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> index 6d87532..961bf85 100644
> --- a/arch/arm/plat-omap/Makefile
> +++ b/arch/arm/plat-omap/Makefile
> @@ -10,9 +10,7 @@ obj-n :=
>  obj-  :=
> 
>  # omap_device support (OMAP2+ only at the moment)
> -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
> -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
> -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
> +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o
> 
>  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
>  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
> --
> 1.7.0.4
> 

This patch did not apply for some reason, I got:

patching file arch/arm/plat-omap/Makefile
patch: **** malformed patch at line 73: 1.7.0.4

So please tune up your scripts a bit to the patches can be applied
as they are without manual editing ;)

Thanks,

Tony

[PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Tony Lindgren]

Hi

Applying these, but few comments below to make my life easier..

* Vaibhav Hiremath <hvaibhav@ti.com> [120628 08:04]:
> All OMAP2PLUS based devices, builds omap-device.o target;
> so just add one entry so that there is no need to patch this file
> for any future OMAP2+ devices.
> 
> Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: Kevin Hilman <khilman@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> 
> NOTE: No code change from last version.

Extra comments like this should be within the --- sections so they
down't show up when applying the patch. Otherwise I have to manually
edit every patch, which sucks.

Then, I'm leaving out the CLEANUP part in $Subject, that alone is not
a reason to patch anything. The description should say why the patch
is needed, which it does. If you want to specify that this should be
grouped in the clean-up branch, then that too could be mentioned within
the --- sections.

> ---
>  arch/arm/plat-omap/Makefile |    4 +---
>  1 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> index 6d87532..961bf85 100644
> --- a/arch/arm/plat-omap/Makefile
> +++ b/arch/arm/plat-omap/Makefile
> @@ -10,9 +10,7 @@ obj-n :=
>  obj-  :=
> 
>  # omap_device support (OMAP2+ only at the moment)
> -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
> -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
> -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
> +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o
> 
>  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
>  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
> --
> 1.7.0.4
> 

This patch did not apply for some reason, I got:

patching file arch/arm/plat-omap/Makefile
patch: **** malformed patch at line 73: 1.7.0.4

So please tune up your scripts a bit to the patches can be applied
as they are without manual editing ;)

Thanks,

Tony

RE: [PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Hiremath, Vaibhav]

On Wed, Jul 04, 2012 at 12:57:58, Tony Lindgren wrote:
> Hi
> 
> Applying these, but few comments below to make my life easier..
> 
> * Vaibhav Hiremath <hvaibhav@ti.com> [120628 08:04]:
> > All OMAP2PLUS based devices, builds omap-device.o target;
> > so just add one entry so that there is no need to patch this file
> > for any future OMAP2+ devices.
> > 
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > 
> > NOTE: No code change from last version.
> 
> Extra comments like this should be within the --- sections so they
> down't show up when applying the patch. Otherwise I have to manually
> edit every patch, which sucks.
> 

Oops...my bad.

These comments I keep deliberately after signoff so that I can move it
after --- section while submitting, but somehow missed to do it for this 
patch-series.
I will take care of it in the future, sorry for inconvenience.


> Then, I'm leaving out the CLEANUP part in $Subject, that alone is not
> a reason to patch anything. The description should say why the patch
> is needed, which it does. If you want to specify that this should be
> grouped in the clean-up branch, then that too could be mentioned within
> the --- sections.
> 

Point taken, and will follow now.

> > ---
> >  arch/arm/plat-omap/Makefile |    4 +---
> >  1 files changed, 1 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> > index 6d87532..961bf85 100644
> > --- a/arch/arm/plat-omap/Makefile
> > +++ b/arch/arm/plat-omap/Makefile
> > @@ -10,9 +10,7 @@ obj-n :=
> >  obj-  :=
> > 
> >  # omap_device support (OMAP2+ only at the moment)
> > -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
> > -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
> > -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
> > +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o
> > 
> >  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
> >  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
> > --
> > 1.7.0.4
> > 
> 
> This patch did not apply for some reason, I got:
> 
> patching file arch/arm/plat-omap/Makefile
> patch: **** malformed patch at line 73: 1.7.0.4
> 
> So please tune up your scripts a bit to the patches can be applied
> as they are without manual editing ;)
> 

Hmmmm...

I usually submit the patch against linux-omap/master (to handle cross 
dependencies), which in some cases fails on other branches you maintain. 
Probably I will make sure that it allies atleast to relevant branches, for 
example, in this case it should be applied on linux-omap/cleanup branch as 
well. 

Thanks,
Vaibhav

[PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Hiremath, Vaibhav]

On Wed, Jul 04, 2012 at 12:57:58, Tony Lindgren wrote:
> Hi
> 
> Applying these, but few comments below to make my life easier..
> 
> * Vaibhav Hiremath <hvaibhav@ti.com> [120628 08:04]:
> > All OMAP2PLUS based devices, builds omap-device.o target;
> > so just add one entry so that there is no need to patch this file
> > for any future OMAP2+ devices.
> > 
> > Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com>
> > Cc: Tony Lindgren <tony@atomide.com>
> > Cc: Kevin Hilman <khilman@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > 
> > NOTE: No code change from last version.
> 
> Extra comments like this should be within the --- sections so they
> down't show up when applying the patch. Otherwise I have to manually
> edit every patch, which sucks.
> 

Oops...my bad.

These comments I keep deliberately after signoff so that I can move it
after --- section while submitting, but somehow missed to do it for this 
patch-series.
I will take care of it in the future, sorry for inconvenience.


> Then, I'm leaving out the CLEANUP part in $Subject, that alone is not
> a reason to patch anything. The description should say why the patch
> is needed, which it does. If you want to specify that this should be
> grouped in the clean-up branch, then that too could be mentioned within
> the --- sections.
> 

Point taken, and will follow now.

> > ---
> >  arch/arm/plat-omap/Makefile |    4 +---
> >  1 files changed, 1 insertions(+), 3 deletions(-)
> > 
> > diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> > index 6d87532..961bf85 100644
> > --- a/arch/arm/plat-omap/Makefile
> > +++ b/arch/arm/plat-omap/Makefile
> > @@ -10,9 +10,7 @@ obj-n :=
> >  obj-  :=
> > 
> >  # omap_device support (OMAP2+ only at the moment)
> > -obj-$(CONFIG_ARCH_OMAP2) += omap_device.o
> > -obj-$(CONFIG_ARCH_OMAP3) += omap_device.o
> > -obj-$(CONFIG_ARCH_OMAP4) += omap_device.o
> > +obj-$(CONFIG_ARCH_OMAP2PLUS) += omap_device.o
> > 
> >  obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
> >  obj-$(CONFIG_OMAP_DEBUG_DEVICES) += debug-devices.o
> > --
> > 1.7.0.4
> > 
> 
> This patch did not apply for some reason, I got:
> 
> patching file arch/arm/plat-omap/Makefile
> patch: **** malformed patch at line 73: 1.7.0.4
> 
> So please tune up your scripts a bit to the patches can be applied
> as they are without manual editing ;)
> 

Hmmmm...

I usually submit the patch against linux-omap/master (to handle cross 
dependencies), which in some cases fails on other branches you maintain. 
Probably I will make sure that it allies atleast to relevant branches, for 
example, in this case it should be applied on linux-omap/cleanup branch as 
well. 

Thanks,
Vaibhav

Re: [PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Tony Lindgren]

* Hiremath, Vaibhav <hvaibhav@ti.com> [120704 02:21]:
> On Wed, Jul 04, 2012 at 12:57:58, Tony Lindgren wrote:
> >
> > This patch did not apply for some reason, I got:
> > 
> > patching file arch/arm/plat-omap/Makefile
> > patch: **** malformed patch at line 73: 1.7.0.4
> > 
> > So please tune up your scripts a bit to the patches can be applied
> > as they are without manual editing ;)
> > 
> 
> Hmmmm...
> 
> I usually submit the patch against linux-omap/master (to handle cross 
> dependencies), which in some cases fails on other branches you maintain. 
> Probably I will make sure that it allies atleast to relevant branches, for 
> example, in this case it should be applied on linux-omap/cleanup branch as 
> well. 

The malformed patch error usually means that something messed up
the patch, like the mail server.. Maybe tabs got replaced with spaces
or something?

Tony

[PATCH-V3 1/3] ARM: OMAP2+: CLEANUP: All OMAP2PLUS uses omap-device.o target so add one entry

[Tony Lindgren]

* Hiremath, Vaibhav <hvaibhav@ti.com> [120704 02:21]:
> On Wed, Jul 04, 2012 at 12:57:58, Tony Lindgren wrote:
> >
> > This patch did not apply for some reason, I got:
> > 
> > patching file arch/arm/plat-omap/Makefile
> > patch: **** malformed patch at line 73: 1.7.0.4
> > 
> > So please tune up your scripts a bit to the patches can be applied
> > as they are without manual editing ;)
> > 
> 
> Hmmmm...
> 
> I usually submit the patch against linux-omap/master (to handle cross 
> dependencies), which in some cases fails on other branches you maintain. 
> Probably I will make sure that it allies atleast to relevant branches, for 
> example, in this case it should be applied on linux-omap/cleanup branch as 
> well. 

The malformed patch error usually means that something messed up
the patch, like the mail server.. Maybe tabs got replaced with spaces
or something?

Tony