[PATCH 0/2] General compile fixes

[PATCH 0/2] General compile fixes

[Felipe Balbi]

Hi all,

the following patches were just compile tested using
omap_osk_5912_defconfig with usb enabled and dsp disabled.

--
	- Balbi

[PATCH] DSP: Fix dsp_common.c compile breakage

[Felipe Balbi]

Recent changes broke compilation for omap1.

Signed-off-by: Felipe Balbi <me@felipebalbi.com>
---
 drivers/dsp/dspgateway/dsp_common.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/dsp/dspgateway/dsp_common.c b/drivers/dsp/dspgateway/dsp_common.c
index af97ce1..aeeadf4 100644
--- a/drivers/dsp/dspgateway/dsp_common.c
+++ b/drivers/dsp/dspgateway/dsp_common.c
@@ -478,7 +478,7 @@ void dsp_cpustat_set_icrmask(u16 mask)
 	mutex_unlock(&cpustat.lock);
 }
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
 void omap_dsp_request_mpui(void)
 {
 	mutex_lock(&cpustat.lock);
@@ -594,7 +594,7 @@ void dsp_unregister_mem_cb(void) { }
 
 arch_initcall(omap_dsp_init);
 
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
 EXPORT_SYMBOL(omap_dsp_request_mpui);
 EXPORT_SYMBOL(omap_dsp_release_mpui);
 EXPORT_SYMBOL(omap_dsp_request_mem);
-- 
1.5.4.3.447.gc95b3

[PATCH] USB: GADGET: Fix compile breakage on omap_udc.c

[Felipe Balbi]

Recent changes broke compilation for omap_udc.c.

Signed-off-by: Felipe Balbi <me@felipebalbi.com>
---
 drivers/usb/gadget/omap_udc.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
index 85a0d1a..9aa5946 100644
--- a/drivers/usb/gadget/omap_udc.c
+++ b/drivers/usb/gadget/omap_udc.c
@@ -2299,7 +2299,7 @@ static int proc_otg_show(struct seq_file *s)
 		 * do with the frame adjustment counter and McBSP2.
 		 */
 		ctrl_name = "control_devconf";
-		trans = ctrl_read_reg(OMAP2_CONTROL_DEVCONF0);
+		trans = omap_ctrl_readb(OMAP2_CONTROL_DEVCONF0);
 	} else {
 		ctrl_name = "tranceiver_ctrl";
 		trans = USB_TRANSCEIVER_CTRL_REG;
-- 
1.5.4.3.447.gc95b3

Re: [PATCH] DSP: Fix dsp_common.c compile breakage

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [080317 21:49]:
> Recent changes broke compilation for omap1.
> 
> Signed-off-by: Felipe Balbi <me@felipebalbi.com>
> ---
>  drivers/dsp/dspgateway/dsp_common.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/dsp/dspgateway/dsp_common.c b/drivers/dsp/dspgateway/dsp_common.c
> index af97ce1..aeeadf4 100644
> --- a/drivers/dsp/dspgateway/dsp_common.c
> +++ b/drivers/dsp/dspgateway/dsp_common.c
> @@ -478,7 +478,7 @@ void dsp_cpustat_set_icrmask(u16 mask)
>  	mutex_unlock(&cpustat.lock);
>  }
>  
> -#ifdef CONFIG_ARCH_OMAP1
> +#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
>  void omap_dsp_request_mpui(void)
>  {
>  	mutex_lock(&cpustat.lock);
> @@ -594,7 +594,7 @@ void dsp_unregister_mem_cb(void) { }
>  
>  arch_initcall(omap_dsp_init);
>  
> -#ifdef CONFIG_ARCH_OMAP1
> +#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_MMU_FWK)
>  EXPORT_SYMBOL(omap_dsp_request_mpui);
>  EXPORT_SYMBOL(omap_dsp_release_mpui);
>  EXPORT_SYMBOL(omap_dsp_request_mem);

Pushing Dave's patch instead, can you please check that it works OK
for you?

Tony

Re: [PATCH] USB: GADGET: Fix compile breakage on omap_udc.c

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [080317 21:50]:
> Recent changes broke compilation for omap_udc.c.
> 
> Signed-off-by: Felipe Balbi <me@felipebalbi.com>
> ---
>  drivers/usb/gadget/omap_udc.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c
> index 85a0d1a..9aa5946 100644
> --- a/drivers/usb/gadget/omap_udc.c
> +++ b/drivers/usb/gadget/omap_udc.c
> @@ -2299,7 +2299,7 @@ static int proc_otg_show(struct seq_file *s)
>  		 * do with the frame adjustment counter and McBSP2.
>  		 */
>  		ctrl_name = "control_devconf";
> -		trans = ctrl_read_reg(OMAP2_CONTROL_DEVCONF0);
> +		trans = omap_ctrl_readb(OMAP2_CONTROL_DEVCONF0);
>  	} else {
>  		ctrl_name = "tranceiver_ctrl";
>  		trans = USB_TRANSCEIVER_CTRL_REG;

Pushing today.

Tony