From 071106ecf68c401173c58808b1cf5f68cc50d390 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 05 Jan 2024 08:39:27 +0000
Subject: [PATCH] change wifi driver to cypress
---
kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
index 8a1dc80..3f59acc 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-nvr-demo-v10.dtsi
@@ -35,23 +35,13 @@
compatible = "simple-audio-card";
simple-audio-card,format = "i2s";
simple-audio-card,mclk-fs = <256>;
- simple-audio-card,name = "rockchip-i2s1";
+ simple-audio-card,name = "rockchip,i2s1-sound";
simple-audio-card,cpu {
sound-dai = <&i2s1_8ch>;
};
simple-audio-card,codec {
sound-dai = <&es8311>;
};
- };
-
- rk618_hdmi_sound: rk618-hdmi-sound {
- status = "okay";
- compatible = "rockchip,hdmi";
- rockchip,mclk-fs = <128>;
- rockchip,card-name = "rk618-hdmi";
- rockchip,cpu = <&spdif_8ch>;
- rockchip,codec = <&rk618_hdmi>;
- rockchip,jack-det;
};
vcc2v5_sys: vcc2v5-ddr {
@@ -69,9 +59,8 @@
regulator-name = "vcc3v3_pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
- enable-active-high;
gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
- startup-delay-us = <7500>;
+ startup-delay-us = <5000>;
vin-supply = <&dc_12v>;
};
@@ -240,7 +229,7 @@
status = "okay";
};
- rk618_hdmi: hdmi {
+ hdmi {
compatible = "rockchip,rk618-hdmi";
clocks = <&clock HDMI_CLK>;
clock-names = "hdmi";
@@ -248,8 +237,6 @@
assigned-clock-parents = <&clock VIF0_CLK>;
interrupt-parent = <&gpio0>;
interrupts = <8 IRQ_TYPE_LEVEL_HIGH>;
- rockchip,format = "spdif";
- #sound-dai-cells = <0>;
status = "okay";
ports {
@@ -287,14 +274,12 @@
};
&pcie3x1 {
- rockchip,bifurcation;
reset-gpios = <&gpio0 RK_PC3 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
};
&pcie3x2 {
- rockchip,bifurcation;
reset-gpios = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
@@ -432,20 +417,6 @@
status = "okay";
};
-&spdif_out {
- status = "disabled";
-};
-
-&spdif_sound {
- status = "disabled";
-};
-
-&spdif_8ch {
- status = "okay";
- pinctrl-names = "default";
- pinctrl-0 = <&spdifm1_tx>;
-};
-
&pinctrl {
rk618 {
rk618_reset: rk618-reeset {
@@ -462,7 +433,7 @@
};
};
- stata {
+ sata {
sata_pm_reset: sata-pm-reset {
rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_output_high>;
};
--
Gitblit v1.6.2