Skip to contentSkip to conversation

ARM: OMAP3: Fix warnings in clock34xx.h

PATCH In review Dirk Behme 2 participants 2 messages Jun 27, 2008 – Jul 3, 2008

Subsystems (4)
Arm (32-bit) Arm sub-architectures OMAP2+ support OMAP clock framework support
lore
Share & tools
lore

Dirk Behme

author
#0 lore raw

PATCH v3 1/1 ARM: OMAP3: Fix warnings in clock34xx.h

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

Signed-off-by Dirk Behme <[email protected]>

Subject: ARM: OMAP3: Fix warnings in clock34xx.h

From: Dirk Behme <[email protected]>

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

Signed-off-by Dirk Behme <[email protected]>

---

Changes in V3: Update to recent git.

arch/arm/mach-omap2/clock34xx.h +6 -3
Index: linux-beagle/arch/arm/mach-omap2/clock34xx.h
===================================================================
@@ -53,14 +53,17 @@ 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, OMAP3_PRM_CLKSRC_CTRL_OFFSET)
 
 #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)
 
 /* PRM CLOCKS */
maintainer
#1 lore raw
Quoted 9 lines · Dirk Behme

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

Pushing today.

Tony

Quoted 47 lines
Signed-off-by Dirk Behme <[email protected]>

Subject: ARM: OMAP3: Fix warnings in clock34xx.h

From: Dirk Behme <[email protected]>

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

Signed-off-by Dirk Behme <[email protected]>

---

Changes in V3: Update to recent git.

Index: linux-beagle/arch/arm/mach-omap2/clock34xx.h
===================================================================

arch/arm/mach-omap2/clock34xx.h +6 -3
@@ -53,14 +53,17 @@ 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, OMAP3_PRM_CLKSRC_CTRL_OFFSET)
 
 #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)
 
 /* PRM CLOCKS */