* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-omap
Cc: khilman, tony, linux-arm-kernel, Santosh Shilimkar, Paul Walmsley
struct clockdomain member clktrctrl_mask is available for only for OMAP2
and OMAP3 architectures. Technially it is also used only for these archs
but this breaks the build with custom OMAP4 configuration.
CC arch/arm/mach-omap2/clockdomain.o
arch/arm/mach-omap2/clockdomain.c: In function '_enable_hwsup':
arch/arm/mach-omap2/clockdomain.c:251: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:254: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function '_disable_hwsup':
arch/arm/mach-omap2/clockdomain.c:277: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:280: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_sleep':
arch/arm/mach-omap2/clockdomain.c:744: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_wakeup':
arch/arm/mach-omap2/clockdomain.c:789: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_enable':
arch/arm/mach-omap2/clockdomain.c:922: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:926: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_disable':
arch/arm/mach-omap2/clockdomain.c:994: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:998: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
Fix the build break by dropping the #ifdef as suggested by Paul Walmsley
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/clockdomain.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
index de3faa2..9b459c2 100644
--- a/arch/arm/mach-omap2/clockdomain.h
+++ b/arch/arm/mach-omap2/clockdomain.h
@@ -103,9 +103,7 @@ struct clockdomain {
const char *name;
struct powerdomain *ptr;
} pwrdm;
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
const u16 clktrctrl_mask;
-#endif
const u8 flags;
const u8 dep_bit;
const u8 prcm_partition;
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-arm-kernel
struct clockdomain member clktrctrl_mask is available for only for OMAP2
and OMAP3 architectures. Technially it is also used only for these archs
but this breaks the build with custom OMAP4 configuration.
CC arch/arm/mach-omap2/clockdomain.o
arch/arm/mach-omap2/clockdomain.c: In function '_enable_hwsup':
arch/arm/mach-omap2/clockdomain.c:251: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:254: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function '_disable_hwsup':
arch/arm/mach-omap2/clockdomain.c:277: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:280: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_sleep':
arch/arm/mach-omap2/clockdomain.c:744: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_wakeup':
arch/arm/mach-omap2/clockdomain.c:789: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_enable':
arch/arm/mach-omap2/clockdomain.c:922: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:926: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c: In function 'omap2_clkdm_clk_disable':
arch/arm/mach-omap2/clockdomain.c:994: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
arch/arm/mach-omap2/clockdomain.c:998: error: 'struct clockdomain' has no member named 'clktrctrl_mask'
make[1]: *** [arch/arm/mach-omap2/clockdomain.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
Fix the build break by dropping the #ifdef as suggested by Paul Walmsley
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/clockdomain.h | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
index de3faa2..9b459c2 100644
--- a/arch/arm/mach-omap2/clockdomain.h
+++ b/arch/arm/mach-omap2/clockdomain.h
@@ -103,9 +103,7 @@ struct clockdomain {
const char *name;
struct powerdomain *ptr;
} pwrdm;
-#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3)
const u16 clktrctrl_mask;
-#endif
const u8 flags;
const u8 dep_bit;
const u8 prcm_partition;
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 10:57 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-omap
Cc: khilman, tony, linux-arm-kernel, Santosh Shilimkar, Paul Walmsley
omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
selected. This is because common files make references to the functions
which are defined only for omap2xxx and omap3xxx.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store':
arch/arm/mach-omap2/pm-debug.c:335: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump':
arch/arm/mach-omap2/pm-debug.c:121: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:123: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:124: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:125: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset':
arch/arm/mach-omap2/prcm.c:106: undefined reference to `omap2_prm_set_mod_reg_bits'
arch/arm/mach-omap2/prcm.c:108: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources':
arch/arm/mach-omap2/prcm.c:53: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps':
arch/arm/mach-omap2/clockdomain.c:545: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep':
arch/arm/mach-omap2/clockdomain.c:475: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep':
arch/arm/mach-omap2/clockdomain.c:511: undefined reference to `omap2_prm_read_mod_bits_shift'
arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep':
arch/arm/mach-omap2/clockdomain.c:440: undefined reference to `omap2_prm_set_mod_reg_bits'
make: *** [.tmp_vmlinux1] Error 1
This patch adds stubs for these functions so that build continues to work.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index 53d44f6..843f329 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -228,7 +228,67 @@
#ifndef __ASSEMBLER__
-
+/*
+ * Stub omap2xxx/omap3xxx functions so that common files
+ * continue to build when custom builds are used
+ */
+#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
+ defined(CONFIG_ARCH_OMAP3))
+static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+}
+static inline u32 omap2_prm_rmw_mod_reg_bits(u32 mask, u32 bits,
+ s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+#else
/* Power/reset management domain register get/set */
extern u32 omap2_prm_read_mod_reg(s16 module, u16 idx);
extern void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx);
@@ -242,6 +302,7 @@ extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);
extern int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);
extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift);
+#endif /* CONFIG_ARCH_OMAP4 */
#endif
/*
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-arm-kernel
omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
selected. This is because common files make references to the functions
which are defined only for omap2xxx and omap3xxx.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store':
arch/arm/mach-omap2/pm-debug.c:335: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump':
arch/arm/mach-omap2/pm-debug.c:121: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:123: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:124: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:125: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset':
arch/arm/mach-omap2/prcm.c:106: undefined reference to `omap2_prm_set_mod_reg_bits'
arch/arm/mach-omap2/prcm.c:108: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources':
arch/arm/mach-omap2/prcm.c:53: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps':
arch/arm/mach-omap2/clockdomain.c:545: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep':
arch/arm/mach-omap2/clockdomain.c:475: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep':
arch/arm/mach-omap2/clockdomain.c:511: undefined reference to `omap2_prm_read_mod_bits_shift'
arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep':
arch/arm/mach-omap2/clockdomain.c:440: undefined reference to `omap2_prm_set_mod_reg_bits'
make: *** [.tmp_vmlinux1] Error 1
This patch adds stubs for these functions so that build continues to work.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index 53d44f6..843f329 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -228,7 +228,67 @@
#ifndef __ASSEMBLER__
-
+/*
+ * Stub omap2xxx/omap3xxx functions so that common files
+ * continue to build when custom builds are used
+ */
+#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
+ defined(CONFIG_ARCH_OMAP3))
+static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+}
+static inline u32 omap2_prm_rmw_mod_reg_bits(u32 mask, u32 bits,
+ s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+#else
/* Power/reset management domain register get/set */
extern u32 omap2_prm_read_mod_reg(s16 module, u16 idx);
extern void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx);
@@ -242,6 +302,7 @@ extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);
extern int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);
extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift);
+#endif /* CONFIG_ARCH_OMAP4 */
#endif
/*
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 3/5] omap2plus: voltage: Trivial warning fix 'no return statement'
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 10:57 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-omap
Cc: khilman, tony, linux-arm-kernel, Santosh Shilimkar,
Thara Gopinath, Kevin Hilman, Nishanth Menon
Fix below build warnings
CC arch/arm/mach-omap2/common.o
CC arch/arm/mach-omap2/gpio.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/gpio.c:25:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/dma.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/dma.c:32:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/wd_timer.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/wd_timer.c:15:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/prm44xx.o
CC arch/arm/mach-omap2/omap_hwmod.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod.c:145:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/omap_hwmod_common_data.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 0ff1233..9943c66 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -134,7 +134,10 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm,
int omap_voltage_late_init(void);
#else
static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
- struct omap_volt_pmic_info *pmic_info) {}
+ struct omap_volt_pmic_info *pmic_info)
+{
+ return -EINVAL;
+}
static inline void omap_change_voltscale_method(struct voltagedomain *voltdm,
int voltscale_method) {}
static inline int omap_voltage_late_init(void)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 3/5] omap2plus: voltage: Trivial warning fix 'no return statement'
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-arm-kernel
Fix below build warnings
CC arch/arm/mach-omap2/common.o
CC arch/arm/mach-omap2/gpio.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/gpio.c:25:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/dma.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/dma.c:32:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/wd_timer.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/wd_timer.c:15:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/prm44xx.o
CC arch/arm/mach-omap2/omap_hwmod.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod.c:145:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
CC arch/arm/mach-omap2/omap_hwmod_common_data.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_register_pmic':
arch/arm/plat-omap/include/plat/voltage.h:137: warning: no return statement in function returning non-void
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 0ff1233..9943c66 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -134,7 +134,10 @@ void omap_change_voltscale_method(struct voltagedomain *voltdm,
int omap_voltage_late_init(void);
#else
static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
- struct omap_volt_pmic_info *pmic_info) {}
+ struct omap_volt_pmic_info *pmic_info)
+{
+ return -EINVAL;
+}
static inline void omap_change_voltscale_method(struct voltagedomain *voltdm,
int voltscale_method) {}
static inline int omap_voltage_late_init(void)
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 4/5] omap2plus: voltage: Trivial linking fix 'undefined reference'
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 10:57 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-omap
Cc: khilman, tony, linux-arm-kernel, Santosh Shilimkar,
Thara Gopinath, Kevin Hilman, Nishanth Menon
LD init/built-in.o
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `omap2_set_init_voltage':
arch/arm/mach-omap2/pm.c:181: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/built-in.o: In function `omap4_twl_init':
arch/arm/mach-omap2/omap_twl.c:244: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:247: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:250: undefined reference to `omap_voltage_domain_lookup'
make: *** [.tmp_vmlinux1] Error 1
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 9943c66..4b02227 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -65,9 +65,6 @@ struct voltagedomain {
char *name;
};
-/* API to get the voltagedomain pointer */
-struct voltagedomain *omap_voltage_domain_lookup(char *name);
-
/**
* struct omap_volt_data - Omap voltage specific data.
* @voltage_nominal: The possible voltage value in uV
@@ -131,6 +128,9 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm,
struct omap_volt_pmic_info *pmic_info);
void omap_change_voltscale_method(struct voltagedomain *voltdm,
int voltscale_method);
+/* API to get the voltagedomain pointer */
+struct voltagedomain *omap_voltage_domain_lookup(char *name);
+
int omap_voltage_late_init(void);
#else
static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
@@ -144,6 +144,10 @@ static inline int omap_voltage_late_init(void)
{
return -EINVAL;
}
+static inline struct voltagedomain *omap_voltage_domain_lookup(char *name)
+{
+ return ERR_PTR(-EINVAL);
+}
#endif
#endif
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 4/5] omap2plus: voltage: Trivial linking fix 'undefined reference'
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-arm-kernel
LD init/built-in.o
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `omap2_set_init_voltage':
arch/arm/mach-omap2/pm.c:181: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/built-in.o: In function `omap4_twl_init':
arch/arm/mach-omap2/omap_twl.c:244: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:247: undefined reference to `omap_voltage_domain_lookup'
arch/arm/mach-omap2/omap_twl.c:250: undefined reference to `omap_voltage_domain_lookup'
make: *** [.tmp_vmlinux1] Error 1
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 9943c66..4b02227 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -65,9 +65,6 @@ struct voltagedomain {
char *name;
};
-/* API to get the voltagedomain pointer */
-struct voltagedomain *omap_voltage_domain_lookup(char *name);
-
/**
* struct omap_volt_data - Omap voltage specific data.
* @voltage_nominal: The possible voltage value in uV
@@ -131,6 +128,9 @@ int omap_voltage_register_pmic(struct voltagedomain *voltdm,
struct omap_volt_pmic_info *pmic_info);
void omap_change_voltscale_method(struct voltagedomain *voltdm,
int voltscale_method);
+/* API to get the voltagedomain pointer */
+struct voltagedomain *omap_voltage_domain_lookup(char *name);
+
int omap_voltage_late_init(void);
#else
static inline int omap_voltage_register_pmic(struct voltagedomain *voltdm,
@@ -144,6 +144,10 @@ static inline int omap_voltage_late_init(void)
{
return -EINVAL;
}
+static inline struct voltagedomain *omap_voltage_domain_lookup(char *name)
+{
+ return ERR_PTR(-EINVAL);
+}
#endif
#endif
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 10:57 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-omap
Cc: khilman, tony, linux-arm-kernel, Santosh Shilimkar,
Thara Gopinath, Kevin Hilman, Nishanth Menon
CC arch/arm/mach-omap2/omap_hwmod_common_data.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_late_init':
arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL' undeclared (first use in this function)
arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each undeclared identifier is reported only once
arch/arm/plat-omap/include/plat/voltage.h:145: error: for each function it appears in.)
make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 4b02227..5bd204e 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -14,6 +14,8 @@
#ifndef __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
#define __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
+#include <linux/err.h>
+
#define VOLTSCALE_VPFORCEUPDATE 1
#define VOLTSCALE_VCBYPASS 2
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared
@ 2011-01-05 10:57 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 10:57 UTC (permalink / raw)
To: linux-arm-kernel
CC arch/arm/mach-omap2/omap_hwmod_common_data.o
In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_late_init':
arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL' undeclared (first use in this function)
arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each undeclared identifier is reported only once
arch/arm/plat-omap/include/plat/voltage.h:145: error: for each function it appears in.)
make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error 1
make: *** [arch/arm/mach-omap2] Error 2
The error is reported when omap2plus_defconfig built with CONFIG_PM disabled
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Cc: Thara Gopinath <thara@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Nishanth Menon <nm@ti.com>
---
arch/arm/plat-omap/include/plat/voltage.h | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/voltage.h b/arch/arm/plat-omap/include/plat/voltage.h
index 4b02227..5bd204e 100644
--- a/arch/arm/plat-omap/include/plat/voltage.h
+++ b/arch/arm/plat-omap/include/plat/voltage.h
@@ -14,6 +14,8 @@
#ifndef __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
#define __ARCH_ARM_MACH_OMAP2_VOLTAGE_H
+#include <linux/err.h>
+
#define VOLTSCALE_VPFORCEUPDATE 1
#define VOLTSCALE_VCBYPASS 2
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* Re: [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 11:19 ` Russell King - ARM Linux
-1 siblings, 0 replies; 48+ messages in thread
From: Russell King - ARM Linux @ 2011-01-05 11:19 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: linux-omap, khilman, Nishanth Menon, tony, Kevin Hilman,
Thara Gopinath, linux-arm-kernel
On Wed, Jan 05, 2011 at 04:27:04PM +0530, Santosh Shilimkar wrote:
> CC arch/arm/mach-omap2/omap_hwmod_common_data.o
> In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
> from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
> arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_late_init':
> arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL' undeclared (first use in this function)
> arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each undeclared identifier is reported only once
> arch/arm/plat-omap/include/plat/voltage.h:145: error: for each function it appears in.)
> make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
The correct include for this is linux/errno.h, not linux/err.h - you
want the errno definitions, not the IS_ERR/PTR_ERR/ERR_PTR stuff.
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared
@ 2011-01-05 11:19 ` Russell King - ARM Linux
0 siblings, 0 replies; 48+ messages in thread
From: Russell King - ARM Linux @ 2011-01-05 11:19 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, Jan 05, 2011 at 04:27:04PM +0530, Santosh Shilimkar wrote:
> CC arch/arm/mach-omap2/omap_hwmod_common_data.o
> In file included from arch/arm/plat-omap/include/plat/omap_hwmod.h:38,
> from arch/arm/mach-omap2/omap_hwmod_common_data.c:20:
> arch/arm/plat-omap/include/plat/voltage.h: In function 'omap_voltage_late_init':
> arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL' undeclared (first use in this function)
> arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each undeclared identifier is reported only once
> arch/arm/plat-omap/include/plat/voltage.h:145: error: for each function it appears in.)
> make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error 1
> make: *** [arch/arm/mach-omap2] Error 2
The correct include for this is linux/errno.h, not linux/err.h - you
want the errno definitions, not the IS_ERR/PTR_ERR/ERR_PTR stuff.
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for'EINVAL' undeclared
2011-01-05 11:19 ` Russell King - ARM Linux
@ 2011-01-05 11:36 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 11:36 UTC (permalink / raw)
To: Russell King - ARM Linux
Cc: linux-omap, Kevin Hilman, Nishanth Menon, tony, Kevin Hilman,
Thara Gopinath, linux-arm-kernel
> -----Original Message-----
> From: Russell King - ARM Linux [mailto:linux@arm.linux.org.uk]
> Sent: Wednesday, January 05, 2011 4:50 PM
> To: Santosh Shilimkar
> Cc: linux-omap@vger.kernel.org; khilman@ti.com; Nishanth Menon;
> tony@atomide.com; Kevin Hilman; Thara Gopinath; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix
> for'EINVAL' undeclared
>
> On Wed, Jan 05, 2011 at 04:27:04PM +0530, Santosh Shilimkar wrote:
> > CC arch/arm/mach-omap2/omap_hwmod_common_data.o
> > In file included from arch/arm/plat-
> omap/include/plat/omap_hwmod.h:38,
> > from arch/arm/mach-
> omap2/omap_hwmod_common_data.c:20:
> > arch/arm/plat-omap/include/plat/voltage.h: In function
> 'omap_voltage_late_init':
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL'
> undeclared (first use in this function)
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each
> undeclared identifier is reported only once
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: for each
> function it appears in.)
> > make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error
> 1
> > make: *** [arch/arm/mach-omap2] Error 2
>
> The correct include for this is linux/errno.h, not linux/err.h - you
> want the errno definitions, not the IS_ERR/PTR_ERR/ERR_PTR stuff.
In this series, newly added stub of 'omap_voltage_domain_lookup'
in [PATCH v2 4/5] make use of 'ERR_PTR' which needs linux/err.h.
Regards
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for'EINVAL' undeclared
@ 2011-01-05 11:36 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-05 11:36 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> Sent: Wednesday, January 05, 2011 4:50 PM
> To: Santosh Shilimkar
> Cc: linux-omap at vger.kernel.org; khilman at ti.com; Nishanth Menon;
> tony at atomide.com; Kevin Hilman; Thara Gopinath; linux-arm-
> kernel at lists.infradead.org
> Subject: Re: [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix
> for'EINVAL' undeclared
>
> On Wed, Jan 05, 2011 at 04:27:04PM +0530, Santosh Shilimkar wrote:
> > CC arch/arm/mach-omap2/omap_hwmod_common_data.o
> > In file included from arch/arm/plat-
> omap/include/plat/omap_hwmod.h:38,
> > from arch/arm/mach-
> omap2/omap_hwmod_common_data.c:20:
> > arch/arm/plat-omap/include/plat/voltage.h: In function
> 'omap_voltage_late_init':
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: 'EINVAL'
> undeclared (first use in this function)
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: (Each
> undeclared identifier is reported only once
> > arch/arm/plat-omap/include/plat/voltage.h:145: error: for each
> function it appears in.)
> > make[1]: *** [arch/arm/mach-omap2/omap_hwmod_common_data.o] Error
> 1
> > make: *** [arch/arm/mach-omap2] Error 2
>
> The correct include for this is linux/errno.h, not linux/err.h - you
> want the errno definitions, not the IS_ERR/PTR_ERR/ERR_PTR stuff.
In this series, newly added stub of 'omap_voltage_domain_lookup'
in [PATCH v2 4/5] make use of 'ERR_PTR' which needs linux/err.h.
Regards
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-05 17:43 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-05 17:43 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-omap, tony, linux-arm-kernel, Paul Walmsley
Hi Santosh,
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
> struct clockdomain member clktrctrl_mask is available for only for OMAP2
> and OMAP3 architectures. Technially it is also used only for these archs
> but this breaks the build with custom OMAP4 configuration.
I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
With Paul's ack, I can queue the others too, or Paul can decide to take
them via his tree. Paul can decide.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-05 17:43 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-05 17:43 UTC (permalink / raw)
To: linux-arm-kernel
Hi Santosh,
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
> struct clockdomain member clktrctrl_mask is available for only for OMAP2
> and OMAP3 architectures. Technially it is also used only for these archs
> but this breaks the build with custom OMAP4 configuration.
I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
With Paul's ack, I can queue the others too, or Paul can decide to take
them via his tree. Paul can decide.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-06 14:32 ` Premi, Sanjeev
-1 siblings, 0 replies; 48+ messages in thread
From: Premi, Sanjeev @ 2011-01-06 14:32 UTC (permalink / raw)
To: linux-omap
Cc: Hilman, Kevin, tony, linux-arm-kernel, Shilimkar, Santosh, Paul Walmsley
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
> Santosh Shilimkar
> Sent: Wednesday, January 05, 2011 4:27 PM
> To: linux-omap@vger.kernel.org
> Cc: Hilman, Kevin; tony@atomide.com;
> linux-arm-kernel@lists.infradead.org; Shilimkar, Santosh;
> Paul Walmsley
> Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
> fix for undefined reference to 'omap2_prm_read_mod_reg'
[snip]
>
> #ifndef __ASSEMBLER__
> -
> +/*
> + * Stub omap2xxx/omap3xxx functions so that common files
> + * continue to build when custom builds are used
> + */
> +#if defined(CONFIG_ARCH_OMAP4) &&
> !(defined(CONFIG_ARCH_OMAP2) || \
> + defined(CONFIG_ARCH_OMAP3))
> +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> +{
> + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> + "not suppose to be used on omap4\n");
> + return 0;
> +}
Looking forward, the warning of incorrect SOC may be required
for when kernel is build for one specific SOC.
Wouldn't it be easy/better to have common global function:
void wrong_soc(char* func, int soc_id)
{
WARN_ONCE(1, "Function %s cannot be used for %d", func, soc_id);
}
OR we could have soc specific functions e.g.
void omap2xxx_only (char* func)
{
WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
}
..etc..
Later these functions can be called from the stubs.
This is prelim idea, will need to be worked upon.
~sanjeev
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-06 14:32 ` Premi, Sanjeev
0 siblings, 0 replies; 48+ messages in thread
From: Premi, Sanjeev @ 2011-01-06 14:32 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org
> [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of
> Santosh Shilimkar
> Sent: Wednesday, January 05, 2011 4:27 PM
> To: linux-omap at vger.kernel.org
> Cc: Hilman, Kevin; tony at atomide.com;
> linux-arm-kernel at lists.infradead.org; Shilimkar, Santosh;
> Paul Walmsley
> Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
> fix for undefined reference to 'omap2_prm_read_mod_reg'
[snip]
>
> #ifndef __ASSEMBLER__
> -
> +/*
> + * Stub omap2xxx/omap3xxx functions so that common files
> + * continue to build when custom builds are used
> + */
> +#if defined(CONFIG_ARCH_OMAP4) &&
> !(defined(CONFIG_ARCH_OMAP2) || \
> + defined(CONFIG_ARCH_OMAP3))
> +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> +{
> + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> + "not suppose to be used on omap4\n");
> + return 0;
> +}
Looking forward, the warning of incorrect SOC may be required
for when kernel is build for one specific SOC.
Wouldn't it be easy/better to have common global function:
void wrong_soc(char* func, int soc_id)
{
WARN_ONCE(1, "Function %s cannot be used for %d", func, soc_id);
}
OR we could have soc specific functions e.g.
void omap2xxx_only (char* func)
{
WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
}
..etc..
Later these functions can be called from the stubs.
This is prelim idea, will need to be worked upon.
~sanjeev
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-06 14:32 ` Premi, Sanjeev
@ 2011-01-06 14:38 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-06 14:38 UTC (permalink / raw)
To: Sanjeev Premi, linux-omap
Cc: Kevin Hilman, tony, linux-arm-kernel, Paul Walmsley
> -----Original Message-----
> From: Premi, Sanjeev [mailto:premi@ti.com]
> Sent: Thursday, January 06, 2011 8:03 PM
> To: Shilimkar, Santosh; linux-omap@vger.kernel.org
> Cc: Hilman, Kevin; tony@atomide.com; linux-arm-
> kernel@lists.infradead.org; Shilimkar, Santosh; Paul Walmsley
> Subject: RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> > -----Original Message-----
> > From: linux-omap-owner@vger.kernel.org
> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
> > Santosh Shilimkar
> > Sent: Wednesday, January 05, 2011 4:27 PM
> > To: linux-omap@vger.kernel.org
> > Cc: Hilman, Kevin; tony@atomide.com;
> > linux-arm-kernel@lists.infradead.org; Shilimkar, Santosh;
> > Paul Walmsley
> > Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
> > fix for undefined reference to 'omap2_prm_read_mod_reg'
>
> [snip]
>
> >
> > #ifndef __ASSEMBLER__
> > -
> > +/*
> > + * Stub omap2xxx/omap3xxx functions so that common files
> > + * continue to build when custom builds are used
> > + */
> > +#if defined(CONFIG_ARCH_OMAP4) &&
> > !(defined(CONFIG_ARCH_OMAP2) || \
> > + defined(CONFIG_ARCH_OMAP3))
> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> > +{
> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> > + "not suppose to be used on omap4\n");
> > + return 0;
> > +}
> Looking forward, the warning of incorrect SOC may be required
> for when kernel is build for one specific SOC.
>
> Wouldn't it be easy/better to have common global function:
>
> void wrong_soc(char* func, int soc_id)
> {
> WARN_ONCE(1, "Function %s cannot be used for %d", func,
> soc_id);
> }
>
> OR we could have soc specific functions e.g.
>
> void omap2xxx_only (char* func)
> {
> WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
> }
> ..etc..
>
> Later these functions can be called from the stubs.
>
> This is prelim idea, will need to be worked upon.
>
Not sure. May appear like over engineering considering it's a
stub.
Paul can comment.
Regards,
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-06 14:38 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-06 14:38 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Premi, Sanjeev [mailto:premi at ti.com]
> Sent: Thursday, January 06, 2011 8:03 PM
> To: Shilimkar, Santosh; linux-omap at vger.kernel.org
> Cc: Hilman, Kevin; tony at atomide.com; linux-arm-
> kernel at lists.infradead.org; Shilimkar, Santosh; Paul Walmsley
> Subject: RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> > -----Original Message-----
> > From: linux-omap-owner at vger.kernel.org
> > [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of
> > Santosh Shilimkar
> > Sent: Wednesday, January 05, 2011 4:27 PM
> > To: linux-omap at vger.kernel.org
> > Cc: Hilman, Kevin; tony at atomide.com;
> > linux-arm-kernel at lists.infradead.org; Shilimkar, Santosh;
> > Paul Walmsley
> > Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
> > fix for undefined reference to 'omap2_prm_read_mod_reg'
>
> [snip]
>
> >
> > #ifndef __ASSEMBLER__
> > -
> > +/*
> > + * Stub omap2xxx/omap3xxx functions so that common files
> > + * continue to build when custom builds are used
> > + */
> > +#if defined(CONFIG_ARCH_OMAP4) &&
> > !(defined(CONFIG_ARCH_OMAP2) || \
> > + defined(CONFIG_ARCH_OMAP3))
> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> > +{
> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> > + "not suppose to be used on omap4\n");
> > + return 0;
> > +}
> Looking forward, the warning of incorrect SOC may be required
> for when kernel is build for one specific SOC.
>
> Wouldn't it be easy/better to have common global function:
>
> void wrong_soc(char* func, int soc_id)
> {
> WARN_ONCE(1, "Function %s cannot be used for %d", func,
> soc_id);
> }
>
> OR we could have soc specific functions e.g.
>
> void omap2xxx_only (char* func)
> {
> WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
> }
> ..etc..
>
> Later these functions can be called from the stubs.
>
> This is prelim idea, will need to be worked upon.
>
Not sure. May appear like over engineering considering it's a
stub.
Paul can comment.
Regards,
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-06 17:58 ` Paul Walmsley
-1 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 17:58 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-omap, khilman, tony, linux-arm-kernel
Hi Santosh
On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
> omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
> selected. This is because common files make references to the functions
> which are defined only for omap2xxx and omap3xxx.
...
>
> This patch adds stubs for these functions so that build continues to work.
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> ---
> arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++++++++++++++++++-
> 1 files changed, 62 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> index 53d44f6..843f329 100644
> --- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
> +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> @@ -228,7 +228,67 @@
>
>
> #ifndef __ASSEMBLER__
> -
> +/*
> + * Stub omap2xxx/omap3xxx functions so that common files
> + * continue to build when custom builds are used
> + */
> +#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
> + defined(CONFIG_ARCH_OMAP3))
> +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> +{
> + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> + "not suppose to be used on omap4\n");
> + return 0;
> +}
I think it would be best to use WARN() on these, rather than WARN_ONCE().
That's because these could be called from different parts of the code
base, and the stack backtrace will help someone figure out all the code
that needs to be fixed.
Once you do that, this patch is
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-06 17:58 ` Paul Walmsley
0 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 17:58 UTC (permalink / raw)
To: linux-arm-kernel
Hi Santosh
On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
> omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
> selected. This is because common files make references to the functions
> which are defined only for omap2xxx and omap3xxx.
...
>
> This patch adds stubs for these functions so that build continues to work.
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
> ---
> arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++++++++++++++++++-
> 1 files changed, 62 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> index 53d44f6..843f329 100644
> --- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
> +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> @@ -228,7 +228,67 @@
>
>
> #ifndef __ASSEMBLER__
> -
> +/*
> + * Stub omap2xxx/omap3xxx functions so that common files
> + * continue to build when custom builds are used
> + */
> +#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
> + defined(CONFIG_ARCH_OMAP3))
> +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> +{
> + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> + "not suppose to be used on omap4\n");
> + return 0;
> +}
I think it would be best to use WARN() on these, rather than WARN_ONCE().
That's because these could be called from different parts of the code
base, and the stack backtrace will help someone figure out all the code
that needs to be fixed.
Once you do that, this patch is
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-05 10:57 ` Santosh Shilimkar
@ 2011-01-06 17:59 ` Paul Walmsley
-1 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 17:59 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-omap, khilman, tony, linux-arm-kernel
On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
> struct clockdomain member clktrctrl_mask is available for only for OMAP2
> and OMAP3 architectures. Technially it is also used only for these archs
> but this breaks the build with custom OMAP4 configuration.
...
> Fix the build break by dropping the #ifdef as suggested by Paul Walmsley
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-06 17:59 ` Paul Walmsley
0 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 17:59 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
> struct clockdomain member clktrctrl_mask is available for only for OMAP2
> and OMAP3 architectures. Technially it is also used only for these archs
> but this breaks the build with custom OMAP4 configuration.
...
> Fix the build break by dropping the #ifdef as suggested by Paul Walmsley
>
> Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Cc: Paul Walmsley <paul@pwsan.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-05 17:43 ` Kevin Hilman
@ 2011-01-06 18:02 ` Paul Walmsley
-1 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 18:02 UTC (permalink / raw)
To: Kevin Hilman; +Cc: Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
On Wed, 5 Jan 2011, Kevin Hilman wrote:
> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>
> > struct clockdomain member clktrctrl_mask is available for only for OMAP2
> > and OMAP3 architectures. Technially it is also used only for these archs
> > but this breaks the build with custom OMAP4 configuration.
>
> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
>
> With Paul's ack, I can queue the others too, or Paul can decide to take
> them via his tree. Paul can decide.
I've acked one and requested minor changes on the other, after which it
can be acked by me. You're welcome to take them at that point. Just a
request, maybe you can post a branch with just these patches in them; that
way Rajendra and/or I can rebase his new clockdomain changes on it until
-rc1 comes out.
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-06 18:02 ` Paul Walmsley
0 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-06 18:02 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 5 Jan 2011, Kevin Hilman wrote:
> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>
> > struct clockdomain member clktrctrl_mask is available for only for OMAP2
> > and OMAP3 architectures. Technially it is also used only for these archs
> > but this breaks the build with custom OMAP4 configuration.
>
> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
>
> With Paul's ack, I can queue the others too, or Paul can decide to take
> them via his tree. Paul can decide.
I've acked one and requested minor changes on the other, after which it
can be acked by me. You're welcome to take them at that point. Just a
request, maybe you can post a branch with just these patches in them; that
way Rajendra and/or I can rebase his new clockdomain changes on it until
-rc1 comes out.
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-06 14:38 ` Santosh Shilimkar
@ 2011-01-06 18:09 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:09 UTC (permalink / raw)
To: Santosh Shilimkar
Cc: Sanjeev Premi, linux-omap, tony, linux-arm-kernel, Paul Walmsley
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>> -----Original Message-----
>> From: Premi, Sanjeev [mailto:premi@ti.com]
>> Sent: Thursday, January 06, 2011 8:03 PM
>> To: Shilimkar, Santosh; linux-omap@vger.kernel.org
>> Cc: Hilman, Kevin; tony@atomide.com; linux-arm-
>> kernel@lists.infradead.org; Shilimkar, Santosh; Paul Walmsley
>> Subject: RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
>> for undefined reference to 'omap2_prm_read_mod_reg'
>>
>> > -----Original Message-----
>> > From: linux-omap-owner@vger.kernel.org
>> > [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of
>> > Santosh Shilimkar
>> > Sent: Wednesday, January 05, 2011 4:27 PM
>> > To: linux-omap@vger.kernel.org
>> > Cc: Hilman, Kevin; tony@atomide.com;
>> > linux-arm-kernel@lists.infradead.org; Shilimkar, Santosh;
>> > Paul Walmsley
>> > Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
>> > fix for undefined reference to 'omap2_prm_read_mod_reg'
>>
>> [snip]
>>
>> >
>> > #ifndef __ASSEMBLER__
>> > -
>> > +/*
>> > + * Stub omap2xxx/omap3xxx functions so that common files
>> > + * continue to build when custom builds are used
>> > + */
>> > +#if defined(CONFIG_ARCH_OMAP4) &&
>> > !(defined(CONFIG_ARCH_OMAP2) || \
>> > + defined(CONFIG_ARCH_OMAP3))
>> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
>> > +{
>> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
>> > + "not suppose to be used on omap4\n");
>> > + return 0;
>> > +}
>> Looking forward, the warning of incorrect SOC may be required
>> for when kernel is build for one specific SOC.
>>
>> Wouldn't it be easy/better to have common global function:
>>
>> void wrong_soc(char* func, int soc_id)
>> {
>> WARN_ONCE(1, "Function %s cannot be used for %d", func,
>> soc_id);
>> }
>>
>> OR we could have soc specific functions e.g.
>>
>> void omap2xxx_only (char* func)
>> {
>> WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
>> }
>> ..etc..
>>
>> Later these functions can be called from the stubs.
>>
>> This is prelim idea, will need to be worked upon.
>>
> Not sure. May appear like over engineering considering it's a
> stub.
> Paul can comment.
I guess Sanjeev's approach is meant eliminate duplicate strings that
waste space.
Sanjeev, did you check whether multiple copies of the exact same string
actually exist in the binary? I'm wondering if gcc is smart enough to
only have one copy of the string (but have doubts.)
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-06 18:09 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:09 UTC (permalink / raw)
To: linux-arm-kernel
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>> -----Original Message-----
>> From: Premi, Sanjeev [mailto:premi at ti.com]
>> Sent: Thursday, January 06, 2011 8:03 PM
>> To: Shilimkar, Santosh; linux-omap at vger.kernel.org
>> Cc: Hilman, Kevin; tony at atomide.com; linux-arm-
>> kernel at lists.infradead.org; Shilimkar, Santosh; Paul Walmsley
>> Subject: RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
>> for undefined reference to 'omap2_prm_read_mod_reg'
>>
>> > -----Original Message-----
>> > From: linux-omap-owner at vger.kernel.org
>> > [mailto:linux-omap-owner at vger.kernel.org] On Behalf Of
>> > Santosh Shilimkar
>> > Sent: Wednesday, January 05, 2011 4:27 PM
>> > To: linux-omap at vger.kernel.org
>> > Cc: Hilman, Kevin; tony at atomide.com;
>> > linux-arm-kernel at lists.infradead.org; Shilimkar, Santosh;
>> > Paul Walmsley
>> > Subject: [PATCH v2 2/5] omap2plus: prm: Trvial build break
>> > fix for undefined reference to 'omap2_prm_read_mod_reg'
>>
>> [snip]
>>
>> >
>> > #ifndef __ASSEMBLER__
>> > -
>> > +/*
>> > + * Stub omap2xxx/omap3xxx functions so that common files
>> > + * continue to build when custom builds are used
>> > + */
>> > +#if defined(CONFIG_ARCH_OMAP4) &&
>> > !(defined(CONFIG_ARCH_OMAP2) || \
>> > + defined(CONFIG_ARCH_OMAP3))
>> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
>> > +{
>> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
>> > + "not suppose to be used on omap4\n");
>> > + return 0;
>> > +}
>> Looking forward, the warning of incorrect SOC may be required
>> for when kernel is build for one specific SOC.
>>
>> Wouldn't it be easy/better to have common global function:
>>
>> void wrong_soc(char* func, int soc_id)
>> {
>> WARN_ONCE(1, "Function %s cannot be used for %d", func,
>> soc_id);
>> }
>>
>> OR we could have soc specific functions e.g.
>>
>> void omap2xxx_only (char* func)
>> {
>> WARN_ONCE(1, "Function %s is specific to OMAP2XXX");
>> }
>> ..etc..
>>
>> Later these functions can be called from the stubs.
>>
>> This is prelim idea, will need to be worked upon.
>>
> Not sure. May appear like over engineering considering it's a
> stub.
> Paul can comment.
I guess Sanjeev's approach is meant eliminate duplicate strings that
waste space.
Sanjeev, did you check whether multiple copies of the exact same string
actually exist in the binary? I'm wondering if gcc is smart enough to
only have one copy of the string (but have doubts.)
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-06 18:02 ` Paul Walmsley
@ 2011-01-06 18:28 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:28 UTC (permalink / raw)
To: Paul Walmsley; +Cc: Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
Paul Walmsley <paul@pwsan.com> writes:
> On Wed, 5 Jan 2011, Kevin Hilman wrote:
>
>> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>>
>> > struct clockdomain member clktrctrl_mask is available for only for OMAP2
>> > and OMAP3 architectures. Technially it is also used only for these archs
>> > but this breaks the build with custom OMAP4 configuration.
>>
>> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
>>
>> With Paul's ack, I can queue the others too, or Paul can decide to take
>> them via his tree. Paul can decide.
>
> I've acked one and requested minor changes on the other, after which it
> can be acked by me. You're welcome to take them at that point. Just a
> request, maybe you can post a branch with just these patches in them; that
> way Rajendra and/or I can rebase his new clockdomain changes on it until
> -rc1 comes out.
Sure, will do.
I currently have a 'fixes-for-tony' branch in my tree which has all the
fixes I've collected for the -rc cycle.
If you prefer something separate with only the prm and clockdomain
patches from this series, I can do that as well.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-06 18:28 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-06 18:28 UTC (permalink / raw)
To: linux-arm-kernel
Paul Walmsley <paul@pwsan.com> writes:
> On Wed, 5 Jan 2011, Kevin Hilman wrote:
>
>> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>>
>> > struct clockdomain member clktrctrl_mask is available for only for OMAP2
>> > and OMAP3 architectures. Technially it is also used only for these archs
>> > but this breaks the build with custom OMAP4 configuration.
>>
>> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
>>
>> With Paul's ack, I can queue the others too, or Paul can decide to take
>> them via his tree. Paul can decide.
>
> I've acked one and requested minor changes on the other, after which it
> can be acked by me. You're welcome to take them at that point. Just a
> request, maybe you can post a branch with just these patches in them; that
> way Rajendra and/or I can rebase his new clockdomain changes on it until
> -rc1 comes out.
Sure, will do.
I currently have a 'fixes-for-tony' branch in my tree which has all the
fixes I've collected for the -rc cycle.
If you prefer something separate with only the prm and clockdomain
patches from this series, I can do that as well.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-06 18:28 ` Kevin Hilman
@ 2011-01-07 8:40 ` Rajendra Nayak
-1 siblings, 0 replies; 48+ messages in thread
From: Rajendra Nayak @ 2011-01-07 8:40 UTC (permalink / raw)
To: Kevin Hilman, Paul Walmsley
Cc: Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
[-- Attachment #1: Type: text/plain, Size: 2735 bytes --]
> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org
[mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Kevin Hilman
> Sent: Thursday, January 06, 2011 11:58 PM
> To: Paul Walmsley
> Cc: Santosh Shilimkar; linux-omap@vger.kernel.org; tony@atomide.com;
linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for
build break because of clktrctrl_mask
>
> Paul Walmsley <paul@pwsan.com> writes:
>
> > On Wed, 5 Jan 2011, Kevin Hilman wrote:
> >
> >> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
> >>
> >> > struct clockdomain member clktrctrl_mask is available for only for
OMAP2
> >> > and OMAP3 architectures. Technially it is also used only for these
archs
> >> > but this breaks the build with custom OMAP4 configuration.
> >>
> >> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
> >>
> >> With Paul's ack, I can queue the others too, or Paul can decide to
take
> >> them via his tree. Paul can decide.
> >
> > I've acked one and requested minor changes on the other, after which
it
> > can be acked by me. You're welcome to take them at that point. Just
a
> > request, maybe you can post a branch with just these patches in them;
that
> > way Rajendra and/or I can rebase his new clockdomain changes on it
until
> > -rc1 comes out.
>
> Sure, will do.
Just another trivial fix.
>From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Fri, 7 Jan 2011 14:07:25 +0530
Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
Trivial fix to remove the unused function declaration
from the powerdomain header.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/powerdomain.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/powerdomain.h
b/arch/arm/mach-omap2/powerdomain.h
index c66431e..0b7a357 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h
@@ -165,7 +165,6 @@ struct pwrdm_ops {
int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
};
-void pwrdm_fw_init(void);
void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
*custom_funcs);
struct powerdomain *pwrdm_lookup(const char *name);
--
1.7.0.4
>
> I currently have a 'fixes-for-tony' branch in my tree which has all the
> fixes I've collected for the -rc cycle.
>
> If you prefer something separate with only the prm and clockdomain
> patches from this series, I can do that as well.
>
> Kevin
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
[-- Attachment #2: 0001-OMAP-powerdomain-remove-unused-func-declaration.patch --]
[-- Type: application/octet-stream, Size: 917 bytes --]
From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
From: Rajendra Nayak <rnayak@ti.com>
Date: Fri, 7 Jan 2011 14:07:25 +0530
Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
Trivial fix to remove the unused function declaration
from the powerdomain header.
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
---
arch/arm/mach-omap2/powerdomain.h | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index c66431e..0b7a357 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h
@@ -165,7 +165,6 @@ struct pwrdm_ops {
int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
};
-void pwrdm_fw_init(void);
void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops *custom_funcs);
struct powerdomain *pwrdm_lookup(const char *name);
--
1.7.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-07 8:40 ` Rajendra Nayak
0 siblings, 0 replies; 48+ messages in thread
From: Rajendra Nayak @ 2011-01-07 8:40 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: linux-omap-owner at vger.kernel.org
[mailto:linux-omap-owner at vger.kernel.org] On Behalf Of Kevin Hilman
> Sent: Thursday, January 06, 2011 11:58 PM
> To: Paul Walmsley
> Cc: Santosh Shilimkar; linux-omap at vger.kernel.org; tony at atomide.com;
linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for
build break because of clktrctrl_mask
>
> Paul Walmsley <paul@pwsan.com> writes:
>
> > On Wed, 5 Jan 2011, Kevin Hilman wrote:
> >
> >> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
> >>
> >> > struct clockdomain member clktrctrl_mask is available for only for
OMAP2
> >> > and OMAP3 architectures. Technially it is also used only for these
archs
> >> > but this breaks the build with custom OMAP4 configuration.
> >>
> >> I'll queue patches 3-5 for the 2.6.38-rc fixes cycle.
> >>
> >> With Paul's ack, I can queue the others too, or Paul can decide to
take
> >> them via his tree. Paul can decide.
> >
> > I've acked one and requested minor changes on the other, after which
it
> > can be acked by me. You're welcome to take them at that point. Just
a
> > request, maybe you can post a branch with just these patches in them;
that
> > way Rajendra and/or I can rebase his new clockdomain changes on it
until
> > -rc1 comes out.
>
> Sure, will do.
Just another trivial fix.
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-06 17:58 ` Paul Walmsley
@ 2011-01-07 8:43 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 8:43 UTC (permalink / raw)
To: Paul Walmsley; +Cc: linux-omap, Kevin Hilman, tony, linux-arm-kernel
> -----Original Message-----
> From: Paul Walmsley [mailto:paul@pwsan.com]
> Sent: Thursday, January 06, 2011 11:28 PM
> To: Santosh Shilimkar
> Cc: linux-omap@vger.kernel.org; khilman@ti.com; tony@atomide.com;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Hi Santosh
>
> On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
>
> > omap2plus_defocnfig build breaks when customised with only
> ARCH_OMAP4
> > selected. This is because common files make references to the
> functions
> > which are defined only for omap2xxx and omap3xxx.
>
> ...
>
> >
> > This patch adds stubs for these functions so that build continues
> to work.
> >
> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > ---
> > arch/arm/mach-omap2/prm2xxx_3xxx.h | 63
> +++++++++++++++++++++++++++++++++++-
> > 1 files changed, 62 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-
> omap2/prm2xxx_3xxx.h
> > index 53d44f6..843f329 100644
> > --- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
> > +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> > @@ -228,7 +228,67 @@
> >
> >
> > #ifndef __ASSEMBLER__
> > -
> > +/*
> > + * Stub omap2xxx/omap3xxx functions so that common files
> > + * continue to build when custom builds are used
> > + */
> > +#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) ||
> \
> > + defined(CONFIG_ARCH_OMAP3))
> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> > +{
> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> > + "not suppose to be used on omap4\n");
> > + return 0;
> > +}
>
> I think it would be best to use WARN() on these, rather than
> WARN_ONCE().
> That's because these could be called from different parts of the
> code
> base, and the stack backtrace will help someone figure out all the
> code
> that needs to be fixed.
>
Ok.
> Once you do that, this patch is
>
> Acked-by: Paul Walmsley <paul@pwsan.com>
>
Thanks
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-07 8:43 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 8:43 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Paul Walmsley [mailto:paul at pwsan.com]
> Sent: Thursday, January 06, 2011 11:28 PM
> To: Santosh Shilimkar
> Cc: linux-omap at vger.kernel.org; khilman at ti.com; tony at atomide.com;
> linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Hi Santosh
>
> On Wed, 5 Jan 2011, Santosh Shilimkar wrote:
>
> > omap2plus_defocnfig build breaks when customised with only
> ARCH_OMAP4
> > selected. This is because common files make references to the
> functions
> > which are defined only for omap2xxx and omap3xxx.
>
> ...
>
> >
> > This patch adds stubs for these functions so that build continues
> to work.
> >
> > Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> > Cc: Paul Walmsley <paul@pwsan.com>
> > ---
> > arch/arm/mach-omap2/prm2xxx_3xxx.h | 63
> +++++++++++++++++++++++++++++++++++-
> > 1 files changed, 62 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-
> omap2/prm2xxx_3xxx.h
> > index 53d44f6..843f329 100644
> > --- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
> > +++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
> > @@ -228,7 +228,67 @@
> >
> >
> > #ifndef __ASSEMBLER__
> > -
> > +/*
> > + * Stub omap2xxx/omap3xxx functions so that common files
> > + * continue to build when custom builds are used
> > + */
> > +#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) ||
> \
> > + defined(CONFIG_ARCH_OMAP3))
> > +static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
> > +{
> > + WARN_ONCE(1, "prm: omap2xxx/omap3xxx specific function and "
> > + "not suppose to be used on omap4\n");
> > + return 0;
> > +}
>
> I think it would be best to use WARN() on these, rather than
> WARN_ONCE().
> That's because these could be called from different parts of the
> code
> base, and the stack backtrace will help someone figure out all the
> code
> that needs to be fixed.
>
Ok.
> Once you do that, this patch is
>
> Acked-by: Paul Walmsley <paul@pwsan.com>
>
Thanks
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-06 17:58 ` Paul Walmsley
@ 2011-01-07 11:14 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 11:14 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-omap, tony, linux-arm-kernel, Paul Walmsley
[-- Attachment #1: Type: text/plain, Size: 5873 bytes --]
> -----Original Message-----
> From: Paul Walmsley [mailto:paul@pwsan.com]
> Sent: Thursday, January 06, 2011 11:28 PM
Kevin,
> To: Santosh Shilimkar
> Cc: linux-omap@vger.kernel.org; khilman@ti.com; tony@atomide.com;
> linux-arm-kernel@lists.infradead.org
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Hi Santosh
>
[.....]
>
> I think it would be best to use WARN() on these, rather than
> WARN_ONCE().
> That's because these could be called from different parts of the
> code
> base, and the stack backtrace will help someone figure out all the
> code
> that needs to be fixed.
>
> Once you do that, this patch is
>
> Acked-by: Paul Walmsley <paul@pwsan.com>
>
>
With WARN() instead of WARN_ONCE() and Paul's ack, here
is an updated patch.
>From 3ccbab8517133c25ed2e470f9622639c98dcbd71 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Tue, 4 Jan 2011 20:40:27 +0530
Subject: [PATCH 2/5 v3] omap2plus: prm: Trvial build break fix for
undefined reference to 'omap2_prm_read_mod_reg'
omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
selected. This is because common files make references to the functions
which are defined only for omap2xxx and omap3xxx.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store':
arch/arm/mach-omap2/pm-debug.c:335: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump':
arch/arm/mach-omap2/pm-debug.c:121: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:123: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:124: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:125: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset':
arch/arm/mach-omap2/prcm.c:106: undefined reference to
`omap2_prm_set_mod_reg_bits'
arch/arm/mach-omap2/prcm.c:108: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources':
arch/arm/mach-omap2/prcm.c:53: undefined reference to
`omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps':
arch/arm/mach-omap2/clockdomain.c:545: undefined reference to
`omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep':
arch/arm/mach-omap2/clockdomain.c:475: undefined reference to
`omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep':
arch/arm/mach-omap2/clockdomain.c:511: undefined reference to
`omap2_prm_read_mod_bits_shift'
arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep':
arch/arm/mach-omap2/clockdomain.c:440: undefined reference to
`omap2_prm_set_mod_reg_bits'
make: *** [.tmp_vmlinux1] Error 1
This patch adds stubs for these functions so that build continues to work.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/prm2xxx_3xxx.h | 63
+++++++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h
b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index 53d44f6..49654c8 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -228,7 +228,67 @@
#ifndef __ASSEMBLER__
-
+/*
+ * Stub omap2xxx/omap3xxx functions so that common files
+ * continue to build when custom builds are used
+ */
+#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
+ defined(CONFIG_ARCH_OMAP3))
+static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+}
+static inline u32 omap2_prm_rmw_mod_reg_bits(u32 mask, u32 bits,
+ s16 module, s16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_set_mod_reg_bits(u32 bits, s16 module, s16
idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16
idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_read_mod_bits_shift(s16 domain, s16 idx, u32
mask)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+#else
/* Power/reset management domain register get/set */
extern u32 omap2_prm_read_mod_reg(s16 module, u16 idx);
extern void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx);
@@ -242,6 +302,7 @@ extern int omap2_prm_is_hardreset_asserted(s16
prm_mod, u8 shift);
extern int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);
extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift);
+#endif /* CONFIG_ARCH_OMAP4 */
#endif
/*
--
1.6.0.4
[-- Attachment #2: 0002-omap2plus-prm-Trvial-build-break-fix-for-undefined.patch --]
[-- Type: application/octet-stream, Size: 5051 bytes --]
From 3ccbab8517133c25ed2e470f9622639c98dcbd71 Mon Sep 17 00:00:00 2001
From: Santosh Shilimkar <santosh.shilimkar@ti.com>
Date: Tue, 4 Jan 2011 20:40:27 +0530
Subject: [PATCH 2/5 v3] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
omap2plus_defocnfig build breaks when customised with only ARCH_OMAP4
selected. This is because common files make references to the functions
which are defined only for omap2xxx and omap3xxx.
LD .tmp_vmlinux1
arch/arm/mach-omap2/built-in.o: In function `pm_dbg_regset_store':
arch/arm/mach-omap2/pm-debug.c:335: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap2_pm_dump':
arch/arm/mach-omap2/pm-debug.c:121: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:123: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:124: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/pm-debug.c:125: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_arch_reset':
arch/arm/mach-omap2/prcm.c:106: undefined reference to `omap2_prm_set_mod_reg_bits'
arch/arm/mach-omap2/prcm.c:108: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `omap_prcm_get_reset_sources':
arch/arm/mach-omap2/prcm.c:53: undefined reference to `omap2_prm_read_mod_reg'
arch/arm/mach-omap2/built-in.o: In function `clkdm_clear_all_wkdeps':
arch/arm/mach-omap2/clockdomain.c:545: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_del_wkdep':
arch/arm/mach-omap2/clockdomain.c:475: undefined reference to `omap2_prm_clear_mod_reg_bits'
arch/arm/mach-omap2/built-in.o: In function `clkdm_read_wkdep':
arch/arm/mach-omap2/clockdomain.c:511: undefined reference to `omap2_prm_read_mod_bits_shift'
arch/arm/mach-omap2/built-in.o: In function `clkdm_add_wkdep':
arch/arm/mach-omap2/clockdomain.c:440: undefined reference to `omap2_prm_set_mod_reg_bits'
make: *** [.tmp_vmlinux1] Error 1
This patch adds stubs for these functions so that build continues to work.
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/prm2xxx_3xxx.h | 63 +++++++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/prm2xxx_3xxx.h b/arch/arm/mach-omap2/prm2xxx_3xxx.h
index 53d44f6..49654c8 100644
--- a/arch/arm/mach-omap2/prm2xxx_3xxx.h
+++ b/arch/arm/mach-omap2/prm2xxx_3xxx.h
@@ -228,7 +228,67 @@
#ifndef __ASSEMBLER__
-
+/*
+ * Stub omap2xxx/omap3xxx functions so that common files
+ * continue to build when custom builds are used
+ */
+#if defined(CONFIG_ARCH_OMAP4) && !(defined(CONFIG_ARCH_OMAP2) || \
+ defined(CONFIG_ARCH_OMAP3))
+static inline u32 omap2_prm_read_mod_reg(s16 module, u16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+}
+static inline u32 omap2_prm_rmw_mod_reg_bits(u32 mask, u32 bits,
+ s16 module, s16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_set_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_clear_mod_reg_bits(u32 bits, s16 module, s16 idx)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline u32 omap2_prm_read_mod_bits_shift(s16 domain, s16 idx, u32 mask)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+static inline int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift)
+{
+ WARN(1, "prm: omap2xxx/omap3xxx specific function and "
+ "not suppose to be used on omap4\n");
+ return 0;
+}
+#else
/* Power/reset management domain register get/set */
extern u32 omap2_prm_read_mod_reg(s16 module, u16 idx);
extern void omap2_prm_write_mod_reg(u32 val, s16 module, u16 idx);
@@ -242,6 +302,7 @@ extern int omap2_prm_is_hardreset_asserted(s16 prm_mod, u8 shift);
extern int omap2_prm_assert_hardreset(s16 prm_mod, u8 shift);
extern int omap2_prm_deassert_hardreset(s16 prm_mod, u8 shift);
+#endif /* CONFIG_ARCH_OMAP4 */
#endif
/*
--
1.6.0.4
^ permalink raw reply related [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-07 11:14 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 11:14 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Paul Walmsley [mailto:paul at pwsan.com]
> Sent: Thursday, January 06, 2011 11:28 PM
Kevin,
> To: Santosh Shilimkar
> Cc: linux-omap at vger.kernel.org; khilman at ti.com; tony at atomide.com;
> linux-arm-kernel at lists.infradead.org
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Hi Santosh
>
[.....]
>
> I think it would be best to use WARN() on these, rather than
> WARN_ONCE().
> That's because these could be called from different parts of the
> code
> base, and the stack backtrace will help someone figure out all the
> code
> that needs to be fixed.
>
> Once you do that, this patch is
>
> Acked-by: Paul Walmsley <paul@pwsan.com>
>
>
With WARN() instead of WARN_ONCE() and Paul's ack, here
is an updated patch.
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-07 8:40 ` Rajendra Nayak
@ 2011-01-07 21:05 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-07 21:05 UTC (permalink / raw)
To: Rajendra Nayak
Cc: Paul Walmsley, Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
Rajendra Nayak <rnayak@ti.com> writes:
[...]
> Just another trivial fix.
>
> From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> From: Rajendra Nayak <rnayak@ti.com>
> Date: Fri, 7 Jan 2011 14:07:25 +0530
> Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
>
> Trivial fix to remove the unused function declaration
> from the powerdomain header.
>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
> arch/arm/mach-omap2/powerdomain.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/powerdomain.h
> b/arch/arm/mach-omap2/powerdomain.h
> index c66431e..0b7a357 100644
> --- a/arch/arm/mach-omap2/powerdomain.h
> +++ b/arch/arm/mach-omap2/powerdomain.h
> @@ -165,7 +165,6 @@ struct pwrdm_ops {
> int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> };
>
> -void pwrdm_fw_init(void);
> void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> *custom_funcs);
Note this is line-wrapped.
Looks like you need to get get-send-email setup so you can avoid having
the patch sending problems.
>
> struct powerdomain *pwrdm_lookup(const char *name);
In any case, with Paul's ack, I can queue this with the others.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-07 21:05 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-07 21:05 UTC (permalink / raw)
To: linux-arm-kernel
Rajendra Nayak <rnayak@ti.com> writes:
[...]
> Just another trivial fix.
>
> From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> From: Rajendra Nayak <rnayak@ti.com>
> Date: Fri, 7 Jan 2011 14:07:25 +0530
> Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
>
> Trivial fix to remove the unused function declaration
> from the powerdomain header.
>
> Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> ---
> arch/arm/mach-omap2/powerdomain.h | 1 -
> 1 files changed, 0 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/powerdomain.h
> b/arch/arm/mach-omap2/powerdomain.h
> index c66431e..0b7a357 100644
> --- a/arch/arm/mach-omap2/powerdomain.h
> +++ b/arch/arm/mach-omap2/powerdomain.h
> @@ -165,7 +165,6 @@ struct pwrdm_ops {
> int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> };
>
> -void pwrdm_fw_init(void);
> void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> *custom_funcs);
Note this is line-wrapped.
Looks like you need to get get-send-email setup so you can avoid having
the patch sending problems.
>
> struct powerdomain *pwrdm_lookup(const char *name);
In any case, with Paul's ack, I can queue this with the others.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-07 11:14 ` Santosh Shilimkar
@ 2011-01-07 21:14 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-07 21:14 UTC (permalink / raw)
To: Santosh Shilimkar; +Cc: linux-omap, tony, linux-arm-kernel, Paul Walmsley
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
[...]
>> I think it would be best to use WARN() on these, rather than
>> WARN_ONCE(). That's because these could be called from different
>> parts of the code base, and the stack backtrace will help someone
>> figure out all the code that needs to be fixed.
>>
>> Once you do that, this patch is
>>
>> Acked-by: Paul Walmsley <paul@pwsan.com>
>>
> With WARN() instead of WARN_ONCE() and Paul's ack, here
> is an updated patch.
Thanks, will queue for .38-rc cycle.
I'll again plead for working on your git-send-email setup. It looks
like your using outlook. The inline patch is wrapped (as outlook almost
always does.) The attached version applied fine, but the strong
preference is for a single inline patch.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-07 21:14 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-07 21:14 UTC (permalink / raw)
To: linux-arm-kernel
Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
[...]
>> I think it would be best to use WARN() on these, rather than
>> WARN_ONCE(). That's because these could be called from different
>> parts of the code base, and the stack backtrace will help someone
>> figure out all the code that needs to be fixed.
>>
>> Once you do that, this patch is
>>
>> Acked-by: Paul Walmsley <paul@pwsan.com>
>>
> With WARN() instead of WARN_ONCE() and Paul's ack, here
> is an updated patch.
Thanks, will queue for .38-rc cycle.
I'll again plead for working on your git-send-email setup. It looks
like your using outlook. The inline patch is wrapped (as outlook almost
always does.) The attached version applied fine, but the strong
preference is for a single inline patch.
Thanks,
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
2011-01-07 21:14 ` Kevin Hilman
@ 2011-01-07 21:22 ` Santosh Shilimkar
-1 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 21:22 UTC (permalink / raw)
To: Kevin Hilman; +Cc: linux-omap, tony, linux-arm-kernel, Paul Walmsley
> -----Original Message-----
> From: Kevin Hilman [mailto:khilman@ti.com]
> Sent: Saturday, January 08, 2011 2:44 AM
> To: Santosh Shilimkar
> Cc: linux-omap@vger.kernel.org; tony@atomide.com; linux-arm-
> kernel@lists.infradead.org; Paul Walmsley
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>
> [...]
>
> >> I think it would be best to use WARN() on these, rather than
> >> WARN_ONCE(). That's because these could be called from different
> >> parts of the code base, and the stack backtrace will help someone
> >> figure out all the code that needs to be fixed.
> >>
> >> Once you do that, this patch is
> >>
> >> Acked-by: Paul Walmsley <paul@pwsan.com>
> >>
>
> > With WARN() instead of WARN_ONCE() and Paul's ack, here
> > is an updated patch.
>
> Thanks, will queue for .38-rc cycle.
>
> I'll again plead for working on your git-send-email setup. It looks
> like your using outlook. The inline patch is wrapped (as outlook
> almost
> always does.) The attached version applied fine, but the strong
> preference is for a single inline patch.
>
Its google mail now a days. I thought it will wrap and
hence attached the version.
Fully agree with inline patch but as this one was minor
update I skipped it.
Regards
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg'
@ 2011-01-07 21:22 ` Santosh Shilimkar
0 siblings, 0 replies; 48+ messages in thread
From: Santosh Shilimkar @ 2011-01-07 21:22 UTC (permalink / raw)
To: linux-arm-kernel
> -----Original Message-----
> From: Kevin Hilman [mailto:khilman at ti.com]
> Sent: Saturday, January 08, 2011 2:44 AM
> To: Santosh Shilimkar
> Cc: linux-omap at vger.kernel.org; tony at atomide.com; linux-arm-
> kernel at lists.infradead.org; Paul Walmsley
> Subject: Re: [PATCH v2 2/5] omap2plus: prm: Trvial build break fix
> for undefined reference to 'omap2_prm_read_mod_reg'
>
> Santosh Shilimkar <santosh.shilimkar@ti.com> writes:
>
> [...]
>
> >> I think it would be best to use WARN() on these, rather than
> >> WARN_ONCE(). That's because these could be called from different
> >> parts of the code base, and the stack backtrace will help someone
> >> figure out all the code that needs to be fixed.
> >>
> >> Once you do that, this patch is
> >>
> >> Acked-by: Paul Walmsley <paul@pwsan.com>
> >>
>
> > With WARN() instead of WARN_ONCE() and Paul's ack, here
> > is an updated patch.
>
> Thanks, will queue for .38-rc cycle.
>
> I'll again plead for working on your git-send-email setup. It looks
> like your using outlook. The inline patch is wrapped (as outlook
> almost
> always does.) The attached version applied fine, but the strong
> preference is for a single inline patch.
>
Its google mail now a days. I thought it will wrap and
hence attached the version.
Fully agree with inline patch but as this one was minor
update I skipped it.
Regards
Santosh
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-07 21:05 ` Kevin Hilman
@ 2011-01-10 19:16 ` Paul Walmsley
-1 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-10 19:16 UTC (permalink / raw)
To: Kevin Hilman
Cc: Rajendra Nayak, Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
Hi Kevin
On Fri, 7 Jan 2011, Kevin Hilman wrote:
> Rajendra Nayak <rnayak@ti.com> writes:
>
> [...]
>
> > Just another trivial fix.
> >
> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> > From: Rajendra Nayak <rnayak@ti.com>
> > Date: Fri, 7 Jan 2011 14:07:25 +0530
> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
> >
> > Trivial fix to remove the unused function declaration
> > from the powerdomain header.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > ---
> > arch/arm/mach-omap2/powerdomain.h | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/powerdomain.h
> > b/arch/arm/mach-omap2/powerdomain.h
> > index c66431e..0b7a357 100644
> > --- a/arch/arm/mach-omap2/powerdomain.h
> > +++ b/arch/arm/mach-omap2/powerdomain.h
> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> > };
> >
> > -void pwrdm_fw_init(void);
> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> > *custom_funcs);
>
> Note this is line-wrapped.
>
> Looks like you need to get get-send-email setup so you can avoid having
> the patch sending problems.
>
> >
> > struct powerdomain *pwrdm_lookup(const char *name);
>
> In any case, with Paul's ack, I can queue this with the others.
Normally I would wait for the .39 merge window with something like this,
but you're welcome to queue it for the -rc fixes if you feel it's
appropriate:
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-10 19:16 ` Paul Walmsley
0 siblings, 0 replies; 48+ messages in thread
From: Paul Walmsley @ 2011-01-10 19:16 UTC (permalink / raw)
To: linux-arm-kernel
Hi Kevin
On Fri, 7 Jan 2011, Kevin Hilman wrote:
> Rajendra Nayak <rnayak@ti.com> writes:
>
> [...]
>
> > Just another trivial fix.
> >
> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> > From: Rajendra Nayak <rnayak@ti.com>
> > Date: Fri, 7 Jan 2011 14:07:25 +0530
> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
> >
> > Trivial fix to remove the unused function declaration
> > from the powerdomain header.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > ---
> > arch/arm/mach-omap2/powerdomain.h | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/powerdomain.h
> > b/arch/arm/mach-omap2/powerdomain.h
> > index c66431e..0b7a357 100644
> > --- a/arch/arm/mach-omap2/powerdomain.h
> > +++ b/arch/arm/mach-omap2/powerdomain.h
> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> > };
> >
> > -void pwrdm_fw_init(void);
> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> > *custom_funcs);
>
> Note this is line-wrapped.
>
> Looks like you need to get get-send-email setup so you can avoid having
> the patch sending problems.
>
> >
> > struct powerdomain *pwrdm_lookup(const char *name);
>
> In any case, with Paul's ack, I can queue this with the others.
Normally I would wait for the .39 merge window with something like this,
but you're welcome to queue it for the -rc fixes if you feel it's
appropriate:
Acked-by: Paul Walmsley <paul@pwsan.com>
- Paul
^ permalink raw reply [flat|nested] 48+ messages in thread
* Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-10 19:16 ` Paul Walmsley
@ 2011-01-11 1:31 ` Kevin Hilman
-1 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-11 1:31 UTC (permalink / raw)
To: Paul Walmsley
Cc: Rajendra Nayak, Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
Paul Walmsley <paul@pwsan.com> writes:
> On Fri, 7 Jan 2011, Kevin Hilman wrote:
>
>> Rajendra Nayak <rnayak@ti.com> writes:
>>
>> [...]
>>
>> > Just another trivial fix.
>> >
>> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
>> > From: Rajendra Nayak <rnayak@ti.com>
>> > Date: Fri, 7 Jan 2011 14:07:25 +0530
>> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
>> >
>> > Trivial fix to remove the unused function declaration
>> > from the powerdomain header.
>> >
>> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> > ---
>> > arch/arm/mach-omap2/powerdomain.h | 1 -
>> > 1 files changed, 0 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/arch/arm/mach-omap2/powerdomain.h
>> > b/arch/arm/mach-omap2/powerdomain.h
>> > index c66431e..0b7a357 100644
>> > --- a/arch/arm/mach-omap2/powerdomain.h
>> > +++ b/arch/arm/mach-omap2/powerdomain.h
>> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
>> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
>> > };
>> >
>> > -void pwrdm_fw_init(void);
>> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
>> > *custom_funcs);
>>
>> Note this is line-wrapped.
>>
>> Looks like you need to get get-send-email setup so you can avoid having
>> the patch sending problems.
>>
>> >
>> > struct powerdomain *pwrdm_lookup(const char *name);
>>
>> In any case, with Paul's ack, I can queue this with the others.
>
> Normally I would wait for the .39 merge window with something like this,
> but you're welcome to queue it for the -rc fixes if you feel it's
> appropriate:
Yeah, I agree. I'll let you queue this one for .39 as it's not really a
fix.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-11 1:31 ` Kevin Hilman
0 siblings, 0 replies; 48+ messages in thread
From: Kevin Hilman @ 2011-01-11 1:31 UTC (permalink / raw)
To: linux-arm-kernel
Paul Walmsley <paul@pwsan.com> writes:
> On Fri, 7 Jan 2011, Kevin Hilman wrote:
>
>> Rajendra Nayak <rnayak@ti.com> writes:
>>
>> [...]
>>
>> > Just another trivial fix.
>> >
>> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
>> > From: Rajendra Nayak <rnayak@ti.com>
>> > Date: Fri, 7 Jan 2011 14:07:25 +0530
>> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
>> >
>> > Trivial fix to remove the unused function declaration
>> > from the powerdomain header.
>> >
>> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
>> > ---
>> > arch/arm/mach-omap2/powerdomain.h | 1 -
>> > 1 files changed, 0 insertions(+), 1 deletions(-)
>> >
>> > diff --git a/arch/arm/mach-omap2/powerdomain.h
>> > b/arch/arm/mach-omap2/powerdomain.h
>> > index c66431e..0b7a357 100644
>> > --- a/arch/arm/mach-omap2/powerdomain.h
>> > +++ b/arch/arm/mach-omap2/powerdomain.h
>> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
>> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
>> > };
>> >
>> > -void pwrdm_fw_init(void);
>> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
>> > *custom_funcs);
>>
>> Note this is line-wrapped.
>>
>> Looks like you need to get get-send-email setup so you can avoid having
>> the patch sending problems.
>>
>> >
>> > struct powerdomain *pwrdm_lookup(const char *name);
>>
>> In any case, with Paul's ack, I can queue this with the others.
>
> Normally I would wait for the .39 merge window with something like this,
> but you're welcome to queue it for the -rc fixes if you feel it's
> appropriate:
Yeah, I agree. I'll let you queue this one for .39 as it's not really a
fix.
Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* RE: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
2011-01-07 21:05 ` Kevin Hilman
@ 2011-01-19 14:20 ` Rajendra Nayak
-1 siblings, 0 replies; 48+ messages in thread
From: Rajendra Nayak @ 2011-01-19 14:20 UTC (permalink / raw)
To: Kevin Hilman
Cc: Paul Walmsley, Santosh Shilimkar, linux-omap, tony, linux-arm-kernel
Hi Kevin,
> -----Original Message-----
> From: Kevin Hilman [mailto:khilman@ti.com]
> Sent: Saturday, January 08, 2011 2:35 AM
> To: Rajendra Nayak
> Cc: Paul Walmsley; Santosh Shilimkar; linux-omap@vger.kernel.org;
tony@atomide.com; linux-arm-
> kernel@lists.infradead.org
> Subject: Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for
build break because of clktrctrl_mask
>
> Rajendra Nayak <rnayak@ti.com> writes:
>
> [...]
>
> > Just another trivial fix.
> >
> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> > From: Rajendra Nayak <rnayak@ti.com>
> > Date: Fri, 7 Jan 2011 14:07:25 +0530
> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
> >
> > Trivial fix to remove the unused function declaration
> > from the powerdomain header.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > ---
> > arch/arm/mach-omap2/powerdomain.h | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/powerdomain.h
> > b/arch/arm/mach-omap2/powerdomain.h
> > index c66431e..0b7a357 100644
> > --- a/arch/arm/mach-omap2/powerdomain.h
> > +++ b/arch/arm/mach-omap2/powerdomain.h
> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> > };
> >
> > -void pwrdm_fw_init(void);
> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> > *custom_funcs);
>
> Note this is line-wrapped.
>
> Looks like you need to get get-send-email setup so you can avoid having
> the patch sending problems.
Sorry, I seemed to have completely missed this one.
Will repost.
Thanks,
Rajendra
>
> >
> > struct powerdomain *pwrdm_lookup(const char *name);
>
> In any case, with Paul's ack, I can queue this with the others.
>
> Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
* [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask
@ 2011-01-19 14:20 ` Rajendra Nayak
0 siblings, 0 replies; 48+ messages in thread
From: Rajendra Nayak @ 2011-01-19 14:20 UTC (permalink / raw)
To: linux-arm-kernel
Hi Kevin,
> -----Original Message-----
> From: Kevin Hilman [mailto:khilman at ti.com]
> Sent: Saturday, January 08, 2011 2:35 AM
> To: Rajendra Nayak
> Cc: Paul Walmsley; Santosh Shilimkar; linux-omap at vger.kernel.org;
tony at atomide.com; linux-arm-
> kernel at lists.infradead.org
> Subject: Re: [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for
build break because of clktrctrl_mask
>
> Rajendra Nayak <rnayak@ti.com> writes:
>
> [...]
>
> > Just another trivial fix.
> >
> > From bb46b74d2b0ab3d35e72b760da7e123a891e6813 Mon Sep 17 00:00:00 2001
> > From: Rajendra Nayak <rnayak@ti.com>
> > Date: Fri, 7 Jan 2011 14:07:25 +0530
> > Subject: [PATCH] OMAP: powerdomain: remove unused func declaration
> >
> > Trivial fix to remove the unused function declaration
> > from the powerdomain header.
> >
> > Signed-off-by: Rajendra Nayak <rnayak@ti.com>
> > ---
> > arch/arm/mach-omap2/powerdomain.h | 1 -
> > 1 files changed, 0 insertions(+), 1 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/powerdomain.h
> > b/arch/arm/mach-omap2/powerdomain.h
> > index c66431e..0b7a357 100644
> > --- a/arch/arm/mach-omap2/powerdomain.h
> > +++ b/arch/arm/mach-omap2/powerdomain.h
> > @@ -165,7 +165,6 @@ struct pwrdm_ops {
> > int (*pwrdm_wait_transition)(struct powerdomain *pwrdm);
> > };
> >
> > -void pwrdm_fw_init(void);
> > void pwrdm_init(struct powerdomain **pwrdm_list, struct pwrdm_ops
> > *custom_funcs);
>
> Note this is line-wrapped.
>
> Looks like you need to get get-send-email setup so you can avoid having
> the patch sending problems.
Sorry, I seemed to have completely missed this one.
Will repost.
Thanks,
Rajendra
>
> >
> > struct powerdomain *pwrdm_lookup(const char *name);
>
> In any case, with Paul's ack, I can queue this with the others.
>
> Kevin
^ permalink raw reply [flat|nested] 48+ messages in thread
end of thread, other threads:[~2011-01-19 14:20 UTC | newest]
Thread overview: 48+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-05 10:57 [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask Santosh Shilimkar
2011-01-05 10:57 ` Santosh Shilimkar
2011-01-05 10:57 ` [PATCH v2 2/5] omap2plus: prm: Trvial build break fix for undefined reference to 'omap2_prm_read_mod_reg' Santosh Shilimkar
2011-01-05 10:57 ` Santosh Shilimkar
2011-01-06 14:32 ` Premi, Sanjeev
2011-01-06 14:32 ` Premi, Sanjeev
2011-01-06 14:38 ` Santosh Shilimkar
2011-01-06 14:38 ` Santosh Shilimkar
2011-01-06 18:09 ` Kevin Hilman
2011-01-06 18:09 ` Kevin Hilman
2011-01-06 17:58 ` Paul Walmsley
2011-01-06 17:58 ` Paul Walmsley
2011-01-07 8:43 ` Santosh Shilimkar
2011-01-07 8:43 ` Santosh Shilimkar
2011-01-07 11:14 ` Santosh Shilimkar
2011-01-07 11:14 ` Santosh Shilimkar
2011-01-07 21:14 ` Kevin Hilman
2011-01-07 21:14 ` Kevin Hilman
2011-01-07 21:22 ` Santosh Shilimkar
2011-01-07 21:22 ` Santosh Shilimkar
2011-01-05 10:57 ` [PATCH v2 3/5] omap2plus: voltage: Trivial warning fix 'no return statement' Santosh Shilimkar
2011-01-05 10:57 ` Santosh Shilimkar
2011-01-05 10:57 ` [PATCH v2 4/5] omap2plus: voltage: Trivial linking fix 'undefined reference' Santosh Shilimkar
2011-01-05 10:57 ` Santosh Shilimkar
2011-01-05 10:57 ` [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for 'EINVAL' undeclared Santosh Shilimkar
2011-01-05 10:57 ` Santosh Shilimkar
2011-01-05 11:19 ` Russell King - ARM Linux
2011-01-05 11:19 ` Russell King - ARM Linux
2011-01-05 11:36 ` [PATCH v2 5/5] omap2plus: voltage: Trivial linking fix for'EINVAL' undeclared Santosh Shilimkar
2011-01-05 11:36 ` Santosh Shilimkar
2011-01-05 17:43 ` [PATCH v2 1/5] omap2plus: clockdomain: Trivial fix for build break because of clktrctrl_mask Kevin Hilman
2011-01-05 17:43 ` Kevin Hilman
2011-01-06 18:02 ` Paul Walmsley
2011-01-06 18:02 ` Paul Walmsley
2011-01-06 18:28 ` Kevin Hilman
2011-01-06 18:28 ` Kevin Hilman
2011-01-07 8:40 ` Rajendra Nayak
2011-01-07 8:40 ` Rajendra Nayak
2011-01-07 21:05 ` Kevin Hilman
2011-01-07 21:05 ` Kevin Hilman
2011-01-10 19:16 ` Paul Walmsley
2011-01-10 19:16 ` Paul Walmsley
2011-01-11 1:31 ` Kevin Hilman
2011-01-11 1:31 ` Kevin Hilman
2011-01-19 14:20 ` Rajendra Nayak
2011-01-19 14:20 ` Rajendra Nayak
2011-01-06 17:59 ` Paul Walmsley
2011-01-06 17:59 ` Paul Walmsley
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.