191 lines
8.4 KiB
Diff
191 lines
8.4 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Piotr Szczepanik <piter75@gmail.com>
|
||
|
|
Date: Thu, 28 Nov 2019 22:29:54 +0000
|
||
|
|
Subject: [ARCHEOLOGY] Initial addition of NanoPi M4V2
|
||
|
|
|
||
|
|
> X-Git-Archeology: - Revision c4eecbcef0d4dc499baf0155449e71dc774bc7c4: https://github.com/armbian/build/commit/c4eecbcef0d4dc499baf0155449e71dc774bc7c4
|
||
|
|
> X-Git-Archeology: Date: Thu, 28 Nov 2019 22:29:54 +0000
|
||
|
|
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Initial addition of NanoPi M4V2
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 40a3d4ecb9a75c17183e2129491b7bc03060a315: https://github.com/armbian/build/commit/40a3d4ecb9a75c17183e2129491b7bc03060a315
|
||
|
|
> X-Git-Archeology: Date: Sun, 17 May 2020 18:42:24 +0200
|
||
|
|
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Fixed rt5651 codec probing after its driver was changed to module (#1969)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 0cdffb29b07305209efb12cf3b5ac6032d3a1153: https://github.com/armbian/build/commit/0cdffb29b07305209efb12cf3b5ac6032d3a1153
|
||
|
|
> X-Git-Archeology: Date: Wed, 24 Mar 2021 19:01:53 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Renaming DEV branch to EDGE (#2704)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision e7377248b3cae186e24e2be781cd3365b43246f0: https://github.com/armbian/build/commit/e7377248b3cae186e24e2be781cd3365b43246f0
|
||
|
|
> X-Git-Archeology: Date: Thu, 22 Jul 2021 00:15:54 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Second part of EDGE bumping to 5.13.y (#3045)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 744ea89a589d62cb6f409baab60fc6664520bc39: https://github.com/armbian/build/commit/744ea89a589d62cb6f409baab60fc6664520bc39
|
||
|
|
> X-Git-Archeology: Date: Wed, 08 Sep 2021 17:51:34 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bumping EDGE kernel to 5.14.y (#3125)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e: https://github.com/armbian/build/commit/dd51f9f2afcbc83a3e10b32eb6a5061d91d1558e
|
||
|
|
> X-Git-Archeology: Date: Tue, 09 Nov 2021 18:06:34 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump imx6, xu4, rockchip64 and jetson-nano to 5.15 (#3238)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 401fb1fde426c93121c4639b34a450d8ff551c85: https://github.com/armbian/build/commit/401fb1fde426c93121c4639b34a450d8ff551c85
|
||
|
|
> X-Git-Archeology: Date: Sat, 20 Nov 2021 19:49:22 +0100
|
||
|
|
> X-Git-Archeology: From: simple <991605149@qq.com>
|
||
|
|
> X-Git-Archeology: Subject: Fixed rt5651 codec build module (#3270)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision ac8fc4385594d59257ee9dffd9efa85e3497fa7d: https://github.com/armbian/build/commit/ac8fc4385594d59257ee9dffd9efa85e3497fa7d
|
||
|
|
> X-Git-Archeology: Date: Sat, 26 Feb 2022 07:46:44 +0100
|
||
|
|
> X-Git-Archeology: From: Piotr Szczepanik <piter75@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: Switch rockchip64 current to linux 5.15.y (#3489)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 897674aa74bce0326ed7fe06f5336bf4709a8a1f: https://github.com/armbian/build/commit/897674aa74bce0326ed7fe06f5336bf4709a8a1f
|
||
|
|
> X-Git-Archeology: Date: Tue, 03 May 2022 08:27:32 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump and freeze kernel at last known working versions (#3736)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 597d2dac11f00d9070a4e49d6bad1b2244e36cb3: https://github.com/armbian/build/commit/597d2dac11f00d9070a4e49d6bad1b2244e36cb3
|
||
|
|
> X-Git-Archeology: Date: Sat, 28 May 2022 07:56:22 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64-edge to 5.18 (#3814)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 8c6641e7b79f0d50acdc306d140e586a4e923cf0: https://github.com/armbian/build/commit/8c6641e7b79f0d50acdc306d140e586a4e923cf0
|
||
|
|
> X-Git-Archeology: Date: Wed, 03 Aug 2022 22:22:55 +0200
|
||
|
|
> X-Git-Archeology: From: Jianfeng Liu <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: update rockchip64 edge to 5.19 (#4039)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 6765f734cc4a22aeaa9f99a3ad28c8c322de26f6: https://github.com/armbian/build/commit/6765f734cc4a22aeaa9f99a3ad28c8c322de26f6
|
||
|
|
> X-Git-Archeology: Date: Tue, 25 Oct 2022 11:26:51 +0200
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Bump rockchip64 edge to 6.0.y (#4337)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 92f1a22d76b987afa7ba555d5b509adc51d689e7: https://github.com/armbian/build/commit/92f1a22d76b987afa7ba555d5b509adc51d689e7
|
||
|
|
> X-Git-Archeology: Date: Fri, 16 Dec 2022 13:38:13 +0100
|
||
|
|
> X-Git-Archeology: From: Igor Pecovnik <igorpecovnik@users.noreply.github.com>
|
||
|
|
> X-Git-Archeology: Subject: Re-add rockchip64 6.0 patches (#4575)
|
||
|
|
> X-Git-Archeology:
|
||
|
|
> X-Git-Archeology: - Revision 34ae84fac5d0b66a1ab2d1e51534b7beb13ef245: https://github.com/armbian/build/commit/34ae84fac5d0b66a1ab2d1e51534b7beb13ef245
|
||
|
|
> X-Git-Archeology: Date: Fri, 05 May 2023 14:22:00 +0200
|
||
|
|
> X-Git-Archeology: From: amazingfate <liujianfeng1994@gmail.com>
|
||
|
|
> X-Git-Archeology: Subject: bump rockchip64 edge to v6.3
|
||
|
|
> X-Git-Archeology:
|
||
|
|
---
|
||
|
|
arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 51 ++++++++++
|
||
|
|
sound/soc/rockchip/Kconfig | 9 ++
|
||
|
|
2 files changed, 60 insertions(+)
|
||
|
|
|
||
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
|
||
|
|
index b6e082f1f6d9..8b37dcb91864 100644
|
||
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
|
||
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi
|
||
|
|
@@ -132,6 +132,27 @@ status_led: led-0 {
|
||
|
|
};
|
||
|
|
};
|
||
|
|
|
||
|
|
+ rt5651-sound {
|
||
|
|
+ compatible = "simple-audio-card";
|
||
|
|
+ simple-audio-card,name = "realtek,rt5651-codec";
|
||
|
|
+ simple-audio-card,format = "i2s";
|
||
|
|
+ simple-audio-card,mclk-fs = <256>;
|
||
|
|
+ simple-audio-card,widgets =
|
||
|
|
+ "Microphone", "Mic Jack",
|
||
|
|
+ "Headphone", "Headphone Jack";
|
||
|
|
+ simple-audio-card,routing =
|
||
|
|
+ "Mic Jack", "micbias1",
|
||
|
|
+ "IN1P", "Mic Jack",
|
||
|
|
+ "Headphone Jack", "HPOL",
|
||
|
|
+ "Headphone Jack", "HPOR";
|
||
|
|
+ simple-audio-card,cpu {
|
||
|
|
+ sound-dai = <&i2s1>;
|
||
|
|
+ };
|
||
|
|
+ simple-audio-card,codec {
|
||
|
|
+ sound-dai = <&rt5651>;
|
||
|
|
+ };
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
sdio_pwrseq: sdio-pwrseq {
|
||
|
|
compatible = "mmc-pwrseq-simple";
|
||
|
|
clocks = <&rk808 1>;
|
||
|
|
@@ -216,6 +237,10 @@ &hdmi_sound {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&hdmi_sound {
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&i2c0 {
|
||
|
|
clock-frequency = <400000>;
|
||
|
|
i2c-scl-rising-time-ns = <160>;
|
||
|
|
@@ -464,6 +489,16 @@ &i2c1 {
|
||
|
|
i2c-scl-rising-time-ns = <150>;
|
||
|
|
i2c-scl-falling-time-ns = <30>;
|
||
|
|
status = "okay";
|
||
|
|
+
|
||
|
|
+ rt5651: rt5651@1a {
|
||
|
|
+ compatible = "realtek,rt5651";
|
||
|
|
+ reg = <0x1a>;
|
||
|
|
+ clocks = <&cru SCLK_I2S_8CH_OUT>;
|
||
|
|
+ clock-names = "mclk";
|
||
|
|
+ hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
|
||
|
|
+ // spk-con-gpio = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
|
||
|
|
+ #sound-dai-cells = <0>;
|
||
|
|
+ };
|
||
|
|
};
|
||
|
|
|
||
|
|
&i2c2 {
|
||
|
|
@@ -495,6 +530,16 @@ &i2s2 {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
|
||
|
|
+&i2s1 {
|
||
|
|
+ rockchip,playback-channels = <8>;
|
||
|
|
+ rockchip,capture-channels = <8>;
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
+&i2s2 {
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
+
|
||
|
|
&io_domains {
|
||
|
|
bt656-supply = <&vcc_1v8>;
|
||
|
|
audio-supply = <&vcca1v8_codec>;
|
||
|
|
@@ -760,3 +805,9 @@ &vopl {
|
||
|
|
&vopl_mmu {
|
||
|
|
status = "okay";
|
||
|
|
};
|
||
|
|
+
|
||
|
|
+&spdif {
|
||
|
|
+ i2c-scl-rising-time-ns = <450>;
|
||
|
|
+ i2c-scl-falling-time-ns = <15>;
|
||
|
|
+ status = "okay";
|
||
|
|
+};
|
||
|
|
diff --git a/sound/soc/rockchip/Kconfig b/sound/soc/rockchip/Kconfig
|
||
|
|
index f98a2fa85edd..be36e36c8783 100644
|
||
|
|
--- a/sound/soc/rockchip/Kconfig
|
||
|
|
+++ b/sound/soc/rockchip/Kconfig
|
||
|
|
@@ -65,6 +65,15 @@ config SND_SOC_ROCKCHIP_RT5645
|
||
|
|
Say Y or M here if you want to add support for SoC audio on Rockchip
|
||
|
|
boards using the RT5645/RT5650 codec, such as Veyron.
|
||
|
|
|
||
|
|
+config SND_SOC_ROCKCHIP_RT5651
|
||
|
|
+ tristate "ASoC support for Rockchip boards using a RT5651 codec"
|
||
|
|
+ depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
|
||
|
|
+ select SND_SOC_ROCKCHIP_I2S
|
||
|
|
+ select SND_SOC_RT5651
|
||
|
|
+ help
|
||
|
|
+ Say Y or M here if you want to add support for SoC audio on Rockchip
|
||
|
|
+ boards using the RT5651 codec, such as FriendlyARM's Nano{Pi,PC} family.
|
||
|
|
+
|
||
|
|
config SND_SOC_RK3288_HDMI_ANALOG
|
||
|
|
tristate "ASoC support multiple codecs for Rockchip RK3288 boards"
|
||
|
|
depends on SND_SOC_ROCKCHIP && I2C && GPIOLIB && HAVE_CLK
|
||
|
|
--
|
||
|
|
Armbian
|
||
|
|
|