forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-05-10 10ebd8556b7990499c896a550e3d416b444211e6
kernel/arch/arm64/boot/dts/rockchip/rk3308-evb-v10.dtsi
....@@ -139,6 +139,7 @@
139139 status = "disabled";
140140 compatible = "simple-audio-card";
141141 simple-audio-card,name = "rockchip,spdif-tx-sound";
142
+ simple-audio-card,mclk-fs = <128>;
142143 simple-audio-card,cpu {
143144 sound-dai = <&spdif_tx>;
144145 };
....@@ -168,6 +169,15 @@
168169 regulator-boot-on;
169170 regulator-min-microvolt = <1000000>;
170171 regulator-max-microvolt = <1000000>;
172
+ };
173
+
174
+ vcc_3v3_codec: vcc_io: vcc-io {
175
+ compatible = "regulator-fixed";
176
+ regulator-name = "vcc_io";
177
+ regulator-always-on;
178
+ regulator-boot-on;
179
+ regulator-min-microvolt = <3300000>;
180
+ regulator-max-microvolt = <3300000>;
171181 };
172182
173183 vccio_sdio: vcc_1v8: vcc-1v8 {
....@@ -207,15 +217,6 @@
207217 regulator-max-microvolt = <1500000>;
208218 };
209219
210
- vcc_3v3_codec: vcc_io: vcc-io {
211
- compatible = "regulator-fixed";
212
- regulator-name = "vcc_io";
213
- regulator-always-on;
214
- regulator-boot-on;
215
- regulator-min-microvolt = <3300000>;
216
- regulator-max-microvolt = <3300000>;
217
- };
218
-
219220 vccio_flash: vccio-flash {
220221 compatible = "regulator-fixed";
221222 regulator-name = "vccio_flash";
....@@ -246,7 +247,7 @@
246247 uart_rts_gpios = <&gpio4 RK_PA7 GPIO_ACTIVE_LOW>;
247248 pinctrl-names = "default", "rts_gpio";
248249 pinctrl-0 = <&uart4_rts>;
249
- pinctrl-1 = <&uart4_rts_gpio>;
250
+ pinctrl-1 = <&uart4_rts_pin>;
250251 BT,power_gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_HIGH>;
251252 BT,wake_host_irq = <&gpio4 RK_PB4 GPIO_ACTIVE_HIGH>;
252253 status = "okay";
....@@ -283,7 +284,8 @@
283284 bus-width = <8>;
284285 cap-mmc-highspeed;
285286 mmc-hs200-1_8v;
286
- supports-emmc;
287
+ no-sdio;
288
+ no-sd;
287289 disable-wp;
288290 non-removable;
289291 num-slots = <1>;
....@@ -686,7 +688,8 @@
686688 &sdio {
687689 bus-width = <4>;
688690 cap-sd-highspeed;
689
- supports-sdio;
691
+ no-sd;
692
+ no-mmc;
690693 ignore-pm-notify;
691694 keep-power-in-suspend;
692695 non-removable;
....@@ -699,7 +702,8 @@
699702 bus-width = <4>;
700703 cap-mmc-highspeed;
701704 cap-sd-highspeed;
702
- supports-sd;
705
+ no-sdio;
706
+ no-mmc;
703707 card-detect-delay = <300>;
704708 vmmc-supply = <&vcc_sd>;
705709 status = "disabled";
....@@ -716,9 +720,6 @@
716720 };
717721
718722 &pinctrl {
719
- pinctrl-names = "default";
720
- pinctrl-0 = <&rtc_32k>;
721
-
722723 buttons {
723724 pwr_key: pwr-key {
724725 rockchip,pins = <0 RK_PA6 RK_FUNC_GPIO &pcfg_pull_up>;
....@@ -737,6 +738,13 @@
737738 rockchip,pins = <0 RK_PA2 RK_FUNC_GPIO &pcfg_pull_none>;
738739 };
739740 };
741
+
742
+ wireless-bluetooth {
743
+ uart4_gpios: uart4-gpios {
744
+ rockchip,pins = <4 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
745
+ };
746
+ };
747
+
740748 };
741749
742750 &pwm0 {