Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/macppc/dev explicitly enable the i2s part in the ke...



details:   https://anonhg.NetBSD.org/src/rev/0d323cc7a4db
branches:  trunk
changeset: 321650:0d323cc7a4db
user:      macallan <macallan%NetBSD.org@localhost>
date:      Thu Mar 29 18:34:32 2018 +0000

description:
explicitly enable the i2s part in the keylargo FCR
now this works on my PCI-X G5

diffstat:

 sys/arch/macppc/dev/snapper.c |  10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diffs (37 lines):

diff -r d9ae90d9b1f8 -r 0d323cc7a4db sys/arch/macppc/dev/snapper.c
--- a/sys/arch/macppc/dev/snapper.c     Thu Mar 29 17:46:17 2018 +0000
+++ b/sys/arch/macppc/dev/snapper.c     Thu Mar 29 18:34:32 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: snapper.c,v 1.45 2018/03/29 06:56:54 macallan Exp $    */
+/*     $NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $    */
 /*     Id: snapper.c,v 1.11 2002/10/31 17:42:13 tsubai Exp     */
 /*     Id: i2s.c,v 1.12 2005/01/15 14:32:35 tsubai Exp         */
 
@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.45 2018/03/29 06:56:54 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: snapper.c,v 1.46 2018/03/29 18:34:32 macallan Exp $");
 
 #include <sys/param.h>
 #include <sys/audioio.h>
@@ -2064,13 +2064,17 @@
 {
        int gpio;
        int headphone_detect_intr;
-       uint32_t gpio_base, reg[1];
+       uint32_t gpio_base, reg[1], fcreg;
 #ifdef SNAPPER_DEBUG
        char fcr[32];
 
        snprintb(fcr, sizeof(fcr),  FCR3C_BITMASK, obio_read_4(KEYLARGO_FCR1));
        printf("FCR(0x3c) %s\n", fcr);
 #endif
+       fcreg = obio_read_4(KEYLARGO_FCR1);
+       fcreg |= I2S0CLKEN | I2S0EN;
+       obio_write_4(KEYLARGO_FCR1, fcreg);
+
        headphone_detect_intr = -1;
 
        gpio = of_getnode_byname(OF_parent(node), "gpio");



Home | Main Index | Thread Index | Old Index