Skip to content

Commit 4ce107c

Browse files
Vaibhav HiremathPaul Walmsley
authored andcommitted
ARM: OMAP2+: hwmod: Fix wrong SYSC_TYPE1_XXX_MASK bit definitions
In the SYSC_TYPE1_XXX_MASK configuration, SYSC_XXX_SHIFT macro is used which is not defined anywhere in the kernel. Until now the build was going through successfully, since it is not being used anywhere in kernel. This bug got introduced by the commit 358f0e6 ("OMAP3: hwmod: support to specify the offset position of various SYSCONFIG register bits.") Signed-off-by: Vaibhav Hiremath <[email protected]> Acked-by: Benoit Cousson <[email protected]> Signed-off-by: Paul Walmsley <[email protected]>
1 parent f9a2f9c commit 4ce107c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

arch/arm/plat-omap/include/plat/omap_hwmod.h

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,17 @@ extern struct omap_hwmod_sysc_fields omap_hwmod_sysc_type2;
4747
* with the original PRCM protocol defined for OMAP2420
4848
*/
4949
#define SYSC_TYPE1_MIDLEMODE_SHIFT 12
50-
#define SYSC_TYPE1_MIDLEMODE_MASK (0x3 << SYSC_MIDLEMODE_SHIFT)
50+
#define SYSC_TYPE1_MIDLEMODE_MASK (0x3 << SYSC_TYPE1_MIDLEMODE_SHIFT)
5151
#define SYSC_TYPE1_CLOCKACTIVITY_SHIFT 8
52-
#define SYSC_TYPE1_CLOCKACTIVITY_MASK (0x3 << SYSC_CLOCKACTIVITY_SHIFT)
52+
#define SYSC_TYPE1_CLOCKACTIVITY_MASK (0x3 << SYSC_TYPE1_CLOCKACTIVITY_SHIFT)
5353
#define SYSC_TYPE1_SIDLEMODE_SHIFT 3
54-
#define SYSC_TYPE1_SIDLEMODE_MASK (0x3 << SYSC_SIDLEMODE_SHIFT)
54+
#define SYSC_TYPE1_SIDLEMODE_MASK (0x3 << SYSC_TYPE1_SIDLEMODE_SHIFT)
5555
#define SYSC_TYPE1_ENAWAKEUP_SHIFT 2
56-
#define SYSC_TYPE1_ENAWAKEUP_MASK (1 << SYSC_ENAWAKEUP_SHIFT)
56+
#define SYSC_TYPE1_ENAWAKEUP_MASK (1 << SYSC_TYPE1_ENAWAKEUP_SHIFT)
5757
#define SYSC_TYPE1_SOFTRESET_SHIFT 1
58-
#define SYSC_TYPE1_SOFTRESET_MASK (1 << SYSC_SOFTRESET_SHIFT)
58+
#define SYSC_TYPE1_SOFTRESET_MASK (1 << SYSC_TYPE1_SOFTRESET_SHIFT)
5959
#define SYSC_TYPE1_AUTOIDLE_SHIFT 0
60-
#define SYSC_TYPE1_AUTOIDLE_MASK (1 << SYSC_AUTOIDLE_SHIFT)
60+
#define SYSC_TYPE1_AUTOIDLE_MASK (1 << SYSC_TYPE1_AUTOIDLE_SHIFT)
6161

6262
/*
6363
* OCP SYSCONFIG bit shifts/masks TYPE2. These are for IPs compliant

0 commit comments

Comments
 (0)