len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-12-10 05:35:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Sansa AMS/AMSv2: analog front-end register CVDD/DCDC3 doesn't exist in AMSv2, so don't modify it

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30579 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Bertrik Sikken 2011-09-21 21:48:19 +00:00
parent 151424a6fd
commit b1298c2c44
3 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/export/as3514.h
View file

@ -89,9 +89,9 @@ extern void audiohw_set_sampr_dividers(int fsel);
#endif #endif
#define AS3514_SYSTEM 0x20 #define AS3514_SYSTEM 0x20
#define AS3514_CVDD_DCDC3 0x21
#ifndef HAVE_AS3543 #ifndef HAVE_AS3543
#define AS3514_CVDD_DCDC3 0x21
#define AS3514_CHARGER 0x22 #define AS3514_CHARGER 0x22
#define AS3514_DCDC15 0x23 #define AS3514_DCDC15 0x23
#define AS3514_SUPERVISOR 0x24 #define AS3514_SUPERVISOR 0x24

2
firmware/target/arm/as3525/ascodec-as3525.c
View file

@ -357,8 +357,10 @@ static void ascodec_wait(struct ascodec_request *req)
static void ascodec_async_write(unsigned int index, unsigned int value, static void ascodec_async_write(unsigned int index, unsigned int value,
struct ascodec_request *req) struct ascodec_request *req)
{ {
#ifndef HAVE_AS3543
if (index == AS3514_CVDD_DCDC3) /* prevent setting of the LREG_CP_not bit */ if (index == AS3514_CVDD_DCDC3) /* prevent setting of the LREG_CP_not bit */
value &= ~(1 << 5); value &= ~(1 << 5);
#endif
ascodec_req_init(req, ASCODEC_REQ_WRITE, index, 1); ascodec_req_init(req, ASCODEC_REQ_WRITE, index, 1);
req->data[0] = value; req->data[0] = value;

9
firmware/target/arm/as3525/system-as3525.c
View file

@ -271,7 +271,8 @@ void system_init(void)
ascodec_init(); ascodec_init();
#if (CONFIG_CPU == AS3525v2) /* Initialize power management settings */
#ifdef HAVE_AS3543
/* PLL: disable audio PLL, we use MCLK already */ /* PLL: disable audio PLL, we use MCLK already */
ascodec_write_pmu(0x1A, 7, 0x02); ascodec_write_pmu(0x1A, 7, 0x02);
/* DCDC_Cntr: set switching speed of CVDD1/2 power supplies to 1 MHz */ /* DCDC_Cntr: set switching speed of CVDD1/2 power supplies to 1 MHz */
@ -286,7 +287,9 @@ void system_init(void)
/* AVDD17: set AVDD17 power supply to 2.5V */ /* AVDD17: set AVDD17 power supply to 2.5V */
ascodec_write_pmu(0x18, 7, 0x31); ascodec_write_pmu(0x18, 7, 0x31);
#endif #endif
#endif /* (CONFIG_CPU == AS3525v2) */ #else
ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING);
#endif /* HAVE_AS3543 */
#ifndef BOOTLOADER #ifndef BOOTLOADER
/* setup isr for microsd monitoring and for fuzev2 scrollwheel irq */ /* setup isr for microsd monitoring and for fuzev2 scrollwheel irq */
@ -296,8 +299,6 @@ void system_init(void)
/* pin selection for irq happens in the drivers */ /* pin selection for irq happens in the drivers */
#endif #endif
/* Initialize power management settings */
ascodec_write(AS3514_CVDD_DCDC3, AS314_CP_DCDC3_SETTING);
#if CONFIG_TUNER #if CONFIG_TUNER
fmradio_i2c_init(); fmradio_i2c_init();
#endif #endif