summaryrefslogtreecommitdiffstats
path: root/firmware
diff options
context:
space:
mode:
authorRafaël Carré <rafael.carre@gmail.com>2010-04-26 23:26:08 +0000
committerRafaël Carré <rafael.carre@gmail.com>2010-04-26 23:26:08 +0000
commitbe177138d381d3bb23feb51d600ecfe3727f19ff (patch)
treea76761ae73ff039b9736193036ab6de49b157d6e /firmware
parent7d8069d2e75a9c0d3150377d095f41476277abc3 (diff)
downloadrockbox-be177138d381d3bb23feb51d600ecfe3727f19ff.tar.gz
rockbox-be177138d381d3bb23feb51d600ecfe3727f19ff.zip
as3514: detail bit of AS3543_DAC_IF
it lets you select internal PLL or external MCLK and is not related to mute git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25731 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
-rw-r--r--firmware/drivers/audio/as3514.c12
-rw-r--r--firmware/export/as3514.h6
2 files changed, 7 insertions, 11 deletions
diff --git a/firmware/drivers/audio/as3514.c b/firmware/drivers/audio/as3514.c
index a996610899..d9ff94a95e 100644
--- a/firmware/drivers/audio/as3514.c
+++ b/firmware/drivers/audio/as3514.c
@@ -190,7 +190,7 @@ void audiohw_preinit(void)
#endif
#ifdef HAVE_AS3543
- as3514_clear(AS3543_DAC_IF, 0x80);
+ as3514_write(AS3543_DAC_IF, AS3543_DAC_INT_PLL);
as3514_set(AS3514_LINE_IN1_R, LINE_IN_R_LINE_SELECT); /* Line 2 */
#else
/* Mute and disable speaker */
@@ -284,15 +284,9 @@ void audiohw_mute(bool mute)
{
if (mute) {
as3514_set(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE);
-#ifdef HAVE_AS3543
- as3514_set(AS3543_DAC_IF, 0x80);
-#endif
} else {
as3514_clear(AS3514_HPH_OUT_L, HPH_OUT_L_HP_MUTE);
-#ifdef HAVE_AS3543
- as3514_clear(AS3543_DAC_IF, 0x80);
-#endif
}
}
@@ -313,10 +307,6 @@ void audiohw_close(void)
as3514_clear(AS3514_HPH_OUT_L, HPH_OUT_L_HP_ON);
as3514_write(AS3514_AUDIOSET1, 0x0);
-#ifdef HAVE_AS3543
- as3514_set(AS3543_DAC_IF, 0x80);
-#endif
-
/* Allow caps to discharge */
sleep(HZ/4);
}
diff --git a/firmware/export/as3514.h b/firmware/export/as3514.h
index 2db28397f1..40bf512517 100644
--- a/firmware/export/as3514.h
+++ b/firmware/export/as3514.h
@@ -222,6 +222,12 @@ extern void audiohw_set_lineout_vol(int vol_l, int vol_r);
#endif
/* Use AS3514_VOL_MASK */
+/* DAC_IF (11h) */
+#ifdef HAVE_AS3543
+#define AS3543_DAC_INT_PLL (0x0 << 7)
+#define AS3543_DAC_EXT_MCLK (0x1 << 7)
+#endif
+
/* AUDIOSET1 (14h)*/
#define AUDIOSET1_ADC_on (0x1 << 7)
#define AUDIOSET1_SUM_on (0x1 << 6)