summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-05-16 09:22:02 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-05-16 09:22:02 +0000
commitb9beeccbcf34ce08a191c22b2970475053938b27 (patch)
treeabfe44096c61c40d1416686b624222ea47e7c57a
parent33bb4cdb1b01221eb7d3548a774fdd242f4cbb7b (diff)
downloadrockbox-b9beeccbcf34ce08a191c22b2970475053938b27.tar.gz
rockbox-b9beeccbcf34ce08a191c22b2970475053938b27.zip
as3525v1 use an as3515 audio codec/PMU, not an as3517 as previously thought
-> Change references to as3517 into as3515 there is a reference to the as3515 in the public as3525 datasheet to support this fact as3517 is used in the as3527 SoC, the (public) as3527 datasheet has detailed information on its registers the audio codec/PMU used in as3525v2 (thought to be as3543) appears to be compatible (identical?) with as3517 git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26075 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/audio/as3514.c2
-rw-r--r--firmware/export/as3514.h4
-rw-r--r--firmware/target/arm/as3525/usb-drv-as3525.c6
3 files changed, 6 insertions, 6 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index 4bd32ce894..ac3350eb47 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -34,7 +34,7 @@
34/* 34/*
35 * This drivers supports: 35 * This drivers supports:
36 * as3514 , as used in the PP targets 36 * as3514 , as used in the PP targets
37 * as3517 , as used in the as3525 targets 37 * as3515 , as used in the as3525 targets
38 * as3543 , as used in the as3525v2 targets 38 * as3543 , as used in the as3525v2 targets
39 */ 39 */
40 40
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 60f0e4c6d2..df149c274a 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -58,7 +58,7 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
58#define AS3514_AUDIOSET1 0x14 58#define AS3514_AUDIOSET1 0x14
59#define AS3514_AUDIOSET2 0x15 59#define AS3514_AUDIOSET2 0x15
60#define AS3514_AUDIOSET3 0x16 60#define AS3514_AUDIOSET3 0x16
61#define AS3517_USB_UTIL 0x17 /* only in as3517+ */ 61#define AS3515_USB_UTIL 0x17 /* only in as3515 */
62 62
63#ifdef HAVE_AS3543 63#ifdef HAVE_AS3543
64#define AS3543_BACKLIGHT 0x1b 64#define AS3543_BACKLIGHT 0x1b
@@ -112,7 +112,7 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
112 112
113/* HPH_OUT_R (0x02) */ 113/* HPH_OUT_R (0x02) */
114#define HPH_OUT_R_HP_OVC_TO (0x3 << 6) 114#define HPH_OUT_R_HP_OVC_TO (0x3 << 6)
115 /* AS3514/AS3517 */ 115 /* AS3514/AS3515 */
116 #define HPH_OUT_R_HP_OVC_TO_0MS (0x3 << 6) 116 #define HPH_OUT_R_HP_OVC_TO_0MS (0x3 << 6)
117 #define HPH_OUT_R_HP_OVC_TO_128MS (0x1 << 6) 117 #define HPH_OUT_R_HP_OVC_TO_128MS (0x1 << 6)
118 #define HPH_OUT_R_HP_OVC_TO_256MS (0x0 << 6) 118 #define HPH_OUT_R_HP_OVC_TO_256MS (0x0 << 6)
diff --git a/firmware/target/arm/as3525/usb-drv-as3525.c b/firmware/target/arm/as3525/usb-drv-as3525.c
index 7eb84cd635..488fbff6b1 100644
--- a/firmware/target/arm/as3525/usb-drv-as3525.c
+++ b/firmware/target/arm/as3525/usb-drv-as3525.c
@@ -122,7 +122,7 @@ void usb_drv_init(void)
122 endpoints[i].busy = false; 122 endpoints[i].busy = false;
123 123
124 ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) | 1<<2); 124 ascodec_write(AS3514_CVDD_DCDC3, ascodec_read(AS3514_CVDD_DCDC3) | 1<<2);
125 ascodec_write(AS3517_USB_UTIL, ascodec_read(AS3517_USB_UTIL) & ~(1<<4)); 125 ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) & ~(1<<4));
126 126
127 /* PHY part */ 127 /* PHY part */
128 CGU_USB = 1<<5 /* enable */ 128 CGU_USB = 1<<5 /* enable */
@@ -137,7 +137,7 @@ void usb_drv_init(void)
137 USB_DEV_CTRL |= 0x400; /* soft disconnect */ 137 USB_DEV_CTRL |= 0x400; /* soft disconnect */
138 138
139 /* UVDD */ 139 /* UVDD */
140 ascodec_write(AS3517_USB_UTIL, ascodec_read(AS3517_USB_UTIL) | (1<<4)); 140 ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) | (1<<4));
141 sleep(10); //msleep(100) 141 sleep(10); //msleep(100)
142 142
143 USB_GPIO_CSR = 0x6180000; 143 USB_GPIO_CSR = 0x6180000;
@@ -199,7 +199,7 @@ void usb_drv_exit(void)
199 VIC_INT_EN_CLEAR = INTERRUPT_USB; 199 VIC_INT_EN_CLEAR = INTERRUPT_USB;
200 CGU_USB &= ~(1<<5); 200 CGU_USB &= ~(1<<5);
201 CGU_PERI &= ~CGU_USB_CLOCK_ENABLE; 201 CGU_PERI &= ~CGU_USB_CLOCK_ENABLE;
202 ascodec_write(AS3517_USB_UTIL, ascodec_read(AS3517_USB_UTIL) & ~(1<<4)); 202 ascodec_write(AS3515_USB_UTIL, ascodec_read(AS3515_USB_UTIL) & ~(1<<4));
203} 203}
204 204
205int usb_drv_port_speed(void) 205int usb_drv_port_speed(void)