5 files changed, 94 insertions, 9 deletions

diff --git a/firmware/target/mips/ingenic_x1000/debug-x1000.c b/firmware/target/mips/ingenic_x1000/debug-x1000.c
index 236442a880..827bb37855 100644
--- a/firmware/target/mips/ingenic_x1000/debug-x1000.c
+++ b/firmware/target/mips/ingenic_x1000/debug-x1000.c
@@ -121,6 +121,9 @@ extern volatile unsigned aic_tx_underruns;
 #ifdef HAVE_RECORDING
 extern volatile unsigned aic_rx_overruns;
 #endif
+#ifdef HAVE_EROS_QN_CODEC
+extern int es9018k2m_present_flag;
+#endif
 
 static bool dbg_audio(void)
 {
@@ -130,6 +133,16 @@ static bool dbg_audio(void)
 #ifdef HAVE_RECORDING
         lcd_putsf(0, 1, "RX overruns:  %u", aic_rx_overruns);
 #endif
+#ifdef HAVE_EROS_QN_CODEC
+        if (es9018k2m_present_flag)
+        {
+            lcd_putsf(0, 2, "(%d) ES9018K2M HWVOL", es9018k2m_present_flag);
+        }
+        else
+        {
+            lcd_putsf(0, 2, "(%d) SWVOL", es9018k2m_present_flag);
+        }
+#endif
         lcd_update();
     } while(get_action(CONTEXT_STD, HZ) != ACTION_STD_CANCEL);
 
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
index c53da728ff..1e3e7f0b7f 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/audiohw-erosqnative.c
@@ -19,13 +19,19 @@
  *
  ****************************************************************************/
 
-#include "audiohw.h"
 #include "system.h"
+#include "audiohw.h"
+#include "pcm_sw_volume.h"
 #include "pcm_sampr.h"
+#include "i2c-target.h"
+#include "button.h"
+
+// #define LOGF_ENABLE
+#include "logf.h"
+
 #include "aic-x1000.h"
 #include "i2c-x1000.h"
 #include "gpio-x1000.h"
-#include "logf.h"
 
 /*
  * Earlier devices audio path appears to be:
@@ -42,7 +48,7 @@ void audiohw_init(void)
     /* explicitly mute everything */
     gpio_set_level(GPIO_HPAMP_SHDN, 0);
     gpio_set_level(GPIO_STEREOSW_MUTE, 1);
-    gpio_set_level(GPIO_DAC_XMIT, 0);
+    gpio_set_level(GPIO_DAC_PWR, 0);
 
     aic_set_play_last_sample(true);
     aic_set_external_codec(true);
@@ -81,18 +87,34 @@ void audiohw_postinit(void)
     gpio_set_level(GPIO_STEREOSW_SEL, 0);
     gpio_set_level(GPIO_HPAMP_SHDN, 1);
     mdelay(10);
-    gpio_set_level(GPIO_DAC_XMIT, 1);
+    gpio_set_level(GPIO_DAC_PWR, 1);
     mdelay(10);
     gpio_set_level(GPIO_STEREOSW_MUTE, 0);
+
+    i2c_x1000_set_freq(ES9018K2M_BUS, I2C_FREQ_400K);
+
+    int ret = es9018k2m_read_reg(ES9018K2M_REG0_SYSTEM_SETTINGS);
+    if (ret >= 0) /* Detected ES9018K2M DAC */
+    {
+        logf("ES9018K2M found: ret=%d", ret);
+        es9018k2m_present_flag = 1;
+
+       /* Default is 32-bit data, and it works ok. Enabling the following
+        * causes issue. Which is weird, I definitely thought AIC was configured
+        * for 24-bit data... */
+        // es9018k2m_write_reg(ES9018K2M_REG1_INPUT_CONFIG, 0b01001100); // 24-bit data
+
+    } else { /* Default to SWVOL for PCM5102A DAC */
+        logf("Default to SWVOL: ret=%d", ret);
+    }
 }
 
-/* TODO: get shutdown just right according to dac datasheet */
 void audiohw_close(void)
 {
     /* mute - attempt to make power-off pop-free */
     gpio_set_level(GPIO_STEREOSW_MUTE, 1);
     mdelay(10);
-    gpio_set_level(GPIO_DAC_XMIT, 0);
+    gpio_set_level(GPIO_DAC_PWR, 0);
     mdelay(10);
     gpio_set_level(GPIO_HPAMP_SHDN, 0);
 }
@@ -107,3 +129,46 @@ void audiohw_set_frequency(int fsel)
     aic_enable_i2s_bit_clock(true);
 }
 
+void audiohw_set_volume(int vol_l, int vol_r)
+{
+    int l, r;
+
+    eros_qn_set_last_vol(vol_l, vol_r);
+
+    l = vol_l;
+    r = vol_r;
+
+#if (defined(HAVE_HEADPHONE_DETECTION) && defined(HAVE_LINEOUT_DETECTION))
+    /* make sure headphones aren't present - don't want to
+     * blow out our eardrums cranking it to full */
+    if (lineout_inserted() && !headphones_inserted())
+    {
+        eros_qn_switch_output(1);
+
+        l = r = eros_qn_get_volume_limit();
+    }
+    else
+    {
+        eros_qn_switch_output(0);
+    }
+#endif
+
+    if (es9018k2m_present_flag) /* ES9018K2M */
+    {
+        /* Same volume range and mute point for both DACs, so use PCM5102A_VOLUME_MIN */
+        l = l <= PCM5102A_VOLUME_MIN ? PCM_MUTE_LEVEL : l;
+        r = r <= PCM5102A_VOLUME_MIN ? PCM_MUTE_LEVEL : r;
+
+        /* set software volume just below unity due to
+         * DAC offset. We don't want to overflow the PCM system. */
+        pcm_set_master_volume(-1, -1);
+        es9018k2m_set_volume(l, r);
+    }
+    else /* PCM5102A */
+    {
+        l = l <= PCM5102A_VOLUME_MIN ? PCM_MUTE_LEVEL : (l / 20);
+        r = r <= PCM5102A_VOLUME_MIN ? PCM_MUTE_LEVEL : (r / 20);
+
+        pcm_set_master_volume(l, r);
+    }
+}
\ No newline at end of file
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
index d82cb5b5dc..0d2207af2a 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/button-erosqnative.c
@@ -127,7 +127,7 @@ bool headphones_inserted(void)
     {
         hp_detect_reg_old = hp_detect_reg;
 #if !defined(BOOTLOADER)
-        dac_set_outputs();
+        eros_qn_set_outputs();
 #endif
     }
     return hp_detect_reg & 0x10 ? false : true;
@@ -140,7 +140,7 @@ bool lineout_inserted(void)
     {
         hp_detect_reg_old = hp_detect_reg;
 #if !defined(BOOTLOADER)
-        dac_set_outputs();
+        eros_qn_set_outputs();
 #endif
     }
     return hp_detect_reg & 0x20 ? false : true;
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h b/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
index 3318a39786..72052c261f 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/gpio-target.h
@@ -15,17 +15,21 @@
 
 /* ---------------------------------------------- */
 
+
 /*              Name            Port    Pins            Function */
 DEFINE_PINGROUP(LCD_DATA,       GPIO_A, 0xffff <<  0,   GPIOF_DEVICE(1))
 DEFINE_PINGROUP(LCD_CONTROL,    GPIO_B,   0x1a << 16,   GPIOF_DEVICE(1))
 DEFINE_PINGROUP(MSC0,           GPIO_A,   0x3f << 20,   GPIOF_DEVICE(1))
 DEFINE_PINGROUP(SFC,            GPIO_A,   0x3f << 26,   GPIOF_DEVICE(1))
 DEFINE_PINGROUP(I2S,            GPIO_B,   0x1f <<  0,   GPIOF_DEVICE(1))
+DEFINE_PINGROUP(I2C1,           GPIO_C,      3 << 26,   GPIOF_DEVICE(0))
 DEFINE_PINGROUP(I2C2,           GPIO_D,      3 <<  0,   GPIOF_DEVICE(1))
 
 /*          Name                Pin             Function */
 /* mute DAC: 0 - mute, 1 - play */
-DEFINE_GPIO(DAC_XMIT,           GPIO_PB(12),    GPIOF_OUTPUT(0))
+/* Note: This seems to actually be power to the DAC in general,
+ * at least on the ES9018K2M devices. Was "DAC_XMIT". */
+DEFINE_GPIO(DAC_PWR,           GPIO_PB(12),    GPIOF_OUTPUT(0))
 
 /* mute HP amp: 0 - mute, 1 - play */
 DEFINE_GPIO(HPAMP_SHDN,         GPIO_PB(8),     GPIOF_OUTPUT(0))
diff --git a/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h b/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
index 8d0b8a6e20..89d995f33a 100644
--- a/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
+++ b/firmware/target/mips/ingenic_x1000/erosqnative/i2c-target.h
@@ -25,6 +25,9 @@
 #define I2C_ASYNC_BUS_COUNT  3
 #define I2C_ASYNC_QUEUE_SIZE 4
 
+#define ES9018K2M_BUS 1
+#define ES9018K2M_ADDR 0x48
+
 #define AXP_PMU_BUS  2
 #define AXP_PMU_ADDR 0x34