OMAP2: PRCM: fix some SHIFT macros that were actually bitmasks

After Charu's GPIO hwmod patches, GPIO initialization on N800 emits
the following messages for all GPIO banks:

omap_hwmod: gpio1: cannot be enabled (3)

This is due to OMAP24XX_ST_GPIOS_SHIFT being defined as a bitmask.
Fix this and also fix two other macros that had the same problem.

Thanks to Tony Lindgren <tony@atomide.com> for originally reporting
this bug.

Signed-off-by: Paul Walmsley <paul@pwsan.com
Cc: Charulatha Varadarajan <charu@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

authored by Paul Walmsley and committed by Tony Lindgren c2015dc8 e83df17f

+6 -5
+6 -5
arch/arm/mach-omap2/prcm-common.h
··· 243 243 #define OMAP24XX_EN_GPT1_MASK (1 << 0) 244 244 245 245 /* PM_WKST_WKUP, CM_IDLEST_WKUP shared bits */ 246 - #define OMAP24XX_ST_GPIOS_SHIFT (1 << 2) 247 - #define OMAP24XX_ST_GPIOS_MASK 2 248 - #define OMAP24XX_ST_GPT1_SHIFT (1 << 0) 249 - #define OMAP24XX_ST_GPT1_MASK 0 246 + #define OMAP24XX_ST_GPIOS_SHIFT 2 247 + #define OMAP24XX_ST_GPIOS_MASK (1 << 2) 248 + #define OMAP24XX_ST_GPT1_SHIFT 0 249 + #define OMAP24XX_ST_GPT1_MASK (1 << 0) 250 250 251 251 /* CM_IDLEST_MDM and PM_WKST_MDM shared bits */ 252 - #define OMAP2430_ST_MDM_SHIFT (1 << 0) 252 + #define OMAP2430_ST_MDM_SHIFT 0 253 + #define OMAP2430_ST_MDM_MASK (1 << 0) 253 254 254 255 255 256 /* 3430 register bits shared between CM & PRM registers */