[PATCH 1/2] staging: tidspbridge: fix breakages due to CM reorganization

Greg Kroah-Hartman gregkh at linuxfoundation.org
Mon Jan 7 23:03:31 UTC 2013


On Mon, Dec 24, 2012 at 08:10:24AM -0600, Omar Ramirez Luna wrote:
> 3.8-rc1 introduced changes in the clock management header files,
> this resulted in compilation breakages for this driver.
> 
> Define this locally while APIs are made available, given that driver
> code shouldn't include mach header files.
> 
> This fixes:
> drivers/staging/tidspbridge/core/tiomap3430.c:550:13: error:
> 'OMAP3430_CM_AUTOIDLE_PLL' undeclared (first use in this function)
> drivers/staging/tidspbridge/core/tiomap_io.c:416:13: error:
> 'OMAP3430_CM_CLKEN_PLL' undeclared (first use in this function)
> 
> Reported-by: Chen Gang <gang.chen at asianux.com>
> Signed-off-by: Omar Ramirez Luna <omar.ramirez at copitl.com>

Enric sent me a patch that just includes the proper .h file, which
should be better than doing this:

> --- a/drivers/staging/tidspbridge/core/_tiomap.h
> +++ b/drivers/staging/tidspbridge/core/_tiomap.h
> @@ -40,6 +40,14 @@
>  #include <dspbridge/sync.h>
>  #include <dspbridge/clk.h>
>  
> +/*
> + * XXX These mach-omap2/ defines are wrong and should be removed.  No
> + * driver should read or write to PRM/CM registers directly; they
> + * should rely on OMAP core code to do this.
> + */
> +#define OMAP3430_CM_AUTOIDLE_PLL	0x0034
> +#define OMAP3430_CM_CLKEN_PLL		0x0004

Don't define things that are already defined elsewhere...

I'll not apply this.

thanks,

greg k-h



More information about the devel mailing list