* Francisco Alecrim <francisco.alecrim@xxxxxxxxxxx> [071219 11:11]:
> Fix compile error generated by commit 84a0cb7da8c222b3bf1beac6adea6708d4b8143a.
> Commit 84a0cb7da8c222b3bf1beac6adea6708d4b8143a causes a compile error with
> OMAP1, the header ../mach-omap2/control.h is not included and the variables
> OMAP24XX_CONTROL_STATUS and OMAP2_DEVICETYPE_MASK are not find.
>
> arch/arm/plat-omap/sram.c: In function `is_sram_locked':
> arch/arm/plat-omap/sram.c:95: error: implicit declaration of function
> `ctrl_read_reg'
> arch/arm/plat-omap/sram.c:95: error: `OMAP24XX_CONTROL_STATUS' undeclared (first
> use in this function)
> arch/arm/plat-omap/sram.c:95: error: (Each undeclared identifier is reported
> only once
> arch/arm/plat-omap/sram.c:95: error: for each function it appears in.)
> arch/arm/plat-omap/sram.c:96: error: `OMAP2_DEVICETYPE_MASK' undeclared (first
> use in this function)
>
> Signed-off-by: Francisco Alecrim <francisco.alecrim@xxxxxxxxxxx>
> Signed-off-by: Felipe Balbi <felipe.lima@xxxxxxxxxxx>
> ---
> arch/arm/plat-omap/sram.c | 2 ++
> 1 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
> index c377cb0..6305dc9 100644
> --- a/arch/arm/plat-omap/sram.c
> +++ b/arch/arm/plat-omap/sram.c
> @@ -91,9 +91,11 @@ static int is_sram_locked(void)
> {
> int type = 0;
>
> +#if defined(CONFIG_ARCH_OMAP24XX)
> if (cpu_is_omap242x())
> type = (ctrl_read_reg(OMAP24XX_CONTROL_STATUS) &
> OMAP2_DEVICETYPE_MASK);
> +#endif
>
> if (type == GP_DEVICE) {
> /* RAMFW: R/W access to all initiators for all qualifier sets */
Rather than fixing this with an ifdef, we should rather include the
necessary headers files for omap1 also. It does not hurt as
cpu_is_omap242x() is optimized out as if (0) when not selected.
Regards,
Tony
-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
