[src/trunk]: src/sys/arch/arm/sunxi Setup routing at init and toggle PA mute ...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/979e5171ff4f
branches:  trunk
changeset: 356020:979e5171ff4f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Aug 27 22:22:32 2017 +0000

description:
Setup routing at init and toggle PA mute pin (if available) for mute.

diffstat:

 sys/arch/arm/sunxi/sun4i_a10_codec.c |  31 ++++++++++++-------------------
 1 files changed, 12 insertions(+), 19 deletions(-)

diffs (62 lines):

diff -r 261d0ffad72a -r 979e5171ff4f sys/arch/arm/sunxi/sun4i_a10_codec.c
--- a/sys/arch/arm/sunxi/sun4i_a10_codec.c      Sun Aug 27 20:45:47 2017 +0000
+++ b/sys/arch/arm/sunxi/sun4i_a10_codec.c      Sun Aug 27 22:22:32 2017 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_a10_codec.c,v 1.1 2017/08/27 16:05:26 jmcneill Exp $ */
+/* $NetBSD: sun4i_a10_codec.c,v 1.2 2017/08/27 22:22:32 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2014-2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_a10_codec.c,v 1.1 2017/08/27 16:05:26 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_a10_codec.c,v 1.2 2017/08/27 22:22:32 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -120,9 +120,17 @@
 
        /* Unmute PA */
        SET4(sc, A10_DAC_ACTRL, A10_PAMUTE);
+
        /* Set initial volume */
        CLR4(sc, A10_DAC_ACTRL, A10_PAVOL);
        SET4(sc, A10_DAC_ACTRL, __SHIFTIN(A10_DEFAULT_PAVOL, A10_PAVOL));
+
+       /* Enable DAC analog l/r channels and output mixer */
+       SET4(sc, A10_DAC_ACTRL, A10_DACAREN | A10_DACALEN | A10_DACPAS);
+
+       /* Enable ADC analog l/r channels */
+       SET4(sc, A10_ADC_ACTRL, A10_ADCREN | A10_ADCLEN);
+
        /* Enable PA */
        SET4(sc, A10_ADC_ACTRL, A10_PA_EN);
 
@@ -133,23 +141,8 @@
 a10_codec_mute(struct sunxi_codec_softc *sc, int mute, u_int mode)
 {
        if (mode == AUMODE_PLAY) {
-               const uint32_t pmask = A10_DACAREN|A10_DACALEN|A10_DACPAS;
-               if (mute) {
-                       /* Mute DAC l/r channels to output mixer */
-                       CLR4(sc, A10_DAC_ACTRL, pmask);
-               } else {
-                       /* Enable DAC analog l/r channels and output mixer */
-                       SET4(sc, A10_DAC_ACTRL, pmask);
-               }
-       } else {
-               const uint32_t rmask = A10_ADCREN|A10_ADCLEN;
-               if (mute) {
-                       /* Disable ADC analog l/r channels */
-                       CLR4(sc, A10_ADC_ACTRL, rmask);
-               } else {
-                       /* Enable ADC analog l/r channels */
-                       SET4(sc, A10_ADC_ACTRL, rmask);
-               }
+               if (sc->sc_pin_pa != NULL)
+                       fdtbus_gpio_write(sc->sc_pin_pa, !mute);
        }
 }