forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 10ebd8556b7990499c896a550e3d416b444211e6
kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v11.dtsi
....@@ -112,6 +112,7 @@
112112 status = "disabled";
113113 compatible = "simple-audio-card";
114114 simple-audio-card,name = "rockchip,spdif-rx-sound";
115
+ simple-audio-card,mclk-fs = <128>;
115116 simple-audio-card,cpu {
116117 sound-dai = <&spdif_rx>;
117118 };
....@@ -263,7 +264,7 @@
263264 uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
264265 pinctrl-names = "default", "rts_gpio";
265266 pinctrl-0 = <&uart4_rts>;
266
- pinctrl-1 = <&uart4_rts_gpio>;
267
+ pinctrl-1 = <&uart4_rts_pin>;
267268 BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
268269 BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
269270 status = "okay";
....@@ -273,7 +274,7 @@
273274 compatible = "wlan-platdata";
274275 rockchip,grf = <&grf>;
275276 pinctrl-names = "default";
276
- pinctrl-0 = <&wifi_wake_host>;
277
+ pinctrl-0 = <&wifi_wake_host>, <&rtc_32k>;
277278 wifi_chip_type = "ap6255";
278279 WIFI,host_wake_irq = <&gpio0 RK_PA0 GPIO_ACTIVE_LOW>;
279280 status = "okay";
....@@ -302,6 +303,15 @@
302303 };
303304 };
304305
306
+&rk3308bs_cpu0_opp_table {
307
+ opp-1008000000 {
308
+ status = "okay";
309
+ };
310
+ opp-1104000000 {
311
+ status = "okay";
312
+ };
313
+};
314
+
305315 &dmc {
306316 center-supply = <&vdd_log>;
307317 status = "okay";
....@@ -311,7 +321,8 @@
311321 bus-width = <8>;
312322 cap-mmc-highspeed;
313323 mmc-hs200-1_8v;
314
- supports-emmc;
324
+ no-sdio;
325
+ no-sd;
315326 disable-wp;
316327 non-removable;
317328 num-slots = <1>;
....@@ -362,9 +373,9 @@
362373 reset-gpios = <&gpio1 RK_PA1 GPIO_ACTIVE_LOW>;
363374 };
364375
365
- is31fl3236: led-controller@3c {
376
+ is31fl3236: led-controller@3f {
366377 compatible = "issi,is31fl3236";
367
- reg = <0x3c>;
378
+ reg = <0x3f>;
368379 #address-cells = <1>;
369380 #size-cells = <0>;
370381 reset-gpios = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
....@@ -736,7 +747,8 @@
736747 &sdio {
737748 bus-width = <4>;
738749 cap-sd-highspeed;
739
- supports-sdio;
750
+ no-sd;
751
+ no-mmc;
740752 ignore-pm-notify;
741753 keep-power-in-suspend;
742754 non-removable;
....@@ -749,7 +761,8 @@
749761 bus-width = <4>;
750762 cap-mmc-highspeed;
751763 cap-sd-highspeed;
752
- supports-sd;
764
+ no-sdio;
765
+ no-mmc;
753766 card-detect-delay = <300>;
754767 sd-uhs-sdr25;
755768 sd-uhs-sdr50;
....@@ -766,9 +779,6 @@
766779 };
767780
768781 &pinctrl {
769
- pinctrl-names = "default";
770
- pinctrl-0 = <&rtc_32k>;
771
-
772782 buttons {
773783 pwr_key: pwr-key {
774784 rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
....@@ -787,6 +797,12 @@
787797 };
788798 };
789799
800
+ wireless-bluetooth {
801
+ uart4_gpios: uart4-gpios {
802
+ rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
803
+ };
804
+ };
805
+
790806 wireless-wlan {
791807 wifi_wake_host: wifi-wake-host {
792808 rockchip,pins = <0 RK_PA0 RK_FUNC_GPIO &pcfg_pull_up>;