Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/arm/dts Enable HDMI audio support on Pine64, Pine64...



details:   https://anonhg.NetBSD.org/src/rev/d44202a90c0f
branches:  trunk
changeset: 461169:d44202a90c0f
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Nov 17 17:35:10 2019 +0000

description:
Enable HDMI audio support on Pine64, Pine64+, and Pine64 LTS boards.

diffstat:

 sys/arch/arm/dts/sun50i-a64-pine64-plus.dts      |  10 ++++++-
 sys/arch/arm/dts/sun50i-a64-pine64.dts           |  10 ++++++-
 sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts |  10 ++++++-
 sys/arch/arm/dts/sun50i-a64.dtsi                 |  32 +++++++++++++++++++++++-
 4 files changed, 58 insertions(+), 4 deletions(-)

diffs (109 lines):

diff -r e0f40642fa26 -r d44202a90c0f sys/arch/arm/dts/sun50i-a64-pine64-plus.dts
--- a/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts       Sun Nov 17 17:33:34 2019 +0000
+++ b/sys/arch/arm/dts/sun50i-a64-pine64-plus.dts       Sun Nov 17 17:35:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.2 2017/09/09 12:05:28 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pine64-plus.dts,v 1.3 2019/11/17 17:35:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -49,3 +49,11 @@
 &ohci0 {
        status = "okay";
 };
+
+&i2s2 {
+       status = "okay";
+};
+
+&sound_hdmi {
+       status = "okay";
+};
diff -r e0f40642fa26 -r d44202a90c0f sys/arch/arm/dts/sun50i-a64-pine64.dts
--- a/sys/arch/arm/dts/sun50i-a64-pine64.dts    Sun Nov 17 17:33:34 2019 +0000
+++ b/sys/arch/arm/dts/sun50i-a64-pine64.dts    Sun Nov 17 17:35:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pine64.dts,v 1.1 2018/02/18 12:20:25 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pine64.dts,v 1.2 2019/11/17 17:35:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,3 +28,11 @@
 
 #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts"
 #include "sun50i-a64.dtsi"
+
+&i2s2 {
+       status = "okay";
+};
+
+&sound_hdmi {
+       status = "okay";
+};
diff -r e0f40642fa26 -r d44202a90c0f sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts
--- a/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts  Sun Nov 17 17:33:34 2019 +0000
+++ b/sys/arch/arm/dts/sun50i-a64-sopine-baseboard.dts  Sun Nov 17 17:35:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.1 2018/06/07 00:51:41 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-sopine-baseboard.dts,v 1.2 2019/11/17 17:35:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -28,3 +28,11 @@
 
 #include "../../../external/gpl2/dts/dist/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts"
 #include "sun50i-a64.dtsi"
+
+&i2s2 {
+       status = "okay";
+};
+
+&sound_hdmi {
+       status = "okay";
+};
diff -r e0f40642fa26 -r d44202a90c0f sys/arch/arm/dts/sun50i-a64.dtsi
--- a/sys/arch/arm/dts/sun50i-a64.dtsi  Sun Nov 17 17:33:34 2019 +0000
+++ b/sys/arch/arm/dts/sun50i-a64.dtsi  Sun Nov 17 17:35:10 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.12 2019/11/08 11:12:09 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.13 2019/11/17 17:35:10 jmcneill Exp $ */
 
 /*-
  * Copyright (c) 2017 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -59,6 +59,36 @@
                             <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,
                             <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>;
        };
+
+       i2s2: i2s@1c22800 {
+               #sound-dai-cells = <0>;
+               compatible = "allwinner,sun50i-a64-i2s",
+                            "allwinner,sun8i-h3-i2s";
+               reg = <0x01c22800 0x400>;
+               interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
+               clocks = <&ccu CLK_BUS_I2S2>, <&ccu CLK_I2S2>;
+               clock-names = "apb", "mod";
+               resets = <&ccu RST_BUS_I2S2>;
+               dma-names = "tx";
+               dmas = <&dma 27>;
+               status = "disabled";
+       };
+
+       sound_hdmi: sound-hdmi {
+               compatible = "simple-audio-card";
+               simple-audio-card,name = "hdmi-audio";
+               simple-audio-card,format = "i2s";
+               simple-audio-card,mclk-fs = <256>;
+               status = "disabled";
+
+               simple-audio-card,cpu {
+                       sound-dai = <&i2s2>;
+               };
+
+               simple-audio-card,codec {
+                       sound-dai = <&hdmi>;
+               };
+       };
 };
 
 &cpu0 {



Home | Main Index | Thread Index | Old Index