Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
u-boot-2015.04
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
vesta
u-boot-2015.04
Commits
a21fb981
Commit
a21fb981
authored
15 years ago
by
Detlev Zundel
Committed by
Wolfgang Denk
15 years ago
Browse files
Options
Downloads
Patches
Plain Diff
mpc5xxx: Support CPU internal watchdog.
Signed-off-by:
Detlev Zundel
<
dzu@denx.de
>
parent
82826d54
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
cpu/mpc5xxx/cpu.c
+19
-1
19 additions, 1 deletion
cpu/mpc5xxx/cpu.c
cpu/mpc5xxx/cpu_init.c
+13
-1
13 additions, 1 deletion
cpu/mpc5xxx/cpu_init.c
include/watchdog.h
+5
-0
5 additions, 0 deletions
include/watchdog.h
with
37 additions
and
2 deletions
cpu/mpc5xxx/cpu.c
+
19
−
1
View file @
a21fb981
/*
/*
* (C) Copyright 2000-200
3
* (C) Copyright 2000-20
1
0
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
*
* See file CREDITS for list of people who contributed to this
* See file CREDITS for list of people who contributed to this
...
@@ -192,3 +192,21 @@ int cpu_eth_init(bd_t *bis)
...
@@ -192,3 +192,21 @@ int cpu_eth_init(bd_t *bis)
return
mpc5xxx_fec_initialize
(
bis
);
return
mpc5xxx_fec_initialize
(
bis
);
}
}
#endif
#endif
#if defined(CONFIG_WATCHDOG)
void
watchdog_reset
(
void
)
{
int
re_enable
=
disable_interrupts
();
reset_5xxx_watchdog
();
if
(
re_enable
)
enable_interrupts
();
}
void
reset_5xxx_watchdog
(
void
)
{
volatile
struct
mpc5xxx_gpt
*
gpt0
=
(
struct
mpc5xxx_gpt
*
)
MPC5XXX_GPT
;
/* Trigger TIMER_0 by writing A5 to OCPW */
clrsetbits_be32
(
&
gpt0
->
emsr
,
0xff000000
,
0xa5000000
);
}
#endif
/* CONFIG_WATCHDOG */
This diff is collapsed.
Click to expand it.
cpu/mpc5xxx/cpu_init.c
+
13
−
1
View file @
a21fb981
/*
/*
* (C) Copyright 2000-200
9
* (C) Copyright 2000-20
1
0
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*
*
* See file CREDITS for list of people who contributed to this
* See file CREDITS for list of people who contributed to this
...
@@ -24,6 +24,7 @@
...
@@ -24,6 +24,7 @@
#include
<common.h>
#include
<common.h>
#include
<mpc5xxx.h>
#include
<mpc5xxx.h>
#include
<asm/io.h>
#include
<asm/io.h>
#include
<watchdog.h>
DECLARE_GLOBAL_DATA_PTR
;
DECLARE_GLOBAL_DATA_PTR
;
...
@@ -45,6 +46,8 @@ void cpu_init_f (void)
...
@@ -45,6 +46,8 @@ void cpu_init_f (void)
(
struct
mpc5xxx_gpio
*
)
MPC5XXX_GPIO
;
(
struct
mpc5xxx_gpio
*
)
MPC5XXX_GPIO
;
volatile
struct
mpc5xxx_xlb
*
xlb
=
volatile
struct
mpc5xxx_xlb
*
xlb
=
(
struct
mpc5xxx_xlb
*
)
MPC5XXX_XLBARB
;
(
struct
mpc5xxx_xlb
*
)
MPC5XXX_XLBARB
;
volatile
struct
mpc5xxx_gpt
*
gpt0
=
(
struct
mpc5xxx_gpt
*
)
MPC5XXX_GPT
;
unsigned
long
addecr
=
(
1
<<
25
);
/* Boot_CS */
unsigned
long
addecr
=
(
1
<<
25
);
/* Boot_CS */
#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_MGT5100)
#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_MGT5100)
addecr
|=
(
1
<<
22
);
/* SDRAM enable */
addecr
|=
(
1
<<
22
);
/* SDRAM enable */
...
@@ -206,6 +209,15 @@ void cpu_init_f (void)
...
@@ -206,6 +209,15 @@ void cpu_init_f (void)
/* Enable piplining */
/* Enable piplining */
clrbits_be32
(
&
xlb
->
config
,
(
1
<<
31
));
clrbits_be32
(
&
xlb
->
config
,
(
1
<<
31
));
# endif
# endif
#if defined(CONFIG_WATCHDOG)
/* Charge the watchdog timer - prescaler = 64k, count = 64k*/
out_be32
(
&
gpt0
->
cir
,
0x0000ffff
);
out_be32
(
&
gpt0
->
emsr
,
0x9004
);
/* wden|ce|timer_ms */
reset_5xxx_watchdog
();
#endif
/* CONFIG_WATCHDOG */
#endif
/* CONFIG_MPC5200 */
#endif
/* CONFIG_MPC5200 */
}
}
...
...
This diff is collapsed.
Click to expand it.
include/watchdog.h
+
5
−
0
View file @
a21fb981
...
@@ -84,6 +84,11 @@
...
@@ -84,6 +84,11 @@
void
reset_5xx_watchdog
(
volatile
immap_t
*
immr
);
void
reset_5xx_watchdog
(
volatile
immap_t
*
immr
);
#endif
#endif
/* MPC 5xxx */
#if defined(CONFIG_MPC5xxx) && !defined(__ASSEMBLY__)
void
reset_5xxx_watchdog
(
void
);
#endif
/* AMCC 4xx */
/* AMCC 4xx */
#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
#if defined(CONFIG_4xx) && !defined(__ASSEMBLY__)
void
reset_4xx_watchdog
(
void
);
void
reset_4xx_watchdog
(
void
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment