diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2007-02-22 14:54:13 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2007-02-22 14:54:13 +0000 |
commit | 9744433752b59a5da45c8076c4be6d2980d8cbbb (patch) | |
tree | 5cb91152ecf9725a45b5bd7d247a96ebb7b5263c | |
parent | c4ccd9ee860428dd127b9d5affff81a4f9420c6c (diff) | |
download | rockbox-9744433752b59a5da45c8076c4be6d2980d8cbbb.tar.gz rockbox-9744433752b59a5da45c8076c4be6d2980d8cbbb.zip |
Move the MPARK init to system_init()
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12452 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | firmware/target/coldfire/iriver/h300/lcd-h300.c | 2 | ||||
-rw-r--r-- | firmware/target/coldfire/pcm-coldfire.c | 1 | ||||
-rw-r--r-- | firmware/target/coldfire/system-coldfire.c | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/firmware/target/coldfire/iriver/h300/lcd-h300.c b/firmware/target/coldfire/iriver/h300/lcd-h300.c index 87035f00c9..3e5642e35d 100644 --- a/firmware/target/coldfire/iriver/h300/lcd-h300.c +++ b/firmware/target/coldfire/iriver/h300/lcd-h300.c | |||
@@ -237,8 +237,6 @@ static void _display_on(void) | |||
237 | /* LCD init */ | 237 | /* LCD init */ |
238 | void lcd_init_device(void) | 238 | void lcd_init_device(void) |
239 | { | 239 | { |
240 | MPARK = 0x81; /* PARK[1,0]=10 + BCR24BIT */ | ||
241 | |||
242 | /* GPO46 is LCD RESET */ | 240 | /* GPO46 is LCD RESET */ |
243 | or_l(0x00004000, &GPIO1_OUT); | 241 | or_l(0x00004000, &GPIO1_OUT); |
244 | or_l(0x00004000, &GPIO1_ENABLE); | 242 | or_l(0x00004000, &GPIO1_ENABLE); |
diff --git a/firmware/target/coldfire/pcm-coldfire.c b/firmware/target/coldfire/pcm-coldfire.c index e64dfaa3ce..5c7186e567 100644 --- a/firmware/target/coldfire/pcm-coldfire.c +++ b/firmware/target/coldfire/pcm-coldfire.c | |||
@@ -188,7 +188,6 @@ void pcm_init(void) | |||
188 | pcm_paused = false; | 188 | pcm_paused = false; |
189 | pcm_callback_for_more = NULL; | 189 | pcm_callback_for_more = NULL; |
190 | 190 | ||
191 | MPARK = 0x81; /* PARK[1,0]=10 + BCR24BIT */ | ||
192 | DIVR0 = 54; /* DMA0 is mapped into vector 54 in system.c */ | 191 | DIVR0 = 54; /* DMA0 is mapped into vector 54 in system.c */ |
193 | DMAROUTE = (DMAROUTE & 0xffffff00) | DMA0_REQ_AUDIO_1; | 192 | DMAROUTE = (DMAROUTE & 0xffffff00) | DMA0_REQ_AUDIO_1; |
194 | DMACONFIG = 1; /* DMA0Req = PDOR3, DMA1Req = PDIR2 */ | 193 | DMACONFIG = 1; /* DMA0Req = PDOR3, DMA1Req = PDIR2 */ |
diff --git a/firmware/target/coldfire/system-coldfire.c b/firmware/target/coldfire/system-coldfire.c index 54157214d9..9e5db41daa 100644 --- a/firmware/target/coldfire/system-coldfire.c +++ b/firmware/target/coldfire/system-coldfire.c | |||
@@ -248,6 +248,8 @@ void system_init(void) | |||
248 | /* Set INTBASE and SPURVEC */ | 248 | /* Set INTBASE and SPURVEC */ |
249 | INTBASE = 64; | 249 | INTBASE = 64; |
250 | SPURVEC = 24; | 250 | SPURVEC = 24; |
251 | |||
252 | MPARK = 0x81; /* PARK[1,0]=10 + BCR24BIT */ | ||
251 | } | 253 | } |
252 | 254 | ||
253 | void system_reboot (void) | 255 | void system_reboot (void) |