[PATCH 00/62] arm-soc randconfig fixes

[PATCH 00/62] arm-soc randconfig fixes

[Arnd Bergmann]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 8283 bytes --]

Hi everyone,

This is my much too long series of mostly trivial build for ARM platform
code. It's about a third of the total set of patches I have in a local
tree that I use for build testing randconfig kernels. Most of the other
patches are for device drivers, but there is also a significant chunk
for ARM architecture code, and a few things that are controversial or
not yet properly fixed.

I'd like to put all or most of these into a branch in arm-soc for
the coming merge window. Acks are very much appreciated, as as
Naks when I got something wrong. Everything I don't hear back
from I will assume is ok and put in.

Statistically speaking, I probably made a couple of mistakes here,
so please have a look if you find the time.

Arnd Bergmann (62):
  ARM: at91: split out at91x40 into a top-level option
  ARM: at91: don't provide dt init code for at91x40
  ARM: at91: export sam9_smc interfaces
  ARM: at91: fix broken "if () else" statement
  ARM: at91: sama5 always uses DT
  ARM: davinci: export da8xx_syscfg0_base
  ARM: davinci: make dm644x-evm phy fixup conditional
  ARM: davinci: use explicit 'select' for DA850_EVM
  ARM: efm32: allow uncompress debug output
  ARM: efm32: select AUTO_ZRELADDR
  ARM: ep93xx: export ep93xx_chip_revision
  ARM: hisi: fix building without CONFIG_HOTPLUG_CPU
  ARM: hisi: select HAVE_ARM_SCU only for SMP
  ARM: imx: imx6q_set_lpm is only defined for CONFIG_PM=y
  ARM: ixp4xx/omixp: always include linux/leds.h
  ARM: ixp4xx: avoid use of PCIBIOS_MIN_MEM in io.h
  ARM: ixp4xx: fix gpio rework
  ARM: ks8695/og: make PCI setup conditional
  ARM: lpc32xx: export lpc32xx_return_iram_size
  ARM: msm: add missing include of linux/module.h
  ARM: msm: avoid calling debug_ll_addr on !MMU
  ARM: msm: export legacy DMA interfaces
  ARM: omap1: fix building without 32K_TIMER
  ARM: omap1: select I2C where needed for PMIC
  ARM: mvebu: add missing header
  ARM: mvebu: don't select CONFIG_NEON
  ARM: orion5x: make dns323 independent of PHY support
  ARM: pxa: FB_W100 must be built-in
  ARM: pxa: don't "select" SMC91X on MACH_XCEP
  ARM: pxa: enable pxafb unconditionally for some boards
  ARM: pxa: fix colibri build
  ARM: pxa: fix pxa_ssp_* declarations
  ARM: pxa: remove broken balloon3_gpio_vbus reference
  ARM: pxa: select I2C_GPIO only if I2C is on
  ARM: pxa: trizeps4 and trizeps4wl use the same file
  ARM: rpc: autoselect CPU_SA110
  ARM: sa1100/pxa: fix MTD_XIP build
  ARM: footbridge: don't build floppy code for addin mode
  ARM: footbridge: fix build with PCI disabled
  ARM: footbridge: make screen_info setup conditional
  ARM: realview: fix sparsemem build
  ARM: realview: use explicit core tile config options
  ARM: integrator: only select pl01x if TTY is enabled
  ARM: integrator: refine CPU selection
  ARM: s3c24xx: MINI2440 needs I2C for EEPROM_AT24
  ARM: s3c24xx: fix gta02 build error
  ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
  ARM: s3c64xx: select power domains only when used
  ARM: s5p64x0: fix building with only one soc type
  ARM: s5pv210: enable IDE support in MACH_TORBRECK
  ARM: samsung: allow serial driver to be disabled
  ARM: samsung: disable decompressor watchdog on exynos
  ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
  ARM: samsung: select ATAGS where necessary
  ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
  ARM: samsung: select I2C where needed for PMIC
  ARM: exynos: fix l2x0 saved regs handling
  ARM: exynos: add missing include of linux/module.h
  ARM: shmobile: ak4642 needs i2c support
  ARM: shmobile: work around CONFIG_PHYLIB=m
  ARM: sunxi: fix build for THUMB2_KERNEL
  ARM: tegra: make debug_ll code build for ARMv6

 arch/arm/Kconfig                             |  9 ++++-
 arch/arm/Kconfig.debug                       |  2 +-
 arch/arm/include/debug/tegra.S               | 18 ++++-----
 arch/arm/mach-at91/Kconfig                   | 23 +++++++++--
 arch/arm/mach-at91/Kconfig.non_dt            |  8 +---
 arch/arm/mach-at91/at91sam9260_devices.c     |  4 +-
 arch/arm/mach-at91/sam9_smc.c                |  3 ++
 arch/arm/mach-at91/setup.c                   |  2 +-
 arch/arm/mach-davinci/Kconfig                |  7 +---
 arch/arm/mach-davinci/board-dm644x-evm.c     | 11 +++---
 arch/arm/mach-davinci/devices-da8xx.c        |  1 +
 arch/arm/mach-ep93xx/core.c                  |  1 +
 arch/arm/mach-exynos/common.c                |  6 ++-
 arch/arm/mach-exynos/cpuidle.c               |  1 +
 arch/arm/mach-footbridge/Kconfig             |  2 +-
 arch/arm/mach-footbridge/Makefile            |  3 +-
 arch/arm/mach-footbridge/cats-hw.c           |  2 +
 arch/arm/mach-hisi/Kconfig                   |  2 +-
 arch/arm/mach-hisi/Makefile                  |  3 +-
 arch/arm/mach-hisi/hotplug.c                 |  2 +
 arch/arm/mach-imx/clk-imx6q.c                |  3 +-
 arch/arm/mach-imx/clk-imx6sl.c               |  3 +-
 arch/arm/mach-imx/cpuidle-imx6sl.c           |  3 ++
 arch/arm/mach-integrator/Kconfig             | 19 ++++++++--
 arch/arm/mach-ixp4xx/common.c                |  6 +--
 arch/arm/mach-ixp4xx/goramo_mlr.c            |  7 ++++
 arch/arm/mach-ixp4xx/include/mach/io.h       |  3 +-
 arch/arm/mach-ixp4xx/omixp-setup.c           |  2 -
 arch/arm/mach-ks8695/board-og.c              |  3 +-
 arch/arm/mach-lpc32xx/common.c               |  1 +
 arch/arm/mach-msm/dma.c                      |  3 ++
 arch/arm/mach-msm/io.c                       |  2 +
 arch/arm/mach-mvebu/Kconfig                  |  2 -
 arch/arm/mach-mvebu/board-v7.c               |  1 +
 arch/arm/mach-omap1/Kconfig                  |  4 ++
 arch/arm/mach-omap1/pm.c                     |  8 ++--
 arch/arm/mach-orion5x/Kconfig                |  1 -
 arch/arm/mach-orion5x/dns323-setup.c         |  2 +
 arch/arm/mach-pxa/Kconfig                    | 10 +++--
 arch/arm/mach-pxa/balloon3.c                 |  1 -
 arch/arm/mach-pxa/colibri-evalboard.c        |  1 +
 arch/arm/mach-pxa/include/mach/mtd-xip.h     |  7 ++--
 arch/arm/mach-pxa/irq.c                      |  8 ++++
 arch/arm/mach-realview/Kconfig               | 57 ++++++++++++++++++++++++++++
 arch/arm/mach-realview/include/mach/memory.h |  2 +
 arch/arm/mach-s3c24xx/Kconfig                |  3 +-
 arch/arm/mach-s3c24xx/mach-gta02.c           |  2 +-
 arch/arm/mach-s3c64xx/Kconfig                |  3 ++
 arch/arm/mach-s3c64xx/irq-pm.c               | 12 ++++--
 arch/arm/mach-s5p64x0/common.c               | 18 ++++++++-
 arch/arm/mach-s5p64x0/common.h               |  5 +--
 arch/arm/mach-s5p64x0/irq-pm.c               |  6 +++
 arch/arm/mach-s5pv210/Kconfig                |  1 +
 arch/arm/mach-sa1100/include/mach/mtd-xip.h  |  4 +-
 arch/arm/mach-shmobile/Kconfig               | 12 +++---
 arch/arm/mach-shmobile/board-koelsch.c       |  2 +-
 arch/arm/mach-shmobile/board-lager.c         |  2 +-
 arch/arm/mach-sunxi/headsmp.S                |  3 +-
 arch/arm/mm/Kconfig                          | 30 +++++++--------
 arch/arm/plat-samsung/Kconfig                |  7 ++--
 arch/arm/plat-samsung/init.c                 |  4 ++
 drivers/video/Kconfig                        |  4 +-
 include/linux/pxa2xx_ssp.h                   |  2 +-
 63 files changed, 276 insertions(+), 113 deletions(-)

-- 
1.8.3.2

Cc: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Sekhar Nori <nsekhar@ti.com>
Cc: Kevin Hilman <khilman@deeprootsystems.com>
Cc: Uwe Kleine-König <kernel@pengutronix.de>
Cc: Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Shawn Guo <shawn.guo@freescale.com>
Cc: Krzysztof Halasa <khc@pm.waw.pl>
Cc: David Brown <davidb@codeaurora.org>
Cc: linux-omap@vger.kernel.org
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Haojian Zhuang <haojian.zhuang@gmail.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Linus Walleij <linus.walleij@linaro.org>
Cc: Tomasz Figa <tomasz.figa@gmail.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Maxime Ripard <maxime.ripard@free-electrons.com>
Cc: Stephen Warren <swarren@wwwdotorg.org>

--
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

[PATCH 23/62] ARM: omap1: fix building without 32K_TIMER

[Arnd Bergmann]

If we enable CONFIG_OMAP_MPU_TIMER and CONFIG_OMAP_DM_TIMER but
not CONFIG_OMAP_32K_TIMER on OMAP1, we currently get this build error:

mach-omap1/pm.c: In function 'omap1_pm_idle':
mach-omap1/pm.c:123:9: error: 'enable_dyn_sleep' undeclared (first use in this function)
  while (enable_dyn_sleep) {
         ^
mach-omap1/pm.c:123:9: note: each undeclared identifier is reported only once for each function it appears in

This attempts to fix the #ifdef logic to deal with all combinations
of timers.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-omap@vger.kernel.org
Cc: Tony Lindgren <tony@atomide.com>
---
 arch/arm/mach-omap1/pm.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 40a1ae3..7dff68e 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -71,10 +71,10 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
-#ifdef CONFIG_OMAP_32K_TIMER
-
 static unsigned short enable_dyn_sleep = 1;
 
+#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
+
 static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
 			 char *buf)
 {
@@ -643,7 +643,7 @@ static const struct platform_suspend_ops omap_pm_ops = {
 static int __init omap_pm_init(void)
 {
 
-#ifdef CONFIG_OMAP_32K_TIMER
+#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
 	int error;
 #endif
 
@@ -700,7 +700,7 @@ static int __init omap_pm_init(void)
 	omap_pm_init_debugfs();
 #endif
 
-#ifdef CONFIG_OMAP_32K_TIMER
+#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
 	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);
 	if (error)
 		printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
-- 
1.8.3.2

[PATCH 24/62] ARM: omap1: select I2C where needed for PMIC

[Arnd Bergmann]

The OMAP H2, OSK and OSIRIS machines cannot build without
I2C and TPS65010 both enabled unconditionally.

In each case, failing to enable CONFIG_I2C results in a
build or link error, so most consistent solution is to
ensure that it is impossible to disable those options.

It would be nice to leave CONFIG_I2C as user-selectable,
but doing that properly would require more work.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Tony Lindgren <tony@atomide.com>
Cc: linux-omap@vger.kernel.org
---
 arch/arm/mach-omap1/Kconfig | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index cdd05f2..23ab1d5 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -44,6 +44,8 @@ config MACH_OMAP_INNOVATOR
 config MACH_OMAP_H2
 	bool "TI H2 Support"
 	depends on ARCH_OMAP1 && ARCH_OMAP16XX
+	select TPS65010
+	select I2C
     	help
 	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such
 	  a board.
@@ -64,6 +66,8 @@ config MACH_HERALD
 config MACH_OMAP_OSK
 	bool "TI OSK Support"
 	depends on ARCH_OMAP1 && ARCH_OMAP16XX
+	select TPS65010
+	select I2C
     	help
 	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
-- 
1.8.3.2

Re: [PATCH 23/62] ARM: omap1: fix building without 32K_TIMER

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 2461 bytes --]

Hi,

On Wed, Mar 19, 2014 at 08:29:20PM +0100, Arnd Bergmann wrote:
> If we enable CONFIG_OMAP_MPU_TIMER and CONFIG_OMAP_DM_TIMER but
> not CONFIG_OMAP_32K_TIMER on OMAP1, we currently get this build error:
> 
> mach-omap1/pm.c: In function 'omap1_pm_idle':
> mach-omap1/pm.c:123:9: error: 'enable_dyn_sleep' undeclared (first use in this function)
>   while (enable_dyn_sleep) {
>          ^
> mach-omap1/pm.c:123:9: note: each undeclared identifier is reported only once for each function it appears in
> 
> This attempts to fix the #ifdef logic to deal with all combinations
> of timers.
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: linux-omap@vger.kernel.org
> Cc: Tony Lindgren <tony@atomide.com>

I had sent a fix for months and months ago, what happened to it ?

> ---
>  arch/arm/mach-omap1/pm.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
> index 40a1ae3..7dff68e 100644
> --- a/arch/arm/mach-omap1/pm.c
> +++ b/arch/arm/mach-omap1/pm.c
> @@ -71,10 +71,10 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
>  static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
>  static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
>  
> -#ifdef CONFIG_OMAP_32K_TIMER
> -
>  static unsigned short enable_dyn_sleep = 1;
>  
> +#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
> +
>  static ssize_t idle_show(struct kobject *kobj, struct kobj_attribute *attr,
>  			 char *buf)
>  {
> @@ -643,7 +643,7 @@ static const struct platform_suspend_ops omap_pm_ops = {
>  static int __init omap_pm_init(void)
>  {
>  
> -#ifdef CONFIG_OMAP_32K_TIMER
> +#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
>  	int error;
>  #endif
>  
> @@ -700,7 +700,7 @@ static int __init omap_pm_init(void)
>  	omap_pm_init_debugfs();
>  #endif
>  
> -#ifdef CONFIG_OMAP_32K_TIMER
> +#if defined(CONFIG_OMAP_32K_TIMER) || defined(CONFIG_OMAP_MPU_TIMER)
>  	error = sysfs_create_file(power_kobj, &sleep_while_idle_attr.attr);
>  	if (error)
>  		printk(KERN_ERR "sysfs_create_file failed: %d\n", error);
> -- 
> 1.8.3.2
> 
> --
> 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

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 23/62] ARM: omap1: fix building without 32K_TIMER

[Felipe Balbi]

[-- Attachment #1: Type: text/plain, Size: 1030 bytes --]

On Wed, Mar 19, 2014 at 02:59:13PM -0500, Felipe Balbi wrote:
> Hi,
> 
> On Wed, Mar 19, 2014 at 08:29:20PM +0100, Arnd Bergmann wrote:
> > If we enable CONFIG_OMAP_MPU_TIMER and CONFIG_OMAP_DM_TIMER but
> > not CONFIG_OMAP_32K_TIMER on OMAP1, we currently get this build error:
> > 
> > mach-omap1/pm.c: In function 'omap1_pm_idle':
> > mach-omap1/pm.c:123:9: error: 'enable_dyn_sleep' undeclared (first use in this function)
> >   while (enable_dyn_sleep) {
> >          ^
> > mach-omap1/pm.c:123:9: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > This attempts to fix the #ifdef logic to deal with all combinations
> > of timers.
> > 
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > Cc: linux-omap@vger.kernel.org
> > Cc: Tony Lindgren <tony@atomide.com>
> 
> I had sent a fix for months and months ago, what happened to it ?

Here

http://marc.info/?l=linux-omap&m=138963632408031&w=2

Tony, did you forget to send a pull request ?

-- 
balbi

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 23/62] ARM: omap1: fix building without 32K_TIMER

[Tony Lindgren]

* Felipe Balbi <balbi@ti.com> [140319 13:06]:
> On Wed, Mar 19, 2014 at 02:59:13PM -0500, Felipe Balbi wrote:
> > Hi,
> > 
> > On Wed, Mar 19, 2014 at 08:29:20PM +0100, Arnd Bergmann wrote:
> > > If we enable CONFIG_OMAP_MPU_TIMER and CONFIG_OMAP_DM_TIMER but
> > > not CONFIG_OMAP_32K_TIMER on OMAP1, we currently get this build error:
> > > 
> > > mach-omap1/pm.c: In function 'omap1_pm_idle':
> > > mach-omap1/pm.c:123:9: error: 'enable_dyn_sleep' undeclared (first use in this function)
> > >   while (enable_dyn_sleep) {
> > >          ^
> > > mach-omap1/pm.c:123:9: note: each undeclared identifier is reported only once for each function it appears in
> > > 
> > > This attempts to fix the #ifdef logic to deal with all combinations
> > > of timers.
> > > 
> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> > > Cc: linux-omap@vger.kernel.org
> > > Cc: Tony Lindgren <tony@atomide.com>
> > 
> > I had sent a fix for months and months ago, what happened to it ?
> 
> Here
> 
> http://marc.info/?l=linux-omap&m=138963632408031&w=2
> 
> Tony, did you forget to send a pull request ?

Hmm yes weird, can't see it in my omap-for-v3.14/fixes branch.

I must have gotten interrupted while applying and then probably
ran git reset --hard before committing.

Arnd, maybe pick up Felipe's earlier patch instead?

Acked-by: Tony Lindgren <tony@atomide.com>

Re: [PATCH 24/62] ARM: omap1: select I2C where needed for PMIC

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [140319 12:33]:
> The OMAP H2, OSK and OSIRIS machines cannot build without
> I2C and TPS65010 both enabled unconditionally.
> 
> In each case, failing to enable CONFIG_I2C results in a
> build or link error, so most consistent solution is to
> ensure that it is impossible to disable those options.
> 
> It would be nice to leave CONFIG_I2C as user-selectable,
> but doing that properly would require more work.

We should not select drivers. How about let's just have
the tps65010 stuff behind an ifdef CONFIG_TPS65010 for
those boards?

Regards,

Tony
 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Cc: Tony Lindgren <tony@atomide.com>
> Cc: linux-omap@vger.kernel.org
> ---
>  arch/arm/mach-omap1/Kconfig | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
> index cdd05f2..23ab1d5 100644
> --- a/arch/arm/mach-omap1/Kconfig
> +++ b/arch/arm/mach-omap1/Kconfig
> @@ -44,6 +44,8 @@ config MACH_OMAP_INNOVATOR
>  config MACH_OMAP_H2
>  	bool "TI H2 Support"
>  	depends on ARCH_OMAP1 && ARCH_OMAP16XX
> +	select TPS65010
> +	select I2C
>      	help
>  	  TI OMAP 1610/1611B H2 board support. Say Y here if you have such
>  	  a board.
> @@ -64,6 +66,8 @@ config MACH_HERALD
>  config MACH_OMAP_OSK
>  	bool "TI OSK Support"
>  	depends on ARCH_OMAP1 && ARCH_OMAP16XX
> +	select TPS65010
> +	select I2C
>      	help
>  	  TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
>            if you have such a board.
> -- 
> 1.8.3.2
> 

Re: [PATCH 24/62] ARM: omap1: select I2C where needed for PMIC

[Arnd Bergmann]

On Wednesday 19 March 2014 13:46:19 Tony Lindgren wrote:
> * Arnd Bergmann <arnd@arndb.de> [140319 12:33]:
> > The OMAP H2, OSK and OSIRIS machines cannot build without
> > I2C and TPS65010 both enabled unconditionally.
> > 
> > In each case, failing to enable CONFIG_I2C results in a
> > build or link error, so most consistent solution is to
> > ensure that it is impossible to disable those options.
> > 
> > It would be nice to leave CONFIG_I2C as user-selectable,
> > but doing that properly would require more work.
> 
> We should not select drivers. How about let's just have
> the tps65010 stuff behind an ifdef CONFIG_TPS65010 for
> those boards?

Good idea. Like this?

	Arnd


diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index fd90caf..65d2acb 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -318,6 +318,9 @@ static void __init h2_init_smc91x(void)
 
 static int tps_setup(struct i2c_client *client, void *context)
 {
+	if (!IS_BUILTIN(CONFIG_TPS65010))
+		return -ENOSYS;
+	
 	tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V |
 				TPS_LDO1_ENABLE | TPS_VLDO1_3_0V);
 
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index d68909b..3a02621 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -191,6 +191,9 @@ static struct platform_device osk5912_tps_leds = {
 
 static int osk_tps_setup(struct i2c_client *client, void *context)
 {
+	if (!IS_BUILTIN(CONFIG_TPS65010))
+		return -ENOSYS;
+
 	/* Set GPIO 1 HIGH to disable VBUS power supply;
 	 * OHCI driver powers it up/down as needed.
 	 */

Re: [PATCH 24/62] ARM: omap1: select I2C where needed for PMIC

[Tony Lindgren]

* Arnd Bergmann <arnd@arndb.de> [140319 14:01]:
> On Wednesday 19 March 2014 13:46:19 Tony Lindgren wrote:
> > * Arnd Bergmann <arnd@arndb.de> [140319 12:33]:
> > > The OMAP H2, OSK and OSIRIS machines cannot build without
> > > I2C and TPS65010 both enabled unconditionally.
> > > 
> > > In each case, failing to enable CONFIG_I2C results in a
> > > build or link error, so most consistent solution is to
> > > ensure that it is impossible to disable those options.
> > > 
> > > It would be nice to leave CONFIG_I2C as user-selectable,
> > > but doing that properly would require more work.
> > 
> > We should not select drivers. How about let's just have
> > the tps65010 stuff behind an ifdef CONFIG_TPS65010 for
> > those boards?
> 
> Good idea. Like this?

Looks good to me :)

Acked-by: Tony Lindgren <tony@atomide.com>
 
> diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
> index fd90caf..65d2acb 100644
> --- a/arch/arm/mach-omap1/board-h2.c
> +++ b/arch/arm/mach-omap1/board-h2.c
> @@ -318,6 +318,9 @@ static void __init h2_init_smc91x(void)
>  
>  static int tps_setup(struct i2c_client *client, void *context)
>  {
> +	if (!IS_BUILTIN(CONFIG_TPS65010))
> +		return -ENOSYS;
> +	
>  	tps65010_config_vregs1(TPS_LDO2_ENABLE | TPS_VLDO2_3_0V |
>  				TPS_LDO1_ENABLE | TPS_VLDO1_3_0V);
>  
> diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
> index d68909b..3a02621 100644
> --- a/arch/arm/mach-omap1/board-osk.c
> +++ b/arch/arm/mach-omap1/board-osk.c
> @@ -191,6 +191,9 @@ static struct platform_device osk5912_tps_leds = {
>  
>  static int osk_tps_setup(struct i2c_client *client, void *context)
>  {
> +	if (!IS_BUILTIN(CONFIG_TPS65010))
> +		return -ENOSYS;
> +
>  	/* Set GPIO 1 HIGH to disable VBUS power supply;
>  	 * OHCI driver powers it up/down as needed.
>  	 */
> 
> --
> 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

Re: [PATCH 23/62] ARM: omap1: fix building without 32K_TIMER

[Arnd Bergmann]

On Wednesday 19 March 2014, Tony Lindgren wrote:
> * Felipe Balbi <balbi@ti.com> [140319 13:06]:
> > On Wed, Mar 19, 2014 at 02:59:13PM -0500, Felipe Balbi wrote:
> > > I had sent a fix for months and months ago, what happened to it ?
> > 
> > Here
> > 
> > http://marc.info/?l=linux-omap&m=138963632408031&w=2
> > 
> > Tony, did you forget to send a pull request ?
> 
> Hmm yes weird, can't see it in my omap-for-v3.14/fixes branch.
> 
> I must have gotten interrupted while applying and then probably
> ran git reset --hard before committing.
> 
> Arnd, maybe pick up Felipe's earlier patch instead?
> 
> Acked-by: Tony Lindgren <tony@atomide.com>

Ok, using this version now, thanks!

	Arnd

>From 64cdcf550319a37d1419aa6a87903e67b9d3d031 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <balbi@ti.com>
Date: Sun, 16 Mar 2014 17:57:55 +0100
Subject: [PATCH] ARM: omap1: fix build when !CONFIG_OMAP_32K_TIMER

If CONFIG_OMAP_32K_TIMER isn't enabled, we will
try to use enable_dyn_sleep which wasn't defined
anywhere.

In order to fix the problem, we always define
enable_dyn_sleep as 0 when !CONFIG_OMAP_32K_TIMER.

Signed-off-by: Felipe Balbi <balbi@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-omap1/pm.c b/arch/arm/mach-omap1/pm.c
index 40a1ae3..dbee729 100644
--- a/arch/arm/mach-omap1/pm.c
+++ b/arch/arm/mach-omap1/pm.c
@@ -71,7 +71,11 @@ static unsigned int mpui7xx_sleep_save[MPUI7XX_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
-#ifdef CONFIG_OMAP_32K_TIMER
+#ifndef CONFIG_OMAP_32K_TIMER
+
+static unsigned short enable_dyn_sleep = 0;
+
+#else
 
 static unsigned short enable_dyn_sleep = 1;