Module Name: src Committed By: jmcneill Date: Thu Jun 6 23:19:07 UTC 2019
Modified Files: src/sys/arch/arm/sunxi: sun8i_codec.c sunxi_i2s.c Log Message: Update compatible strings for mainline To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/sunxi/sun8i_codec.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_i2s.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/arch/arm/sunxi/sun8i_codec.c diff -u src/sys/arch/arm/sunxi/sun8i_codec.c:1.6 src/sys/arch/arm/sunxi/sun8i_codec.c:1.7 --- src/sys/arch/arm/sunxi/sun8i_codec.c:1.6 Wed May 8 13:40:14 2019 +++ src/sys/arch/arm/sunxi/sun8i_codec.c Thu Jun 6 23:19:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sun8i_codec.c,v 1.6 2019/05/08 13:40:14 isaki Exp $ */ +/* $NetBSD: sun8i_codec.c,v 1.7 2019/06/06 23:19:07 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sun8i_codec.c,v 1.6 2019/05/08 13:40:14 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sun8i_codec.c,v 1.7 2019/06/06 23:19:07 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -333,7 +333,7 @@ sun8i_codec_thread(struct work *wk, void } static const char * compatible[] = { - "allwinner,sun50i-a64-codec", + "allwinner,sun8i-a33-codec", NULL }; Index: src/sys/arch/arm/sunxi/sunxi_i2s.c diff -u src/sys/arch/arm/sunxi/sunxi_i2s.c:1.4 src/sys/arch/arm/sunxi/sunxi_i2s.c:1.5 --- src/sys/arch/arm/sunxi/sunxi_i2s.c:1.4 Wed May 8 13:40:14 2019 +++ src/sys/arch/arm/sunxi/sunxi_i2s.c Thu Jun 6 23:19:07 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: sunxi_i2s.c,v 1.4 2019/05/08 13:40:14 isaki Exp $ */ +/* $NetBSD: sunxi_i2s.c,v 1.5 2019/06/06 23:19:07 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill <jmcne...@invisible.ca> @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.4 2019/05/08 13:40:14 isaki Exp $"); +__KERNEL_RCSID(0, "$NetBSD: sunxi_i2s.c,v 1.5 2019/06/06 23:19:07 jmcneill Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -108,7 +108,7 @@ static const struct sunxi_i2s_config sun }; static const struct of_compat_data compat_data[] = { - { "allwinner,sun50i-a64-acodec-i2s", + { "allwinner,sun50i-a64-codec-i2s", (uintptr_t)&sun50i_a64_codec_config }, { NULL }