forked from ~ljy/RK356X_SDK_RELEASE

hc
2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf
kernel/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
....@@ -11,9 +11,9 @@
1111 leds {
1212 compatible = "gpio-leds";
1313 pinctrl-names = "default";
14
- pinctrl-0 = <&led_pin_module>;
14
+ pinctrl-0 = <&module_led_pin>;
1515
16
- module-led {
16
+ module_led: led-0 {
1717 label = "module_led";
1818 gpios = <&gpio2 RK_PD1 GPIO_ACTIVE_HIGH>;
1919 linux,default-trigger = "heartbeat";
....@@ -102,7 +102,6 @@
102102 vcc5v0_host: vcc5v0-host-regulator {
103103 compatible = "regulator-fixed";
104104 gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>;
105
- enable-active-low;
106105 pinctrl-names = "default";
107106 pinctrl-0 = <&vcc5v0_host_en>;
108107 regulator-name = "vcc5v0_host";
....@@ -146,6 +145,7 @@
146145
147146 &emmc_phy {
148147 status = "okay";
148
+ drive-impedance-ohm = <33>;
149149 };
150150
151151 &gmac {
....@@ -161,6 +161,11 @@
161161 snps,reset-delays-us = <0 10000 50000>;
162162 tx_delay = <0x10>;
163163 rx_delay = <0x10>;
164
+ status = "okay";
165
+};
166
+
167
+&gpu {
168
+ mali-supply = <&vdd_gpu>;
164169 status = "okay";
165170 };
166171
....@@ -369,8 +374,6 @@
369374 fan: fan@18 {
370375 compatible = "ti,amc6821";
371376 reg = <0x18>;
372
- cooling-min-state = <0>;
373
- cooling-max-state = <9>;
374377 #cooling-cells = <2>;
375378 };
376379
....@@ -446,7 +449,7 @@
446449 };
447450
448451 leds {
449
- led_pin_module: led-module-gpio {
452
+ module_led_pin: module-led-pin {
450453 rockchip,pins =
451454 <2 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
452455 };
....@@ -468,6 +471,12 @@
468471 };
469472
470473 &sdhci {
474
+ /*
475
+ * Signal integrity isn't great at 200MHz but 100MHz has proven stable
476
+ * enough.
477
+ */
478
+ max-frequency = <100000000>;
479
+
471480 bus-width = <8>;
472481 mmc-hs400-1_8v;
473482 mmc-hs400-enhanced-strobe;
....@@ -476,7 +485,7 @@
476485 };
477486
478487 &sdmmc {
479
- vqmmc = <&vcc_sd>;
488
+ vqmmc-supply = <&vcc_sd>;
480489 };
481490
482491 &spi1 {