* [PATCH 1/9] arm/omap: enable building omap2 without omap2420/2430
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 2/9] omap: fix visibility of omap2_mbox_iva_priv mathieu.poirier at linaro.org
` (8 subsequent siblings)
9 siblings, 0 replies; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
Kconfig allows selecting CONFIG_OMAP2 but no specific SOC, the options
being omap2420 and omap2430, but that leads to a build error when
omap3 or omap4 are also enabled and the MULTI_OMAP2 symbol is
undefined.
This adds another clause to plat/multi.h, mainly to allow all
possible randconfig combinations to build cleanly.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/plat-omap/include/plat/multi.h | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/include/plat/multi.h b/arch/arm/plat-omap/include/plat/multi.h
index 999ffba..fb7f196 100644
--- a/arch/arm/plat-omap/include/plat/multi.h
+++ b/arch/arm/plat-omap/include/plat/multi.h
@@ -82,6 +82,11 @@
# define OMAP_NAME omap2430
# endif
#endif
+#ifdef CONFIG_ARCH_OMAP2
+# ifndef OMAP_NAME
+# define OMAP_NAME omap2
+# endif
+#endif
#ifdef CONFIG_ARCH_OMAP3
# ifdef OMAP_NAME
# undef MULTI_OMAP2
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 2/9] omap: fix visibility of omap2_mbox_iva_priv
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 1/9] arm/omap: enable building omap2 without omap2420/2430 mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 18:30 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc mathieu.poirier at linaro.org
` (7 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
map2_mbox_iva_priv is used on multiple omap2 socs but is hidden
in an outdated #ifdef that is specific to a single soc.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
---
arch/arm/mach-omap2/mailbox.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/mach-omap2/mailbox.c b/arch/arm/mach-omap2/mailbox.c
index 415a6f1..ef01f6c 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -258,7 +258,7 @@ struct omap_mbox mbox_dsp_info = {
struct omap_mbox *omap3_mboxes[] = { &mbox_dsp_info, NULL };
#endif
-#if defined(CONFIG_SOC_OMAP2420)
+#if defined(CONFIG_ARCH_OMAP2)
/* IVA */
static struct omap_mbox2_priv omap2_mbox_iva_priv = {
.tx_fifo = {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 1/9] arm/omap: enable building omap2 without omap2420/2430 mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 2/9] omap: fix visibility of omap2_mbox_iva_priv mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:29 ` Tony Lindgren
2012-03-24 9:23 ` Russell King - ARM Linux
2012-03-23 17:13 ` [PATCH 4/9] ARM: omap2+: fix building without i2c mathieu.poirier at linaro.org
` (6 subsequent siblings)
9 siblings, 2 replies; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Russell King <linux@arm.linux.org.uk>
When the omap driver is built as a module for n8x0,
n8x0_mmc_set_power_menelaus cannot call into the driver:
arch/arm/mach-omap2/board-n8x0.c:374: undefined reference
to `omap_mmc_notify_cover_event'
As a workaround, do not provide that device in this case. This needs
to be fixed properly, e.g. by converting n8x0 to be probed through the
device tree and moving that code into the driver.
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Suggested-by: Russell King <linux@arm.linux.org.uk>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/board-n8x0.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
index 6722627..8529ca0 100644
--- a/arch/arm/mach-omap2/board-n8x0.c
+++ b/arch/arm/mach-omap2/board-n8x0.c
@@ -193,8 +193,10 @@ static struct omap_onenand_platform_data board_onenand_data[] = {
};
#endif
-#if defined(CONFIG_MENELAUS) && \
- (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))
+#ifdef CONFIG_MMC_OMAP_MODULE
+#warning FIXME: cannot call omap_mmc_notify_cover_event for CONFIG_MMC_OMAP_MODULE
+#endif
+#if defined(CONFIG_MENELAUS) && (defined(CONFIG_MMC_OMAP)
/*
* On both N800 and N810, only the first of the two MMC controllers is in use.
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc
2012-03-23 17:13 ` [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc mathieu.poirier at linaro.org
@ 2012-03-23 17:29 ` Tony Lindgren
2012-03-24 9:23 ` Russell King - ARM Linux
1 sibling, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 17:29 UTC (permalink / raw)
To: linux-arm-kernel
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> From: Russell King <linux@arm.linux.org.uk>
>
> When the omap driver is built as a module for n8x0,
> n8x0_mmc_set_power_menelaus cannot call into the driver:
>
> arch/arm/mach-omap2/board-n8x0.c:374: undefined reference
> to `omap_mmc_notify_cover_event'
>
> As a workaround, do not provide that device in this case. This needs
> to be fixed properly, e.g. by converting n8x0 to be probed through the
> device tree and moving that code into the driver.
This too should be fixed now in a way where just the cover events
won't work if compiled as a module.
Regards,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc
2012-03-23 17:13 ` [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc mathieu.poirier at linaro.org
2012-03-23 17:29 ` Tony Lindgren
@ 2012-03-24 9:23 ` Russell King - ARM Linux
1 sibling, 0 replies; 22+ messages in thread
From: Russell King - ARM Linux @ 2012-03-24 9:23 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Mar 23, 2012 at 11:13:50AM -0600, mathieu.poirier at linaro.org wrote:
> From: Russell King <linux@arm.linux.org.uk>
This is wrong. I am not the author of this patch.
> When the omap driver is built as a module for n8x0,
> n8x0_mmc_set_power_menelaus cannot call into the driver:
>
> arch/arm/mach-omap2/board-n8x0.c:374: undefined reference
> to `omap_mmc_notify_cover_event'
>
> As a workaround, do not provide that device in this case. This needs
> to be fixed properly, e.g. by converting n8x0 to be probed through the
> device tree and moving that code into the driver.
>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Suggested-by: Russell King <linux@arm.linux.org.uk>
> Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/board-n8x0.c | 6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/board-n8x0.c b/arch/arm/mach-omap2/board-n8x0.c
> index 6722627..8529ca0 100644
> --- a/arch/arm/mach-omap2/board-n8x0.c
> +++ b/arch/arm/mach-omap2/board-n8x0.c
> @@ -193,8 +193,10 @@ static struct omap_onenand_platform_data board_onenand_data[] = {
> };
> #endif
>
> -#if defined(CONFIG_MENELAUS) && \
> - (defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE))
> +#ifdef CONFIG_MMC_OMAP_MODULE
> +#warning FIXME: cannot call omap_mmc_notify_cover_event for CONFIG_MMC_OMAP_MODULE
> +#endif
> +#if defined(CONFIG_MENELAUS) && (defined(CONFIG_MMC_OMAP)
>
> /*
> * On both N800 and N810, only the first of the two MMC controllers is in use.
> --
> 1.7.5.4
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 4/9] ARM: omap2+: fix building without i2c
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (2 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 3/9] ARM: omap2/n8x0: work around modular omap mmc mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:22 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 5/9] tty/serial/omap: console can only be built-in mathieu.poirier at linaro.org
` (5 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
A trivial typo causes build breakage when I2C is disabled
and omap_i2c_reset is set to NULL on OMAP:
omap_hwmod_44xx_data.c:2287:11: error: lvalue required as unary '&' operand
Removing the '&' character solves this.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Avinash.H.M <avinashhm@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
---
arch/arm/mach-omap2/omap_hwmod_2420_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_2430_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 2 +-
arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod_2420_data.c b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
index a5409ce..d74c76f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2420_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2420_data.c
@@ -1038,7 +1038,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_2430_data.c b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
index c4f56cb..69c91b3 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_2430_data.c
@@ -1088,7 +1088,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 3c8dd92..d8eb79f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@ -1367,7 +1367,7 @@ static struct omap_hwmod_class i2c_class = {
.name = "i2c",
.sysc = &i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_1,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_hwmod_dma_info omap3xxx_dss_sdma_chs[] = {
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
index ef0524c..9adf749 100644
--- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c
@@ -2258,7 +2258,7 @@ static struct omap_hwmod_class omap44xx_i2c_hwmod_class = {
.name = "i2c",
.sysc = &omap44xx_i2c_sysc,
.rev = OMAP_I2C_IP_VERSION_2,
- .reset = &omap_i2c_reset,
+ .reset = omap_i2c_reset,
};
static struct omap_i2c_dev_attr i2c_dev_attr = {
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 4/9] ARM: omap2+: fix building without i2c
2012-03-23 17:13 ` [PATCH 4/9] ARM: omap2+: fix building without i2c mathieu.poirier at linaro.org
@ 2012-03-23 17:22 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 17:22 UTC (permalink / raw)
To: linux-arm-kernel
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> From: Arnd Bergmann <arnd@arndb.de>
>
> A trivial typo causes build breakage when I2C is disabled
> and omap_i2c_reset is set to NULL on OMAP:
>
> omap_hwmod_44xx_data.c:2287:11: error: lvalue required as unary '&' operand
>
> Removing the '&' character solves this.
We are now building in the omap_i2c_reset always, so this
should be revalidated. We currently don't have NULL version
of omap_i2c_reset any longer, so those '&' for functions are
mostly cosmetic right now.
Anyways, at least the commit message should be changed to
be current.
Regards,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 5/9] tty/serial/omap: console can only be built-in
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (3 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 4/9] ARM: omap2+: fix building without i2c mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 18:33 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 6/9] omap2: select twl4030 support on boards that need it mathieu.poirier at linaro.org
` (4 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
When the omap serial driver is built as a module, we must
not allow the console driver to be selected, because consoles
can not be loadable modules.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Govindraj.R <govindraj.raja@ti.com>
---
drivers/tty/serial/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
index 2de9924..bcf7e24 100644
--- a/drivers/tty/serial/Kconfig
+++ b/drivers/tty/serial/Kconfig
@@ -1041,7 +1041,7 @@ config SERIAL_OMAP
config SERIAL_OMAP_CONSOLE
bool "Console on OMAP serial port"
- depends on SERIAL_OMAP
+ depends on SERIAL_OMAP=y
select SERIAL_CORE_CONSOLE
help
Select this option if you would like to use omap serial port as
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 5/9] tty/serial/omap: console can only be built-in
2012-03-23 17:13 ` [PATCH 5/9] tty/serial/omap: console can only be built-in mathieu.poirier at linaro.org
@ 2012-03-23 18:33 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 18:33 UTC (permalink / raw)
To: linux-arm-kernel
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When the omap serial driver is built as a module, we must
> not allow the console driver to be selected, because consoles
> can not be loadable modules.
Looks valid to me, this should get posted and merged via
linux-serial at vger.kernel.org.
Tony
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Acked-by: Govindraj.R <govindraj.raja@ti.com>
> ---
> drivers/tty/serial/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig
> index 2de9924..bcf7e24 100644
> --- a/drivers/tty/serial/Kconfig
> +++ b/drivers/tty/serial/Kconfig
> @@ -1041,7 +1041,7 @@ config SERIAL_OMAP
>
> config SERIAL_OMAP_CONSOLE
> bool "Console on OMAP serial port"
> - depends on SERIAL_OMAP
> + depends on SERIAL_OMAP=y
> select SERIAL_CORE_CONSOLE
> help
> Select this option if you would like to use omap serial port as
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 6/9] omap2: select twl4030 support on boards that need it
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (4 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 5/9] tty/serial/omap: console can only be built-in mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected mathieu.poirier at linaro.org
` (3 subsequent siblings)
9 siblings, 0 replies; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
These three boards unconditionally use the twl4030 driver
from the board-zoom-display.c file. Make sure that the driver
is always there.
We also need to select the I2C core so we are able to build
that driver.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/Kconfig | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index e20c8ab..0279e9e 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -265,6 +265,9 @@ config MACH_OMAP_ZOOM2
select SERIAL_CORE_CONSOLE
select SERIAL_8250_CONSOLE
select REGULATOR_FIXED_VOLTAGE if REGULATOR
+ select TWL4030_CORE
+ select MFD_SUPPORT
+ select I2C
config MACH_OMAP_ZOOM3
bool "OMAP3630 Zoom3 board"
@@ -275,6 +278,9 @@ config MACH_OMAP_ZOOM3
select SERIAL_CORE_CONSOLE
select SERIAL_8250_CONSOLE
select REGULATOR_FIXED_VOLTAGE if REGULATOR
+ select TWL4030_CORE
+ select MFD_SUPPORT
+ select I2C
config MACH_CM_T35
bool "CompuLab CM-T35/CM-T3730 modules"
@@ -316,6 +322,9 @@ config MACH_OMAP_3630SDP
depends on ARCH_OMAP3
default y
select OMAP_PACKAGE_CBP
+ select TWL4030_CORE
+ select MFD_SUPPORT
+ select I2C
config MACH_TI8168EVM
bool "TI8168 Evaluation Module"
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (5 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 6/9] omap2: select twl4030 support on boards that need it mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:28 ` Tony Lindgren
2012-03-23 17:13 ` [PATCH 8/9] arm: OMAP depends on MMU mathieu.poirier at linaro.org
` (2 subsequent siblings)
9 siblings, 1 reply; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
Random configurations can fail if none of the omap families
in mach-omap2 is selected. This patch automatically selects
omap2 if the user has not made any other choice.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/mach-omap2/Kconfig | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 0279e9e..b244e80 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -55,6 +55,16 @@ config ARCH_OMAP4
select USB_ARCH_HAS_EHCI
select ARM_CPU_SUSPEND if PM
+config ARCH_OMAP2_AUTO
+ bool
+ depends on !ARCH_OMAP3 && !ARCH_OMAP4
+ select ARCH_OMAP2
+ default y
+ help
+ At least one of OMAP2/OMAP3/OMAP4 needs to be enabled, this
+ selects OMAP2 if nothing else gets selected, to avoid non-building
+ configurations.
+
comment "OMAP Core Type"
depends on ARCH_OMAP2
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected
2012-03-23 17:13 ` [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected mathieu.poirier at linaro.org
@ 2012-03-23 17:28 ` Tony Lindgren
2012-03-23 17:38 ` Arnd Bergmann
0 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 17:28 UTC (permalink / raw)
To: linux-arm-kernel
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Random configurations can fail if none of the omap families
> in mach-omap2 is selected. This patch automatically selects
> omap2 if the user has not made any other choice.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
> Acked-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/mach-omap2/Kconfig | 10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
> index 0279e9e..b244e80 100644
> --- a/arch/arm/mach-omap2/Kconfig
> +++ b/arch/arm/mach-omap2/Kconfig
> @@ -55,6 +55,16 @@ config ARCH_OMAP4
> select USB_ARCH_HAS_EHCI
> select ARM_CPU_SUSPEND if PM
>
> +config ARCH_OMAP2_AUTO
> + bool
> + depends on !ARCH_OMAP3 && !ARCH_OMAP4
> + select ARCH_OMAP2
> + default y
> + help
> + At least one of OMAP2/OMAP3/OMAP4 needs to be enabled, this
> + selects OMAP2 if nothing else gets selected, to avoid non-building
> + configurations.
> +
> comment "OMAP Core Type"
> depends on ARCH_OMAP2
Hmm yeah omap2 makes the smallest build, so randconfig builds
faster than it would for omap3 or 4.
But isn't there now still a chance that randconfig does not
select ARCH_OMAP2_AUTO either?
Regards,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected
2012-03-23 17:28 ` Tony Lindgren
@ 2012-03-23 17:38 ` Arnd Bergmann
2012-03-23 18:14 ` Tony Lindgren
0 siblings, 1 reply; 22+ messages in thread
From: Arnd Bergmann @ 2012-03-23 17:38 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 23 March 2012, Tony Lindgren wrote:
> >
> > +config ARCH_OMAP2_AUTO
> > + bool
> > + depends on !ARCH_OMAP3 && !ARCH_OMAP4
> > + select ARCH_OMAP2
> > + default y
> > + help
> > + At least one of OMAP2/OMAP3/OMAP4 needs to be enabled, this
> > + selects OMAP2 if nothing else gets selected, to avoid non-building
> > + configurations.
> > +
> > comment "OMAP Core Type"
> > depends on ARCH_OMAP2
>
> Hmm yeah omap2 makes the smallest build, so randconfig builds
> faster than it would for omap3 or 4.
>
> But isn't there now still a chance that randconfig does not
> select ARCH_OMAP2_AUTO either?
No. ARCH_OMAP2_AUTO is only disabled if one of OMAP3 or OMAP4
are enabled.
Arnd
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected
2012-03-23 17:38 ` Arnd Bergmann
@ 2012-03-23 18:14 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 18:14 UTC (permalink / raw)
To: linux-arm-kernel
* Arnd Bergmann <arnd@arndb.de> [120323 10:40]:
> On Friday 23 March 2012, Tony Lindgren wrote:
> > >
> > > +config ARCH_OMAP2_AUTO
> > > + bool
> > > + depends on !ARCH_OMAP3 && !ARCH_OMAP4
> > > + select ARCH_OMAP2
> > > + default y
> > > + help
> > > + At least one of OMAP2/OMAP3/OMAP4 needs to be enabled, this
> > > + selects OMAP2 if nothing else gets selected, to avoid non-building
> > > + configurations.
> > > +
> > > comment "OMAP Core Type"
> > > depends on ARCH_OMAP2
> >
> > Hmm yeah omap2 makes the smallest build, so randconfig builds
> > faster than it would for omap3 or 4.
> >
> > But isn't there now still a chance that randconfig does not
> > select ARCH_OMAP2_AUTO either?
>
> No. ARCH_OMAP2_AUTO is only disabled if one of OMAP3 or OMAP4
> are enabled.
And then no description in bool keeps it hidden from selection.
Nice, this works. Too bad these got forgotten in your branch.
Regards,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 8/9] arm: OMAP depends on MMU
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (6 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 7/9] omap2plus: ensure that one of omap2/3/4 is selected mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 17:13 ` [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed mathieu.poirier at linaro.org
2012-03-29 17:28 ` [PATCH 0/9] omap randconfig fixes for v3.3 Tony Lindgren
9 siblings, 0 replies; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
There is no way to build OMAP kernels without an MMU
at this point because of dependencies on MMU-only functions.
As long as nobody is interested in fixing this, let's just disable
this platforms for nommu kernels.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/Kconfig | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dfb0312..8124ce0 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -939,6 +939,7 @@ config ARCH_DAVINCI
config ARCH_OMAP
bool "TI OMAP"
+ depends on MMU
select HAVE_CLK
select ARCH_REQUIRE_GPIOLIB
select ARCH_HAS_CPUFREQ
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (7 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 8/9] arm: OMAP depends on MMU mathieu.poirier at linaro.org
@ 2012-03-23 17:13 ` mathieu.poirier at linaro.org
2012-03-23 18:27 ` Tony Lindgren
2012-03-29 17:28 ` [PATCH 0/9] omap randconfig fixes for v3.3 Tony Lindgren
9 siblings, 1 reply; 22+ messages in thread
From: mathieu.poirier at linaro.org @ 2012-03-23 17:13 UTC (permalink / raw)
To: linux-arm-kernel
From: Arnd Bergmann <arnd@arndb.de>
The omap platform requires CPU_FREQ_TABLE support to be enabled for its
CPU_FREQ implementations, so automatically select that when CPU_FREQ
is enabled.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
---
arch/arm/plat-omap/Kconfig | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index aa59f42..1983d16 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -207,6 +207,11 @@ config OMAP_PM_NOOP
endchoice
+config OMAP_CPU_FREQ
+ def_bool "y"
+ depends on CPU_FREQ
+ select CPU_FREQ_TABLE
+
endmenu
endif
--
1.7.5.4
^ permalink raw reply related [flat|nested] 22+ messages in thread* [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed
2012-03-23 17:13 ` [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed mathieu.poirier at linaro.org
@ 2012-03-23 18:27 ` Tony Lindgren
2012-03-26 23:09 ` Kevin Hilman
0 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2012-03-23 18:27 UTC (permalink / raw)
To: linux-arm-kernel
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:17]:
> From: Arnd Bergmann <arnd@arndb.de>
>
> The omap platform requires CPU_FREQ_TABLE support to be enabled for its
> CPU_FREQ implementations, so automatically select that when CPU_FREQ
> is enabled.
I think this is also solved now, Kevin might be able to confirm this.
Regards,
Tony
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Mathieu Poirier <mathieu.poirier@linaro.org>
> ---
> arch/arm/plat-omap/Kconfig | 5 +++++
> 1 files changed, 5 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
> index aa59f42..1983d16 100644
> --- a/arch/arm/plat-omap/Kconfig
> +++ b/arch/arm/plat-omap/Kconfig
> @@ -207,6 +207,11 @@ config OMAP_PM_NOOP
>
> endchoice
>
> +config OMAP_CPU_FREQ
> + def_bool "y"
> + depends on CPU_FREQ
> + select CPU_FREQ_TABLE
> +
> endmenu
>
> endif
> --
> 1.7.5.4
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed
2012-03-23 18:27 ` Tony Lindgren
@ 2012-03-26 23:09 ` Kevin Hilman
0 siblings, 0 replies; 22+ messages in thread
From: Kevin Hilman @ 2012-03-26 23:09 UTC (permalink / raw)
To: linux-arm-kernel
Tony Lindgren <tony@atomide.com> writes:
> * mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:17]:
>> From: Arnd Bergmann <arnd@arndb.de>
>>
>> The omap platform requires CPU_FREQ_TABLE support to be enabled for its
>> CPU_FREQ implementations, so automatically select that when CPU_FREQ
>> is enabled.
>
> I think this is also solved now, Kevin might be able to confirm this.
Yes, this is solved in mainline by selecting it from
drivers/cpufreq/Kconfig.arm
Kevin
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 0/9] omap randconfig fixes for v3.3
2012-03-23 17:13 [PATCH 0/9] omap randconfig fixes for v3.3 mathieu.poirier at linaro.org
` (8 preceding siblings ...)
2012-03-23 17:13 ` [PATCH 9/9] ARM: omap: select CPU_FREQ_TABLE where needed mathieu.poirier at linaro.org
@ 2012-03-29 17:28 ` Tony Lindgren
2012-05-07 19:07 ` Tony Lindgren
9 siblings, 1 reply; 22+ messages in thread
From: Tony Lindgren @ 2012-03-29 17:28 UTC (permalink / raw)
To: linux-arm-kernel
Mathieu,
* mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> From: "Arnd Bergmann" <arnd@arndb.de>
>
> The following is a set of patches that have been sent
> out during the 3.1 cycle that were not acked or merged.
>
> Sending again for completeness.
>
> Tony, please pull if there are no objections:
>
> The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:
Can you please drop the already fixed ones and post
a new pull request?
It seems that these should merge fine to current mainline
if based on v3.3. If not, then maybe use the linux-omap fixes
branch as the base that I've just pushed at commit 2533c2cf.
Thanks,
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread* [PATCH 0/9] omap randconfig fixes for v3.3
2012-03-29 17:28 ` [PATCH 0/9] omap randconfig fixes for v3.3 Tony Lindgren
@ 2012-05-07 19:07 ` Tony Lindgren
0 siblings, 0 replies; 22+ messages in thread
From: Tony Lindgren @ 2012-05-07 19:07 UTC (permalink / raw)
To: linux-arm-kernel
* Tony Lindgren <tony@atomide.com> [120329 10:31]:
> Mathieu,
>
> * mathieu.poirier at linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> > From: "Arnd Bergmann" <arnd@arndb.de>
> >
> > The following is a set of patches that have been sent
> > out during the 3.1 cycle that were not acked or merged.
> >
> > Sending again for completeness.
> >
> > Tony, please pull if there are no objections:
> >
> > The following changes since commit c16fa4f2ad19908a47c63d8fa436a1178438c7e7:
>
> Can you please drop the already fixed ones and post
> a new pull request?
>
> It seems that these should merge fine to current mainline
> if based on v3.3. If not, then maybe use the linux-omap fixes
> branch as the base that I've just pushed at commit 2533c2cf.
Ping, any news on updating the pull request for the remaining
comments?
Tony
^ permalink raw reply [flat|nested] 22+ messages in thread