summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorIvan Khoronzhuk2012-12-28 10:09:30 +0100
committerPaul Walmsley2013-01-02 20:07:16 +0100
commit62bafd1a8f99196c233b9469384eae6644b1d6c3 (patch)
tree5eded5d6585eba19bb1d06403b650e78a781afc2 /arch/arm/mach-omap2
parentARM: OMAP: SRAM: resolve sparse warnings (diff)
downloadkernel-qcow2-linux-62bafd1a8f99196c233b9469384eae6644b1d6c3.tar.gz
kernel-qcow2-linux-62bafd1a8f99196c233b9469384eae6644b1d6c3.tar.xz
kernel-qcow2-linux-62bafd1a8f99196c233b9469384eae6644b1d6c3.zip
ARM: OMAP4: PRM: Correct reset source map
In the map for reset sources register we use defines intended for using with PRM_RSTCTRL register. So fix it. Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com> Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/prm44xx.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 7498bc77fe8b..e335216ac0eb 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -56,9 +56,9 @@ static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {
* enumeration)
*/
static struct prm_reset_src_map omap44xx_prm_reset_src_map[] = {
- { OMAP4430_RST_GLOBAL_WARM_SW_SHIFT,
+ { OMAP4430_GLOBAL_WARM_SW_RST_SHIFT,
OMAP_GLOBAL_WARM_RST_SRC_ID_SHIFT },
- { OMAP4430_RST_GLOBAL_COLD_SW_SHIFT,
+ { OMAP4430_GLOBAL_COLD_RST_SHIFT,
OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT },
{ OMAP4430_MPU_SECURITY_VIOL_RST_SHIFT,
OMAP_SECU_VIOL_RST_SRC_ID_SHIFT },