Fix warnings
arch/arm/mach-omap2/clock34xx.h:178: warning: initialization makes
pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:204: warning: initialization makes
pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:229: warning: initialization makes
pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:2238: warning: initialization makes
pointer from integer without a cast
Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxx>
Subject: ARM: OMAP3: Fix warnings in clock34xx.h
From: Dirk Behme <dirk.behme@xxxxxxxxx>
Fix warnings
arch/arm/mach-omap2/clock34xx.h:178: warning: initialization makes pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:204: warning: initialization makes pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:229: warning: initialization makes pointer from integer without a cast
arch/arm/mach-omap2/clock34xx.h:2238: warning: initialization makes pointer from integer without a cast
Signed-off-by: Dirk Behme <dirk.behme@xxxxxxxxx>
---
Index: linux-beagle/arch/arm/mach-omap2/clock34xx.h
===================================================================
--- linux-beagle.orig/arch/arm/mach-omap2/clock34xx.h
+++ linux-beagle/arch/arm/mach-omap2/clock34xx.h
@@ -53,14 +53,20 @@ static int omap3_noncore_dpll_set_rate(s
#define DPLL_LOW_POWER_BYPASS 0x5
#define DPLL_LOCKED 0x7
+#define _OMAP34XX_PRM_REGADDR(module, reg) \
+ ((__force void __iomem *)(OMAP34XX_PRM_REGADDR((module), (reg))))
+
#define OMAP3430_PRM_CLKSRC_CTRL \
- OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070)
+ _OMAP34XX_PRM_REGADDR(OMAP3430_GR_MOD, 0x0070)
#define OMAP3430_PRM_CLKSEL \
- OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKSEL_OFFSET)
+ _OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKSEL_OFFSET)
#define OMAP3430_PRM_CLKOUT_CTRL \
- OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKOUT_CTRL_OFFSET)
+ _OMAP34XX_PRM_REGADDR(OMAP3430_CCR_MOD, OMAP3_PRM_CLKOUT_CTRL_OFFSET)
+
+#define OMAP3430_USBHOST_MOD \
+ _OMAP34XX_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL)
/* PRM CLOCKS */
@@ -2235,7 +2241,7 @@ static struct clk usbhost_sar_fck = {
.name = "usbhost_sar_fck",
.parent = &osc_sys_ck,
.init = &omap2_init_clk_clkdm,
- .enable_reg = OMAP34XX_PRM_REGADDR(OMAP3430ES2_USBHOST_MOD, PM_PWSTCTRL),
+ .enable_reg = OMAP3430_USBHOST_MOD,
.enable_bit = OMAP3430ES2_SAVEANDRESTORE_SHIFT,
.flags = CLOCK_IN_OMAP3430ES2,
.clkdm_name = "usbhost_clkdm",
