diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-11-24 11:06:52 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-11-24 11:06:52 +0000 |
commit | 516d277958019ba27362d5f9fcc5ee70acc87c45 (patch) | |
tree | 8fb0b5a101cff34b111323e218cf412b35c51008 /firmware/target | |
parent | 16cb491cdd8a20552f5b3050e3e8be1f4541e790 (diff) | |
download | rockbox-516d277958019ba27362d5f9fcc5ee70acc87c45.tar.gz rockbox-516d277958019ba27362d5f9fcc5ee70acc87c45.zip |
The ADC GPIO init code for the H100 was accidentally put in the H300 driver when moving to the target tree
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/coldfire/iriver/h100/adc-h100.c | 8 | ||||
-rw-r--r-- | firmware/target/coldfire/iriver/h300/adc-h300.c | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/firmware/target/coldfire/iriver/h100/adc-h100.c b/firmware/target/coldfire/iriver/h100/adc-h100.c index b29a2247ad..5fc10e4b3c 100644 --- a/firmware/target/coldfire/iriver/h100/adc-h100.c +++ b/firmware/target/coldfire/iriver/h100/adc-h100.c | |||
@@ -111,6 +111,14 @@ static void adc_tick(void) | |||
111 | 111 | ||
112 | void adc_init(void) | 112 | void adc_init(void) |
113 | { | 113 | { |
114 | or_l(0x80600080, &GPIO_FUNCTION); /* GPIO7: CS | ||
115 | GPIO21: Data In (to the ADC) | ||
116 | GPIO22: CLK | ||
117 | GPIO31: Data Out (from the ADC) */ | ||
118 | or_l(0x00600080, &GPIO_ENABLE); | ||
119 | or_l(0x80, &GPIO_OUT); /* CS high */ | ||
120 | and_l(~0x00400000, &GPIO_OUT); /* CLK low */ | ||
121 | |||
114 | adc_scan(ADC_BATTERY); | 122 | adc_scan(ADC_BATTERY); |
115 | 123 | ||
116 | tick_add_task(adc_tick); | 124 | tick_add_task(adc_tick); |
diff --git a/firmware/target/coldfire/iriver/h300/adc-h300.c b/firmware/target/coldfire/iriver/h300/adc-h300.c index 31702eaef1..140eafe0ab 100644 --- a/firmware/target/coldfire/iriver/h300/adc-h300.c +++ b/firmware/target/coldfire/iriver/h300/adc-h300.c | |||
@@ -69,14 +69,6 @@ static void adc_tick(void) | |||
69 | 69 | ||
70 | void adc_init(void) | 70 | void adc_init(void) |
71 | { | 71 | { |
72 | or_l(0x80600080, &GPIO_FUNCTION); /* GPIO7: CS | ||
73 | GPIO21: Data In (to the ADC) | ||
74 | GPIO22: CLK | ||
75 | GPIO31: Data Out (from the ADC) */ | ||
76 | or_l(0x00600080, &GPIO_ENABLE); | ||
77 | or_l(0x80, &GPIO_OUT); /* CS high */ | ||
78 | and_l(~0x00400000, &GPIO_OUT); /* CLK low */ | ||
79 | |||
80 | adc_scan(ADC_BATTERY); | 72 | adc_scan(ADC_BATTERY); |
81 | 73 | ||
82 | tick_add_task(adc_tick); | 74 | tick_add_task(adc_tick); |