From a36159eec6ca17402b0e146b86efaf76568dc353 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Fri, 20 Sep 2024 01:41:23 +0000
Subject: [PATCH] 重命名 AX88772C_eeprom/asix.c 为 asix_mac.c
---
kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts b/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
index 3fadfae..39543fd 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3566-rk817-eink.dts
@@ -75,17 +75,15 @@
};
rk817-sound {
- compatible = "simple-audio-card";
- simple-audio-card,format = "i2s";
- simple-audio-card,name = "rockchip,rk817-codec";
- simple-audio-card,mclk-fs = <256>;
-
- simple-audio-card,cpu {
- sound-dai = <&i2s1_8ch>;
- };
- simple-audio-card,codec {
- sound-dai = <&rk817_codec>;
- };
+ compatible = "rockchip,multicodecs-card";
+ rockchip,card-name = "rockchip-rk817";
+ hp-det-gpio = <&gpio4 RK_PC4 GPIO_ACTIVE_LOW>;
+ rockchip,format = "i2s";
+ rockchip,mclk-fs = <256>;
+ rockchip,cpu = <&i2s1_8ch>;
+ rockchip,codec = <&rk817_codec>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&hp_det>;
};
sdio_pwrseq: sdio-pwrseq {
@@ -231,7 +229,7 @@
status = "okay";
vdd_cpu: tcs4525@1c {
- compatible = "tcs,tcs452x";
+ compatible = "tcs,tcs4525";
reg = <0x1c>;
vin-supply = <&vccsys>;
regulator-compatible = "fan53555-reg";
@@ -783,12 +781,12 @@
soc_slppin_gpio: soc_slppin_gpio {
rockchip,pins =
- <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low_pull_down>;
+ <0 RK_PA2 RK_FUNC_GPIO &pcfg_output_low>;
};
soc_slppin_slp: soc_slppin_slp {
rockchip,pins =
- <0 RK_PA2 1 &pcfg_pull_up>;
+ <0 RK_PA2 1 &pcfg_pull_none>;
};
soc_slppin_rst: soc_slppin_rst {
@@ -865,7 +863,8 @@
&sdhci {
bus-width = <8>;
- supports-emmc;
+ no-sdio;
+ no-sd;
non-removable;
keep-power-in-suspend;
max-frequency = <200000000>;
@@ -874,7 +873,8 @@
&sdmmc0 {
max-frequency = <50000000>;
- supports-sd;
+ no-sdio;
+ no-mmc;
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
@@ -889,7 +889,8 @@
&sdmmc1 {
max-frequency = <150000000>;
- supports-sdio;
+ no-sd;
+ no-mmc;
bus-width = <4>;
disable-wp;
cap-sd-highspeed;
--
Gitblit v1.6.2