diff options
Diffstat (limited to 'firmware/target')
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.c | 8 | ||||
-rw-r--r-- | firmware/target/arm/imx233/adc-imx233.h | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h | 12 |
4 files changed, 17 insertions, 11 deletions
diff --git a/firmware/target/arm/imx233/adc-imx233.c b/firmware/target/arm/imx233/adc-imx233.c index b24f7f6c43..2d2f0de517 100644 --- a/firmware/target/arm/imx233/adc-imx233.c +++ b/firmware/target/arm/imx233/adc-imx233.c | |||
@@ -19,10 +19,6 @@ | |||
19 | * | 19 | * |
20 | ****************************************************************************/ | 20 | ****************************************************************************/ |
21 | 21 | ||
22 | #include "config.h" | ||
23 | #include "adc.h" | ||
24 | #include "adc-target.h" | ||
25 | #include "system.h" | ||
26 | #include "adc-imx233.h" | 22 | #include "adc-imx233.h" |
27 | 23 | ||
28 | void adc_init(void) | 24 | void adc_init(void) |
@@ -73,11 +69,11 @@ static short adc_read_virtual(int c) | |||
73 | imx233_lradc_release_channel(nmos_chan); | 69 | imx233_lradc_release_channel(nmos_chan); |
74 | return val; | 70 | return val; |
75 | } | 71 | } |
76 | #ifdef IMX233_ADC_BATT_TEMP_SENSOR | 72 | #ifdef IMX233_BATT_TEMP_SENSOR |
77 | case IMX233_ADC_BATT_TEMP: | 73 | case IMX233_ADC_BATT_TEMP: |
78 | { | 74 | { |
79 | int virt = imx233_lradc_acquire_channel(TIMEOUT_BLOCK); | 75 | int virt = imx233_lradc_acquire_channel(TIMEOUT_BLOCK); |
80 | int val = imx233_lradc_sense_ext_temperature(virt, IMX233_ADC_BATT_TEMP_SENSOR); | 76 | int val = imx233_lradc_sense_ext_temperature(virt, IMX233_BATT_TEMP_SENSOR); |
81 | imx233_lradc_release_channel(virt); | 77 | imx233_lradc_release_channel(virt); |
82 | return val; | 78 | return val; |
83 | } | 79 | } |
diff --git a/firmware/target/arm/imx233/adc-imx233.h b/firmware/target/arm/imx233/adc-imx233.h index c54e79dc8d..09fd7eb013 100644 --- a/firmware/target/arm/imx233/adc-imx233.h +++ b/firmware/target/arm/imx233/adc-imx233.h | |||
@@ -22,15 +22,17 @@ | |||
22 | #define _ADC_IMX233_H_ | 22 | #define _ADC_IMX233_H_ |
23 | 23 | ||
24 | #include "system.h" | 24 | #include "system.h" |
25 | #include "adc.h" | ||
26 | #include "adc-target.h" | ||
27 | #include "powermgmt-target.h" | ||
25 | #include "lradc-imx233.h" | 28 | #include "lradc-imx233.h" |
26 | #include "adc-imx233.h" | ||
27 | 29 | ||
28 | /* Virtual channels */ | 30 | /* Virtual channels */ |
29 | #define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */ | 31 | #define IMX233_ADC_BATTERY -1 /* Battery voltage (mV) */ |
30 | #define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */ | 32 | #define IMX233_ADC_DIE_TEMP -2 /* Die temperature (°C) */ |
31 | #define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */ | 33 | #define IMX233_ADC_VDDIO -3 /* VddIO voltage (mV) */ |
32 | #define IMX233_ADC_VDD5V -4 /* Vdd5V voltage (mV) */ | 34 | #define IMX233_ADC_VDD5V -4 /* Vdd5V voltage (mV) */ |
33 | #ifdef IMX233_ADC_BATT_TEMP_SENSOR | 35 | #ifdef IMX233_BATT_TEMP_SENSOR |
34 | #define IMX233_ADC_BATT_TEMP -5 /* Battery temperature (°C) */ | 36 | #define IMX233_ADC_BATT_TEMP -5 /* Battery temperature (°C) */ |
35 | #endif | 37 | #endif |
36 | 38 | ||
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h index 5907eefdc2..9fccfa9da4 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/adc-target.h | |||
@@ -30,6 +30,4 @@ | |||
30 | #define ADC_BATT_TEMP 4 | 30 | #define ADC_BATT_TEMP 4 |
31 | #define ADC_CH2 5 | 31 | #define ADC_CH2 5 |
32 | 32 | ||
33 | #define IMX233_ADC_BATT_TEMP_SENSOR 0 | ||
34 | |||
35 | #endif | 33 | #endif |
diff --git a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h index 34d1d00e1d..2fd5559baf 100644 --- a/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h +++ b/firmware/target/arm/imx233/sansa-fuzeplus/powermgmt-target.h | |||
@@ -37,12 +37,22 @@ | |||
37 | * - top off period: 30 min | 37 | * - top off period: 30 min |
38 | * - high die temperature: 71 °C | 38 | * - high die temperature: 71 °C |
39 | * - low die temperature: 56 °C | 39 | * - low die temperature: 56 °C |
40 | * - safe temperature current: 30 mA | 40 | * - safe die temperature current: 30 mA |
41 | * - battery temperature channel: 0 | ||
42 | * - high battery temperature: 1100 | ||
43 | * - low battery temperature: 220 | ||
44 | * - safe battery temperature current: 0 mA | ||
45 | * - low DCDC battery voltage: 3.9 V | ||
41 | */ | 46 | */ |
42 | 47 | ||
43 | #define IMX233_CHARGE_CURRENT 200 | 48 | #define IMX233_CHARGE_CURRENT 200 |
44 | #define IMX233_STOP_CURRENT 30 | 49 | #define IMX233_STOP_CURRENT 30 |
45 | #define IMX233_TOPOFF_TIMEOUT (30 * 60 * HZ) | 50 | #define IMX233_TOPOFF_TIMEOUT (30 * 60 * HZ) |
46 | #define IMX233_CHARGING_TIMEOUT (4 * 3600 * HZ) | 51 | #define IMX233_CHARGING_TIMEOUT (4 * 3600 * HZ) |
52 | #define IMX233_DIE_TEMP_HIGH 71 | ||
53 | #define IMX233_DIE_TEMP_LOW 56 | ||
54 | #define IMX233_BATT_TEMP_SENSOR 0 | ||
55 | #define IMX233_BATT_TEMP_HIGH 1100 | ||
56 | #define IMX233_BATT_TEMP_LOW 220 | ||
47 | 57 | ||
48 | #endif /* POWERMGMT_TARGET_H */ | 58 | #endif /* POWERMGMT_TARGET_H */ |