diff options
Diffstat (limited to 'firmware')
-rw-r--r-- | firmware/drivers/audio/tsc2100.c | 20 | ||||
-rw-r--r-- | firmware/export/config-mrobe500.h | 2 | ||||
-rw-r--r-- | firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c | 9 |
3 files changed, 29 insertions, 2 deletions
diff --git a/firmware/drivers/audio/tsc2100.c b/firmware/drivers/audio/tsc2100.c index 8a71d57e78..a926b4464b 100644 --- a/firmware/drivers/audio/tsc2100.c +++ b/firmware/drivers/audio/tsc2100.c | |||
@@ -116,5 +116,23 @@ void audiohw_close(void) | |||
116 | 116 | ||
117 | void audiohw_set_frequency(int fsel) | 117 | void audiohw_set_frequency(int fsel) |
118 | { | 118 | { |
119 | (void)fsel; | 119 | int reg_val; |
120 | reg_val = tsc2100_readreg(TSAC1_PAGE, TSAC1_ADDRESS); | ||
121 | |||
122 | reg_val &= ~(0x07<<3); | ||
123 | |||
124 | switch(fsel) | ||
125 | { | ||
126 | case HW_FREQ_8: | ||
127 | reg_val |= (0x06<<3); | ||
128 | break; | ||
129 | case HW_FREQ_11: | ||
130 | reg_val |= (0x04<<3); | ||
131 | break; | ||
132 | case HW_FREQ_44: | ||
133 | default: | ||
134 | break; | ||
135 | } | ||
136 | |||
137 | tsc2100_writereg(TSAC1_PAGE, TSAC1_ADDRESS, reg_val); | ||
120 | } | 138 | } |
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h index 1ad521f864..5ce1926713 100644 --- a/firmware/export/config-mrobe500.h +++ b/firmware/export/config-mrobe500.h | |||
@@ -180,7 +180,7 @@ | |||
180 | #define PLUGIN_BUFFER_SIZE 0x200000 | 180 | #define PLUGIN_BUFFER_SIZE 0x200000 |
181 | #endif | 181 | #endif |
182 | 182 | ||
183 | #define HW_SAMPR_CAPS SAMPR_CAP_44 | 183 | #define HW_SAMPR_CAPS SAMPR_CAP_44 | SAMPR_CAP_22 | SAMPR_CAP_11 | SAMPR_CAP_8 |
184 | 184 | ||
185 | #define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ | 185 | #define BATTERY_CAPACITY_DEFAULT 1500 /* default battery capacity */ |
186 | #define BATTERY_CAPACITY_MIN 1000 /* min. capacity selectable */ | 186 | #define BATTERY_CAPACITY_MIN 1000 /* min. capacity selectable */ |
diff --git a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c index 7d073f4fda..5df764620d 100644 --- a/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c +++ b/firmware/target/arm/tms320dm320/mrobe-500/adc-mr500.c | |||
@@ -28,6 +28,15 @@ | |||
28 | 28 | ||
29 | void adc_init(void) | 29 | void adc_init(void) |
30 | { | 30 | { |
31 | /* Pin 15 appears to be the nPWD pin - make sure it is high otherwise the | ||
32 | * touchscreen does not work, audio has not been tested, but it is | ||
33 | * expected that is will also not work when low. | ||
34 | */ | ||
35 | IO_GIO_DIR0 &= ~(1<<15); /* output */ | ||
36 | IO_GIO_INV0 &= ~(1<<15); /* non-inverted */ | ||
37 | IO_GIO_FSEL0 &= ~(0x03<<12); /* normal pin */ | ||
38 | IO_GIO_BITSET0 = (1<<15); | ||
39 | |||
31 | /* Initialize the touchscreen and the battery readout */ | 40 | /* Initialize the touchscreen and the battery readout */ |
32 | tsc2100_adc_init(); | 41 | tsc2100_adc_init(); |
33 | 42 | ||