From 516d277958019ba27362d5f9fcc5ee70acc87c45 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Fri, 24 Nov 2006 11:06:52 +0000 Subject: 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 --- firmware/target/coldfire/iriver/h100/adc-h100.c | 8 ++++++++ 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) void adc_init(void) { + or_l(0x80600080, &GPIO_FUNCTION); /* GPIO7: CS + GPIO21: Data In (to the ADC) + GPIO22: CLK + GPIO31: Data Out (from the ADC) */ + or_l(0x00600080, &GPIO_ENABLE); + or_l(0x80, &GPIO_OUT); /* CS high */ + and_l(~0x00400000, &GPIO_OUT); /* CLK low */ + adc_scan(ADC_BATTERY); 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) void adc_init(void) { - or_l(0x80600080, &GPIO_FUNCTION); /* GPIO7: CS - GPIO21: Data In (to the ADC) - GPIO22: CLK - GPIO31: Data Out (from the ADC) */ - or_l(0x00600080, &GPIO_ENABLE); - or_l(0x80, &GPIO_OUT); /* CS high */ - and_l(~0x00400000, &GPIO_OUT); /* CLK low */ - adc_scan(ADC_BATTERY); tick_add_task(adc_tick); -- cgit v1.2.3