[0/9] omap randconfig fixes for v3.3

Submitted by mathieu.poirier@linaro.org on March 23, 2012, 5:13 p.m.

Details

Message ID 1332522836-29517-1-git-send-email-mathieu.poirier@linaro.org
State New
Headers show

Pull-request

git://git.linaro.org/people/mpoirier/linux.git randconfig-omap

Commit Message

mathieu.poirier@linaro.org March 23, 2012, 5:13 p.m.
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:

  Linux 3.3 (2012-03-18 16:15:34 -0700)

are available in the git repository at:
  git://git.linaro.org/people/mpoirier/linux.git randconfig-omap
 

Arnd Bergmann (8):
  arm/omap: enable building omap2 without omap2420/2430
  omap: fix visibility of omap2_mbox_iva_priv
  ARM: omap2+: fix building without i2c
  tty/serial/omap: console can only be built-in
  omap2: select twl4030 support on boards that need it
  omap2plus: ensure that one of omap2/3/4 is selected
  arm: OMAP depends on MMU
  ARM: omap: select CPU_FREQ_TABLE where needed

Russell King (1):
  ARM: omap2/n8x0: work around modular omap mmc

 arch/arm/Kconfig                           |    1 +
 arch/arm/mach-omap2/Kconfig                |   19 +++++++++++++++++++
 arch/arm/mach-omap2/board-n8x0.c           |    6 ++++--
 arch/arm/mach-omap2/mailbox.c              |    2 +-
 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 +-
 arch/arm/plat-omap/Kconfig                 |    5 +++++
 arch/arm/plat-omap/include/plat/multi.h    |    5 +++++
 drivers/tty/serial/Kconfig                 |    2 +-
 11 files changed, 40 insertions(+), 8 deletions(-)

Comments

Tony Lindgren March 23, 2012, 5:22 p.m.
* mathieu.poirier@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
Tony Lindgren March 23, 2012, 5:28 p.m.
* mathieu.poirier@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
Tony Lindgren March 23, 2012, 5:29 p.m.
* mathieu.poirier@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
Arnd Bergmann March 23, 2012, 5:38 p.m.
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
Tony Lindgren March 23, 2012, 6:14 p.m.
* 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
Tony Lindgren March 23, 2012, 6:27 p.m.
* mathieu.poirier@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
>
Tony Lindgren March 23, 2012, 6:30 p.m.
* mathieu.poirier@linaro.org <mathieu.poirier@linaro.org> [120323 10:16]:
> 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.

I think this got fixed with 655850ed (ARM: OMAP2: fix mailbox init code).

Tony
Tony Lindgren March 23, 2012, 6:33 p.m.
* mathieu.poirier@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@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
>
Russell King - ARM Linux March 24, 2012, 9:23 a.m.
On Fri, Mar 23, 2012 at 11:13:50AM -0600, mathieu.poirier@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@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Kevin Hilman March 26, 2012, 11:09 p.m.
Tony Lindgren <tony@atomide.com> writes:

> * mathieu.poirier@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
Tony Lindgren March 29, 2012, 5:28 p.m.
Mathieu,

* mathieu.poirier@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
Tony Lindgren May 7, 2012, 7:07 p.m.
* Tony Lindgren <tony@atomide.com> [120329 10:31]:
> Mathieu,
> 
> * mathieu.poirier@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