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/rk3308-evb-v11.dtsi | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
index d231878..9a905ea 100644
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
@@ -112,6 +112,7 @@
status = "disabled";
compatible = "simple-audio-card";
simple-audio-card,name = "rockchip,spdif-rx-sound";
+ simple-audio-card,mclk-fs = <128>;
simple-audio-card,cpu {
sound-dai = <&spdif_rx>;
};
@@ -263,7 +264,7 @@
uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
pinctrl-names = "default", "rts_gpio";
pinctrl-0 = <&uart4_rts>;
- pinctrl-1 = <&uart4_rts_gpio>;
+ pinctrl-1 = <&uart4_rts_pin>;
BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
status = "okay";
@@ -273,7 +274,7 @@
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
pinctrl-names = "default";
- pinctrl-0 = <&wifi_wake_host>;
+ pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>;
wifi_chip_type = "ap6255";
WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
status = "okay";
@@ -302,6 +303,15 @@
};
};
+&rk3308bs_cpu0_opp_table {
+ opp-1008000000 {
+ status = "okay";
+ };
+ opp-1104000000 {
+ status = "okay";
+ };
+};
+
&dmc {
center-supply = <&vdd_log>;
status = "okay";
@@ -311,7 +321,8 @@
bus-width = <8>;
cap-mmc-highspeed;
mmc-hs200-1_8v;
- supports-emmc;
+ no-sdio;
+ no-sd;
disable-wp;
non-removable;
num-slots = <1>;
@@ -362,9 +373,9 @@
reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
};
- is31fl3236: led-controller@3c {
+ is31fl3236: led-controller@3f {
compatible = "issi,is31fl3236";
- reg = <0x3c>;
+ reg = <0x3f>;
#address-cells = <1>;
#size-cells = <0>;
reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
@@ -736,7 +747,8 @@
&sdio {
bus-width = <4>;
cap-sd-highspeed;
- supports-sdio;
+ no-sd;
+ no-mmc;
ignore-pm-notify;
keep-power-in-suspend;
non-removable;
@@ -749,7 +761,8 @@
bus-width = <4>;
cap-mmc-highspeed;
cap-sd-highspeed;
- supports-sd;
+ no-sdio;
+ no-mmc;
card-detect-delay = <300>;
sd-uhs-sdr25;
sd-uhs-sdr50;
@@ -766,9 +779,6 @@
};
&pinctrl {
- pinctrl-names = "default";
- pinctrl-0 = <&rtc_32k>;
-
buttons {
pwr_key: pwr-key {
rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
@@ -787,6 +797,12 @@
};
};
+ wireless-bluetooth {
+ uart4_gpios: uart4-gpios {
+ rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+ };
+
wireless-wlan {
wifi_wake_host: wifi-wake-host {
rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;
--
Gitblit v1.6.2