hc
2024-05-10 37f49e37ab4cb5d0bc4c60eb5c6d4dd57db767bb
kernel/arch/arm64/boot/dts/rockchip/px30-evb-ddr3-v10.dtsi
....@@ -3,14 +3,11 @@
33 * Copyright (c) 2017-2019 Fuzhou Rockchip Electronics Co., Ltd
44 */
55
6
-/dts-v1/;
76 #include <dt-bindings/gpio/gpio.h>
87 #include <dt-bindings/pinctrl/rockchip.h>
98 #include <dt-bindings/input/input.h>
109 #include <dt-bindings/display/drm_mipi_dsi.h>
1110 #include <dt-bindings/sensor-dev.h>
12
-#include "px30.dtsi"
13
-#include "px30-android.dtsi"
1411
1512 / {
1613 adc-keys {
....@@ -21,14 +18,14 @@
2118 keyup-threshold-microvolt = <1800000>;
2219
2320 esc-key {
24
- linux,code = <KEY_ESC>;
25
- label = "esc";
21
+ linux,code = <KEY_BACK>;
22
+ label = "back";
2623 press-threshold-microvolt = <1310000>;
2724 };
2825
2926 home-key {
30
- linux,code = <KEY_HOME>;
31
- label = "home";
27
+ linux,code = <KEY_HOMEPAGE>;
28
+ label = "homepage";
3229 press-threshold-microvolt = <624000>;
3330 };
3431
....@@ -161,10 +158,11 @@
161158 compatible = "wlan-platdata";
162159 wifi_chip_type = "AP6210";
163160 WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>;
161
+ WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;
164162 status = "okay";
165163 };
166164
167
- wireless-bluetooth {
165
+ wireless_bluetooth: wireless-bluetooth {
168166 compatible = "bluetooth-platdata";
169167 clocks = <&rk809 1>;
170168 clock-names = "ext_clock";
....@@ -172,8 +170,8 @@
172170 pinctrl-names = "default","rts_gpio";
173171 pinctrl-0 = <&uart1_rts>;
174172 pinctrl-1 = <&uart1_rts_gpio>;
175
- BT,reset_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
176
- BT,wake_gpio = <&gpio2 RK_PB0 GPIO_ACTIVE_HIGH>;
173
+ BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>;
174
+ BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;
177175 BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>;
178176 status = "okay";
179177 };
....@@ -218,7 +216,8 @@
218216 bus-width = <8>;
219217 cap-mmc-highspeed;
220218 mmc-hs200-1_8v;
221
- supports-emmc;
219
+ no-sdio;
220
+ no-sd;
222221 disable-wp;
223222 non-removable;
224223 num-slots = <1>;
....@@ -227,7 +226,11 @@
227226
228227 &gmac {
229228 phy-supply = <&vcc_phy>;
230
- clock_in_out = "output";
229
+ clock_in_out = "input";
230
+ assigned-clocks = <&cru SCLK_GMAC>;
231
+ assigned-clock-parents = <&gmac_clkin>;
232
+ pinctrl-names = "default";
233
+ pinctrl-0 = <&rmii_pins &mac_refclk>;
231234 snps,reset-gpio = <&gpio2 13 GPIO_ACTIVE_LOW>;
232235 snps,reset-active-low;
233236 snps,reset-delays-us = <0 50000 50000>;
....@@ -342,13 +345,13 @@
342345 vcc_3v0: DCDC_REG4 {
343346 regulator-always-on;
344347 regulator-boot-on;
345
- regulator-min-microvolt = <3000000>;
346
- regulator-max-microvolt = <3000000>;
348
+ regulator-min-microvolt = <3300000>;
349
+ regulator-max-microvolt = <3300000>;
347350 regulator-initial-mode = <0x2>;
348351 regulator-name = "vcc_3v0";
349352 regulator-state-mem {
350353 regulator-on-in-suspend;
351
- regulator-suspend-microvolt = <3000000>;
354
+ regulator-suspend-microvolt = <3300000>;
352355 };
353356 };
354357
....@@ -393,13 +396,13 @@
393396 vcc3v0_pmu: LDO_REG4 {
394397 regulator-always-on;
395398 regulator-boot-on;
396
- regulator-min-microvolt = <3000000>;
397
- regulator-max-microvolt = <3000000>;
399
+ regulator-min-microvolt = <3300000>;
400
+ regulator-max-microvolt = <3300000>;
398401
399402 regulator-name = "vcc3v0_pmu";
400403 regulator-state-mem {
401404 regulator-on-in-suspend;
402
- regulator-suspend-microvolt = <3000000>;
405
+ regulator-suspend-microvolt = <3300000>;
403406
404407 };
405408 };
....@@ -550,17 +553,6 @@
550553 i2c-scl-falling-time-ns = <50>;
551554 i2c-scl-rising-time-ns = <300>;
552555
553
- dw9714: dw9714@c {
554
- compatible = "dongwoon,dw9714";
555
- status = "okay";
556
- reg = <0x0c>;
557
- rockchip,camera-module-index = <0>;
558
- rockchip,vcm-start-current = <10>;
559
- rockchip,vcm-rated-current = <85>;
560
- rockchip,vcm-step-mode = <5>;
561
- rockchip,camera-module-facing = "back";
562
- };
563
-
564556 ov5695: ov5695@36 {
565557 compatible = "ovti,ov5695";
566558 reg = <0x36>;
....@@ -574,7 +566,6 @@
574566 rockchip,camera-module-facing = "back";
575567 rockchip,camera-module-name = "TongJu";
576568 rockchip,camera-module-lens-name = "CHT842-MD";
577
- lens-focus = <&dw9714>;
578569 port {
579570 ucam_out: endpoint {
580571 remote-endpoint = <&mipi_in_ucam>;
....@@ -642,7 +633,7 @@
642633 &pinctrl {
643634 headphone {
644635 hp_det: hp-det {
645
- rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_down>;
636
+ rockchip,pins = <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_down>;
646637 };
647638 };
648639
....@@ -718,7 +709,8 @@
718709 bus-width = <4>;
719710 cap-mmc-highspeed;
720711 cap-sd-highspeed;
721
- supports-sd;
712
+ no-sdio;
713
+ no-mmc;
722714 card-detect-delay = <800>;
723715 ignore-pm-notify;
724716 /*cd-gpios = <&gpio2 4 GPIO_ACTIVE_HIGH>; [> CD GPIO <]*/
....@@ -734,7 +726,8 @@
734726 &sdio {
735727 bus-width = <4>;
736728 cap-sd-highspeed;
737
- supports-sdio;
729
+ no-sd;
730
+ no-mmc;
738731 ignore-pm-notify;
739732 keep-power-in-suspend;
740733 non-removable;
....@@ -745,7 +738,7 @@
745738
746739 &tsadc {
747740 pinctrl-names = "gpio", "otpout";
748
- pinctrl-0 = <&tsadc_otp_gpio>;
741
+ pinctrl-0 = <&tsadc_otp_pin>;
749742 pinctrl-1 = <&tsadc_otp_out>;
750743 status = "okay";
751744 };