[rfc/rft/patch 0/9] omap warning cleanup

[rfc/rft/patch 0/9] omap warning cleanup

[Felipe Balbi]

The following series removes a few compile warnings from
omap builds. It was compile tested with all omap defconfigs
for the ones who have the boards, a boot test would be
nice, although there aren't any functional changes.

Felipe Balbi (9):
  arm: omap: kill compile warning in irq.c
  arm: omap: remove unused variables
  arm: omap: zoom: use vmmc1 regulator supply
  arm: omap: io: kill compile warning
  arm: omap: kill compile warning on board-4430-sdp.c
  arm: omap: gpio: kill compile warning in gpio.c
  arm: omap: innovator: kill compile warning on board-innovator.c
  arm: omap: perseus: kill compile warning on board-perseus2.c
  arm: omap: mailbox: kill compile warning in mailbox.c

 arch/arm/mach-omap2/board-4430sdp.c          |    4 ----
 arch/arm/mach-omap2/board-zoom-peripherals.c |    1 +
 arch/arm/mach-omap2/io.c                     |    2 ++
 arch/arm/mach-omap2/irq.c                    |    2 ++
 arch/arm/mach-omap2/mailbox.c                |    2 +-
 arch/arm/mach-omap2/omap_hwmod_2430.h        |    2 --
 arch/arm/plat-omap/gpio.c                    |    3 +++
 arch/arm/plat-omap/include/plat/fpga.h       |    4 ++--
 8 files changed, 11 insertions(+), 9 deletions(-)

[rfc/rft/patch 1/9] arm: omap: kill compile warning in irq.c

[Felipe Balbi]

intc_context is only used when omap3 is to be built,
so also put it under ifdef CONFIG_ARM_OMAP3 to avoid
the compile warning.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/irq.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c
index e9bc782..d370052 100644
--- a/arch/arm/mach-omap2/irq.c
+++ b/arch/arm/mach-omap2/irq.c
@@ -62,7 +62,9 @@ struct omap3_intc_regs {
 	u32 mir[INTCPS_NR_MIR_REGS];
 };
 
+#ifdef CONFIG_ARCH_OMAP3
 static struct omap3_intc_regs intc_context[ARRAY_SIZE(irq_banks)];
+#endif
 
 /* INTC bank register get/set */
 
-- 
1.6.6.rc0

[rfc/rft/patch 2/9] arm: omap: remove unused variables

[Felipe Balbi]

those are never used, remove it until we need to
actually use them to avoid the compile warning.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/omap_hwmod_2430.h |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/omap_hwmod_2430.h b/arch/arm/mach-omap2/omap_hwmod_2430.h
index 59a208b..49139ad 100644
--- a/arch/arm/mach-omap2/omap_hwmod_2430.h
+++ b/arch/arm/mach-omap2/omap_hwmod_2430.h
@@ -62,8 +62,6 @@ static struct omap_hwmod omap2430_l3_hwmod = {
 };
 
 static struct omap_hwmod omap2430_l4_wkup_hwmod;
-static struct omap_hwmod omap2430_mmc1_hwmod;
-static struct omap_hwmod omap2430_mmc2_hwmod;
 
 /* L4_CORE -> L4_WKUP interface */
 static struct omap_hwmod_ocp_if omap2430_l4_core__l4_wkup = {
-- 
1.6.6.rc0

[rfc/rft/patch 3/9] arm: omap: zoom: use vmmc1 regulator supply

[Felipe Balbi]

the structure was there but it was used by the
twl4030 pdata. Just adding the missing field.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/board-zoom-peripherals.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c b/arch/arm/mach-omap2/board-zoom-peripherals.c
index f14baa3..221a8e3 100755
--- a/arch/arm/mach-omap2/board-zoom-peripherals.c
+++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
@@ -236,6 +236,7 @@ static struct twl4030_platform_data zoom_twldata = {
 	.gpio		= &zoom_gpio_data,
 	.keypad		= &zoom_kp_twl4030_data,
 	.codec		= &zoom_codec_data,
+	.vmmc1          = &zoom_vmmc1,
 	.vmmc2          = &zoom_vmmc2,
 	.vsim           = &zoom_vsim,
 
-- 
1.6.6.rc0

[rfc/rft/patch 4/9] arm: omap: io: kill compile warning

[Felipe Balbi]

when building omap4 defconfigs, io.c will warn about unused
_omap2_init_reprogram_sdrc, that's because that functio is
only used ifndef CONFIG_ARCH_OMAP4, so add the missing
ifndef CONFIG_ARCH_OMAP4 to _omap2_init_reprogram_sdrc
definition.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/io.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 6a4d8e4..a2be3ce 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -278,6 +278,7 @@ void __init omap2_map_common_io(void)
  * -EINVAL if the dpll3_m2_ck cannot be found, 0 if called on OMAP2,
  * or passes along the return value of clk_set_rate().
  */
+#ifndef CONFIG_ARCH_OMAP4
 static int __init _omap2_init_reprogram_sdrc(void)
 {
 	struct clk *dpll3_m2_ck;
@@ -301,6 +302,7 @@ static int __init _omap2_init_reprogram_sdrc(void)
 
 	return v;
 }
+#endif
 
 void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,
 				 struct omap_sdrc_params *sdrc_cs1)
-- 
1.6.6.rc0

[rfc/rft/patch 5/9] arm: omap: kill compile warning on board-4430-sdp.c

[Felipe Balbi]

sdp4430_uart_config isn't used anywhere, so remove it.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/mach-omap2/board-4430sdp.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
index 0c6be6b..a7788b4 100644
--- a/arch/arm/mach-omap2/board-4430sdp.c
+++ b/arch/arm/mach-omap2/board-4430sdp.c
@@ -38,10 +38,6 @@ static struct platform_device *sdp4430_devices[] __initdata = {
 	&sdp4430_lcd_device,
 };
 
-static struct omap_uart_config sdp4430_uart_config __initdata = {
-	.enabled_uarts	= (1 << 0) | (1 << 1) | (1 << 2) | (1 << 3),
-};
-
 static struct omap_lcd_config sdp4430_lcd_config __initdata = {
 	.ctrl_name	= "internal",
 };
-- 
1.6.6.rc0

[rfc/rft/patch 6/9] arm: omap: gpio: kill compile warning in gpio.c

[Felipe Balbi]

when building linux-omap for omap1510, there will
be a compile warning about the unused flags variable
which is only used on 16xx and onwards.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/gpio.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index 055160e..487c651 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -1072,7 +1072,10 @@ static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int ena
  */
 static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
 {
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX) || \
+	defined(CONFIG_ARCH_OMAP34XX) || defined(CONFIG_ARCH_OMAP4)
 	unsigned long flags;
+#endif
 
 	switch (bank->method) {
 #ifdef CONFIG_ARCH_OMAP16XX
-- 
1.6.6.rc0

[rfc/rft/patch 7/9] arm: omap: innovator: kill compile warning on board-innovator.c

[Felipe Balbi]

that address is used by struct map_desc, which expects
an unsigned long instead of a void __iomem *. Fix it.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/plat/fpga.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/fpga.h b/arch/arm/plat-omap/include/plat/fpga.h
index f1864a6..87a87d2 100644
--- a/arch/arm/plat-omap/include/plat/fpga.h
+++ b/arch/arm/plat-omap/include/plat/fpga.h
@@ -85,7 +85,7 @@ struct h2p2_dbg_fpga {
  *  OMAP-1510 FPGA
  * ---------------------------------------------------------------------------
  */
-#define OMAP1510_FPGA_BASE		IOMEM(0xE8000000)	/* VA */
+#define OMAP1510_FPGA_BASE		0xE8000000		/* VA */
 #define OMAP1510_FPGA_SIZE		SZ_4K
 #define OMAP1510_FPGA_START		0x08000000		/* PA */
 
-- 
1.6.6.rc0

[rfc/rft/patch 8/9] arm: omap: perseus: kill compile warning on board-perseus2.c

[Felipe Balbi]

that address is used by struct map_desc, which expects
an unsigned long instead of a void __iomem *. Fix it.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/plat/fpga.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/fpga.h b/arch/arm/plat-omap/include/plat/fpga.h
index 87a87d2..d66164d 100644
--- a/arch/arm/plat-omap/include/plat/fpga.h
+++ b/arch/arm/plat-omap/include/plat/fpga.h
@@ -34,7 +34,7 @@ extern void omap1510_fpga_init_irq(void);
  * ---------------------------------------------------------------------------
  */
 /* maps in the FPGA registers and the ETHR registers */
-#define H2P2_DBG_FPGA_BASE		IOMEM(0xE8000000)	/* VA */
+#define H2P2_DBG_FPGA_BASE		0xE8000000		/* VA */
 #define H2P2_DBG_FPGA_SIZE		SZ_4K			/* SIZE */
 #define H2P2_DBG_FPGA_START		0x04000000		/* PA */
 
-- 
1.6.6.rc0

[rfc/rft/patch 9/9] arm: omap: mailbox: kill compile warning in mailbox.c

[Felipe Balbi]

Change %d to %ld to avoid the compile warning.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.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 281ab63..2c9fd1c 100644
--- a/arch/arm/mach-omap2/mailbox.c
+++ b/arch/arm/mach-omap2/mailbox.c
@@ -93,7 +93,7 @@ static int omap2_mbox_startup(struct omap_mbox *mbox)
 
 	mbox_ick_handle = clk_get(NULL, "mailboxes_ick");
 	if (IS_ERR(mbox_ick_handle)) {
-		printk(KERN_ERR "Could not get mailboxes_ick: %d\n",
+		printk(KERN_ERR "Could not get mailboxes_ick: %ld\n",
 			PTR_ERR(mbox_ick_handle));
 		return PTR_ERR(mbox_ick_handle);
 	}
-- 
1.6.6.rc0

RE: [rfc/rft/patch 3/9] arm: omap: zoom: use vmmc1 regulator supply

[Gadiyar, Anand]

 

> -----Original Message-----
> From: linux-omap-owner@vger.kernel.org 
> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
> Sent: Tuesday, December 01, 2009 6:34 PM
> To: Tony Lindgren
> Cc: linux-omap@vger.kernel.org; Shilimkar, Santosh; Kevin 
> Hilman; Kalle Valo; Jean Pihet; Pandita, Vikram; Paul 
> Walmsley; Hiroshi DOYU; David Brownell; Felipe Balbi
> Subject: [rfc/rft/patch 3/9] arm: omap: zoom: use vmmc1 
> regulator supply
> 
> the structure was there but it was used by the
> twl4030 pdata. Just adding the missing field.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>

I had already posted this patch.

- Anand

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

> ---
>  arch/arm/mach-omap2/board-zoom-peripherals.c |    1 +
>  1 files changed, 1 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/board-zoom-peripherals.c 
> b/arch/arm/mach-omap2/board-zoom-peripherals.c
> index f14baa3..221a8e3 100755
> --- a/arch/arm/mach-omap2/board-zoom-peripherals.c
> +++ b/arch/arm/mach-omap2/board-zoom-peripherals.c
> @@ -236,6 +236,7 @@ static struct twl4030_platform_data 
> zoom_twldata = {
>  	.gpio		= &zoom_gpio_data,
>  	.keypad		= &zoom_kp_twl4030_data,
>  	.codec		= &zoom_codec_data,
> +	.vmmc1          = &zoom_vmmc1,
>  	.vmmc2          = &zoom_vmmc2,
>  	.vsim           = &zoom_vsim,
>  
> -- 
> 1.6.6.rc0
> 

Re: [rfc/rft/patch 3/9] arm: omap: zoom: use vmmc1 regulator supply

[Felipe Balbi]

Hi,

On Tue, Dec 01, 2009 at 02:08:26PM +0100, ext Gadiyar, Anand wrote:
>
>
>> -----Original Message-----
>> From: linux-omap-owner@vger.kernel.org
>> [mailto:linux-omap-owner@vger.kernel.org] On Behalf Of Felipe Balbi
>> Sent: Tuesday, December 01, 2009 6:34 PM
>> To: Tony Lindgren
>> Cc: linux-omap@vger.kernel.org; Shilimkar, Santosh; Kevin
>> Hilman; Kalle Valo; Jean Pihet; Pandita, Vikram; Paul
>> Walmsley; Hiroshi DOYU; David Brownell; Felipe Balbi
>> Subject: [rfc/rft/patch 3/9] arm: omap: zoom: use vmmc1
>> regulator supply
>>
>> the structure was there but it was used by the
>> twl4030 pdata. Just adding the missing field.
>>
>> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
>
>I had already posted this patch.

sorry for that... let's drop this one then

-- 
balbi

Re: [rfc/rft/patch 7/9] arm: omap: innovator: kill compile warning on board-innovator.c

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [091201 05:03]:
> that address is used by struct map_desc, which expects
> an unsigned long instead of a void __iomem *. Fix it.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  arch/arm/plat-omap/include/plat/fpga.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/plat/fpga.h b/arch/arm/plat-omap/include/plat/fpga.h
> index f1864a6..87a87d2 100644
> --- a/arch/arm/plat-omap/include/plat/fpga.h
> +++ b/arch/arm/plat-omap/include/plat/fpga.h
> @@ -85,7 +85,7 @@ struct h2p2_dbg_fpga {
>   *  OMAP-1510 FPGA
>   * ---------------------------------------------------------------------------
>   */
> -#define OMAP1510_FPGA_BASE		IOMEM(0xE8000000)	/* VA */
> +#define OMAP1510_FPGA_BASE		0xE8000000		/* VA */
>  #define OMAP1510_FPGA_SIZE		SZ_4K
>  #define OMAP1510_FPGA_START		0x08000000		/* PA */
>  

Instead of removing the IOMEM, can you please move it to the
OMAP1510_FPGA_START physical address where it should be?

Thanks,

Tony

Re: [rfc/rft/patch 8/9] arm: omap: perseus: kill compile warning on board-perseus2.c

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [091201 05:03]:
> that address is used by struct map_desc, which expects
> an unsigned long instead of a void __iomem *. Fix it.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  arch/arm/plat-omap/include/plat/fpga.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/plat-omap/include/plat/fpga.h b/arch/arm/plat-omap/include/plat/fpga.h
> index 87a87d2..d66164d 100644
> --- a/arch/arm/plat-omap/include/plat/fpga.h
> +++ b/arch/arm/plat-omap/include/plat/fpga.h
> @@ -34,7 +34,7 @@ extern void omap1510_fpga_init_irq(void);
>   * ---------------------------------------------------------------------------
>   */
>  /* maps in the FPGA registers and the ETHR registers */
> -#define H2P2_DBG_FPGA_BASE		IOMEM(0xE8000000)	/* VA */
> +#define H2P2_DBG_FPGA_BASE		0xE8000000		/* VA */
>  #define H2P2_DBG_FPGA_SIZE		SZ_4K			/* SIZE */
>  #define H2P2_DBG_FPGA_START		0x04000000		/* PA */

The IOMEM should be moved here too to H2P2_DBG_FPGA_START.

Tony

[PATCH 8/9] arm: omap: perseus: kill compile warning on board-perseus2.c

[Felipe Balbi]

that address is used by struct map_desc, which expects
an unsigned long instead of a void __iomem *. Fix it.

Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
---
 arch/arm/plat-omap/include/plat/fpga.h |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/plat-omap/include/plat/fpga.h b/arch/arm/plat-omap/include/plat/fpga.h
index db2af50..99edbf8 100644
--- a/arch/arm/plat-omap/include/plat/fpga.h
+++ b/arch/arm/plat-omap/include/plat/fpga.h
@@ -34,9 +34,9 @@ extern void omap1510_fpga_init_irq(void);
  * ---------------------------------------------------------------------------
  */
 /* maps in the FPGA registers and the ETHR registers */
-#define H2P2_DBG_FPGA_BASE		IOMEM(0xE8000000)	/* VA */
+#define H2P2_DBG_FPGA_BASE		0xE8000000		/* VA */
 #define H2P2_DBG_FPGA_SIZE		SZ_4K			/* SIZE */
-#define H2P2_DBG_FPGA_START		0x04000000		/* PA */
+#define H2P2_DBG_FPGA_START		IOMEM(0x04000000)	/* PA */
 
 #define H2P2_DBG_FPGA_ETHR_START	(H2P2_DBG_FPGA_START + 0x300)
 #define H2P2_DBG_FPGA_FPGA_REV		(H2P2_DBG_FPGA_BASE + 0x10)	/* FPGA Revision */
-- 
1.6.6.rc0

Re: [rfc/rft/patch 0/9] omap warning cleanup

[Tony Lindgren]

* Felipe Balbi <felipe.balbi@nokia.com> [091201 05:03]:
> The following series removes a few compile warnings from
> omap builds. It was compile tested with all omap defconfigs
> for the ones who have the boards, a boot test would be
> nice, although there aren't any functional changes.

Thanks for doing this. I'll start looking through these
in a few days after we've got all the new code merged as
we can do these as fixes.

Regards,

Tony
 
> Felipe Balbi (9):
>   arm: omap: kill compile warning in irq.c
>   arm: omap: remove unused variables
>   arm: omap: zoom: use vmmc1 regulator supply
>   arm: omap: io: kill compile warning
>   arm: omap: kill compile warning on board-4430-sdp.c
>   arm: omap: gpio: kill compile warning in gpio.c
>   arm: omap: innovator: kill compile warning on board-innovator.c
>   arm: omap: perseus: kill compile warning on board-perseus2.c
>   arm: omap: mailbox: kill compile warning in mailbox.c
> 
>  arch/arm/mach-omap2/board-4430sdp.c          |    4 ----
>  arch/arm/mach-omap2/board-zoom-peripherals.c |    1 +
>  arch/arm/mach-omap2/io.c                     |    2 ++
>  arch/arm/mach-omap2/irq.c                    |    2 ++
>  arch/arm/mach-omap2/mailbox.c                |    2 +-
>  arch/arm/mach-omap2/omap_hwmod_2430.h        |    2 --
>  arch/arm/plat-omap/gpio.c                    |    3 +++
>  arch/arm/plat-omap/include/plat/fpga.h       |    4 ++--
>  8 files changed, 11 insertions(+), 9 deletions(-)
> 

Re: [rfc/rft/patch 4/9] arm: omap: io: kill compile warning

[Paul Walmsley]

Hi Felipe,

cc's trimmed,

On Tue, 1 Dec 2009, Felipe Balbi wrote:

> when building omap4 defconfigs, io.c will warn about unused
> _omap2_init_reprogram_sdrc, that's because that functio is
> only used ifndef CONFIG_ARCH_OMAP4, so add the missing
> ifndef CONFIG_ARCH_OMAP4 to _omap2_init_reprogram_sdrc
> definition.
> 
> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
> ---
>  arch/arm/mach-omap2/io.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
> index 6a4d8e4..a2be3ce 100644
> --- a/arch/arm/mach-omap2/io.c
> +++ b/arch/arm/mach-omap2/io.c
> @@ -278,6 +278,7 @@ void __init omap2_map_common_io(void)
>   * -EINVAL if the dpll3_m2_ck cannot be found, 0 if called on OMAP2,
>   * or passes along the return value of clk_set_rate().
>   */
> +#ifndef CONFIG_ARCH_OMAP4
>  static int __init _omap2_init_reprogram_sdrc(void)
>  {
>  	struct clk *dpll3_m2_ck;
> @@ -301,6 +302,7 @@ static int __init _omap2_init_reprogram_sdrc(void)
>  
>  	return v;
>  }
> +#endif
>  
>  void __init omap2_init_common_hw(struct omap_sdrc_params *sdrc_cs0,
>  				 struct omap_sdrc_params *sdrc_cs1)
> -- 
> 1.6.6.rc0
> 

Let's do this a little differently - can you move this function into a 
mach-omap2/sdrc3xxx.c file, rename it to omap3_init_reprogram_sdrc(), set 
the file up in the Makefile to only build for OMAP3, and then in io.c, 
only call omap3_init_reprogram_sdrc() if cpu_is_omap34xx()?  This way, we 
avoid the ifdefs.

thanks

- Paul