nathan/CoolPi-Armbian-Rockchip-RK3588-Upstream-Linux-6.1-LTS-Kernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modify the CM5-EVB audio clock configuration to solve the issue of no sound and enable NOR MTD device support

Browse Source
This commit is contained in:
george 2024-08-26 00:02:53 +08:00 committed by Nathan
parent 9be512fd0e
commit 367c08ef88
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
arch/arm64/boot/dts/rockchip/rk3588-cpcm5-evb-v11.dts
View File

@ -170,18 +170,18 @@
}; };
hdmi1_sound: hdmi1-sound { hdmi1_sound: hdmi1-sound {
status = "okay"; status = "okay";
compatible = "rockchip,hdmi"; compatible = "rockchip,hdmi";
rockchip,mclk-fs = <128>; rockchip,mclk-fs = <128>;
rockchip,card-name = "rockchip-hdmi1"; rockchip,card-name = "rockchip-hdmi1";
rockchip,cpu = <&i2s6_8ch>; rockchip,cpu = <&i2s6_8ch>;
rockchip,codec = <&hdmi1>; rockchip,codec = <&hdmi1>;
rockchip,jack-det; rockchip,jack-det;
}; };
dp0_sound: dp0-sound { dp0_sound: dp0-sound {
status = "okay"; status = "okay";
compatible = "rockchip,hdmi"; compatible = "rockchip,hdmi";
rockchip,card-name= "rockchip,dp0"; rockchip,card-name= "rockchip-dp0";
rockchip,mclk-fs = <512>; rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx2>; rockchip,cpu = <&spdif_tx2>;
rockchip,codec = <&dp0 1>; rockchip,codec = <&dp0 1>;
@ -191,7 +191,7 @@
dp1_sound: dp1-sound { dp1_sound: dp1-sound {
status = "okay"; status = "okay";
compatible = "rockchip,hdmi"; compatible = "rockchip,hdmi";
rockchip,card-name= "rockchip,dp1"; rockchip,card-name= "rockchip-dp1";
rockchip,mclk-fs = <512>; rockchip,mclk-fs = <512>;
rockchip,cpu = <&spdif_tx5>; rockchip,cpu = <&spdif_tx5>;
rockchip,codec = <&dp1 1>; rockchip,codec = <&dp1 1>;
@ -259,7 +259,7 @@
es8316_sound: es8316-sound { es8316_sound: es8316-sound {
status = "okay"; status = "okay";
compatible = "rockchip,multicodecs-card"; compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rk3588-es8316"; rockchip,card-name = "coolpi-es8316";
io-channels = <&saradc 3>; io-channels = <&saradc 3>;
io-channel-names = "adc-detect"; io-channel-names = "adc-detect";
keyup-threshold-microvolt = <1800000>; keyup-threshold-microvolt = <1800000>;
@ -287,7 +287,7 @@
rockchip,format = "i2s"; rockchip,format = "i2s";
rockchip,bitclock-master = <&hdmirx_ctrler>; rockchip,bitclock-master = <&hdmirx_ctrler>;
rockchip,frame-master = <&hdmirx_ctrler>; rockchip,frame-master = <&hdmirx_ctrler>;
rockchip,card-name = "rockchip,hdmiin"; rockchip,card-name = "rockchip-hdmiin";
rockchip,cpu = <&i2s7_8ch>; rockchip,cpu = <&i2s7_8ch>;
rockchip,codec = <&hdmirx_ctrler 0>; rockchip,codec = <&hdmirx_ctrler 0>;
rockchip,jack-det; rockchip,jack-det;
@ -945,7 +945,7 @@
&hdmi1 { &hdmi1 {
enable-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; enable-gpios = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&hdmim2_tx1_cec &hdmim0_tx1_hpd &hdmim1_tx1_scl &hdmim1_tx1_sda>; pinctrl-0 = <&hdmim0_tx1_hpd &hdmim1_tx1_scl &hdmim1_tx1_sda>;
status = "okay"; status = "okay";
}; };
@ -1104,9 +1104,9 @@
#sound-dai-cells = <0>; #sound-dai-cells = <0>;
compatible = "everest,es8316"; compatible = "everest,es8316";
reg = <0x10>; reg = <0x10>;
clocks = <&cru I2S0_8CH_MCLKOUT>; clocks = <&mclkout_i2s0>;
clock-names = "mclk"; clock-names = "mclk";
assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; assigned-clocks = <&mclkout_i2s0>;
assigned-clock-rates = <12288000>; assigned-clock-rates = <12288000>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2s0_mclk>; pinctrl-0 = <&i2s0_mclk>;