Module Name: src
Committed By: jmcneill
Date: Thu Jun 6 23:19:45 UTC 2019
Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts sun50i-a64.dtsi
Log Message:
Remove audio related nodes (they are present in mainline dts now)
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/dts/sun50i-a64.dtsi
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/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.15 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.15 Sun Feb 3 13:19:20 2019
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Thu Jun 6 23:19:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.15 2019/02/03 13:19:20 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.16 2019/06/06 23:19:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017-2019 Jared McNeill <[email protected]>
@@ -91,18 +91,6 @@
status = "okay";
};
-&codec_analog {
- status = "okay";
-};
-
-&dai {
- status = "okay";
-};
-
-&sound {
- status = "okay";
-};
-
&de {
status = "okay";
};
Index: src/sys/arch/arm/dts/sun50i-a64.dtsi
diff -u src/sys/arch/arm/dts/sun50i-a64.dtsi:1.10 src/sys/arch/arm/dts/sun50i-a64.dtsi:1.11
--- src/sys/arch/arm/dts/sun50i-a64.dtsi:1.10 Tue Jan 22 15:28:45 2019
+++ src/sys/arch/arm/dts/sun50i-a64.dtsi Thu Jun 6 23:19:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64.dtsi,v 1.10 2019/01/22 15:28:45 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64.dtsi,v 1.11 2019/06/06 23:19:45 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -40,53 +40,7 @@
};
};
- sound: sound {
- compatible = "simple-audio-card";
- simple-audio-card,name = "SUN50I Audio Card";
- simple-audio-card,format = "i2s";
- simple-audio-card,frame-master = <&cpudai>;
- simple-audio-card,bitclock-master = <&cpudai>;
- simple-audio-card,mclk-fs = <512>;
- simple-audio-card,aux-devs = <&codec_analog>;
- simple-audio-card,routing =
- "Left DAC", "AIF1 Slot 0 Left",
- "Right DAC", "AIF1 Slot 0 Right";
- status = "disabled";
-
- cpudai: simple-audio-card,cpu {
- sound-dai = <&dai>;
- };
-
- link_codec: simple-audio-card,codec {
- sound-dai = <&codec>;
- };
- };
-
soc {
- dai: dai@1c22c00 {
- #sound-dai-cells = <0>;
- compatible = "allwinner,sun50i-a64-acodec-i2s";
- reg = <0x01c22c00 0x200>;
- interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
- clock-names = "apb", "mod";
- resets = <&ccu RST_BUS_CODEC>;
- reset-names = "rst";
- dmas = <&dma 15>, <&dma 15>;
- dma-names = "rx", "tx";
- status = "disabled";
- };
-
- codec: codec@1c22e00 {
- #sound-dai-cells = <0>;
- compatible = "allwinner,sun50i-a64-codec";
- reg = <0x01c22e00 0x600>;
- interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
- clocks = <&ccu CLK_BUS_CODEC>, <&ccu CLK_AC_DIG>;
- clock-names = "bus", "mod";
- status = "disabled";
- };
-
rtp: rtp@1c25000 {
compatible = "allwinner,sun50i-a64-ts";
reg = <0x01c25000 0x400>;
@@ -96,12 +50,6 @@
resets = <&ccu RST_BUS_THS>;
#thermal-sensor-cells = <0>;
};
-
- codec_analog: codec-analog@1f015c0 {
- compatible = "allwinner,sun50i-a64-codec-analog";
- reg = <0x01f015c0 0x4>;
- status = "disabled";
- };
};
};
