Skip to content

[pull] master from cm9vdA:master #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 21, 2024
Merged

[pull] master from cm9vdA:master #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 30 additions & 30 deletions boot/dts/rockchip/bsp/rk3399-sg2710-2020.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@
brightness-levels = <0x00 0x01 0x02 0x03 0x04 0x05 0x06 0x07 0x08 0x09 0x0a 0x0b 0x0c 0x0d 0x0e 0x0f 0x10 0x11 0x12 0x13 0x14 0x15 0x16 0x17 0x18 0x19 0x1a 0x1b 0x1c 0x1d 0x1e 0x1f 0x20 0x21 0x22 0x23 0x24 0x25 0x26 0x27 0x28 0x29 0x2a 0x2b 0x2c 0x2d 0x2e 0x2f 0x30 0x31 0x32 0x33 0x34 0x35 0x36 0x37 0x38 0x39 0x3a 0x3b 0x3c 0x3d 0x3e 0x3f 0x40 0x41 0x42 0x43 0x44 0x45 0x46 0x47 0x48 0x49 0x4a 0x4b 0x4c 0x4d 0x4e 0x4f 0x50 0x51 0x52 0x53 0x54 0x55 0x56 0x57 0x58 0x59 0x5a 0x5b 0x5c 0x5d 0x5e 0x5f 0x60 0x61 0x62 0x63 0x64 0x65 0x66 0x67 0x68 0x69 0x6a 0x6b 0x6c 0x6d 0x6e 0x6f 0x70 0x71 0x72 0x73 0x74 0x75 0x76 0x77 0x78 0x79 0x7a 0x7b 0x7c 0x7d 0x7e 0x7f 0x80 0x81 0x82 0x83 0x84 0x85 0x86 0x87 0x88 0x89 0x8a 0x8b 0x8c 0x8d 0x8e 0x8f 0x90 0x91 0x92 0x93 0x94 0x95 0x96 0x97 0x98 0x99 0x9a 0x9b 0x9c 0x9d 0x9e 0x9f 0xa0 0xa1 0xa2 0xa3 0xa4 0xa5 0xa6 0xa7 0xa8 0xa9 0xaa 0xab 0xac 0xad 0xae 0xaf 0xb0 0xb1 0xb2 0xb3 0xb4 0xb5 0xb6 0xb7 0xb8 0xb9 0xba 0xbb 0xbc 0xbd 0xbe 0xbf 0xc0 0xc1 0xc2 0xc3 0xc4 0xc5 0xc6 0xc7 0xc8 0xc9 0xca 0xcb 0xcc 0xcd 0xce 0xcf 0xd0 0xd1 0xd2 0xd3 0xd4 0xd5 0xd6 0xd7 0xd8 0xd9 0xda 0xdb 0xdc 0xdd 0xde 0xdf 0xe0 0xe1 0xe2 0xe3 0xe4 0xe5 0xe6 0xe7 0xe8 0xe9 0xea 0xeb 0xec 0xed 0xee 0xef 0xf0 0xf1 0xf2 0xf3 0xf4 0xf5 0xf6 0xf7 0xf8 0xf9 0xfa 0xfb 0xfc 0xfd 0xfe 0xff>;
compatible = "pwm-backlight";
default-brightness-level = <0xc8>;
enable-gpios = <0x3d 0x12 0x00>;
enable-gpios = <&gpio4 RK_PC2 0x00>;
phandle = <0xb4>;
pwms = <0xdf 0x00 0x61a8 0x00>;
status = "okay";
Expand Down Expand Up @@ -842,7 +842,7 @@
dsi,format = <0x00>;
dsi,lanes = <0x04>;
enable-delay-ms = <0x64>;
enable-gpios = <0x35 0x0d 0x00>;
enable-gpios = <&gpio1 RK_PB5 0x00>;
panel-init-sequence = <0x57801bd 0x5780100 0x390004b9 0xf1128439 0x1cba33 0x8105f90e 0xe200000 0x00 0x442500 0x910a0000 0x14f0100 0x371500 0x2b8a839 0x9b300 0x07 0xb1e1e39 0xac073 0x73505080 0x87000 0x150002cc 0xb150002 0xbc463900 0x4bf0211 0x82150002 0xb4803900 0x3b2400a 0x39000be3 0x3030303 0x3030000 0xc03900 0xbb14385 0x231e1e44 0x7703db4c 0x390003b5 0xa0a3900 0x3b6ffff 0x390040e9 0x2000705 0x14808112 0x31234f09 0x80814708 0x61000 0x06 0x10000000 0x38ff4817 0x51388888 0x88888828 0xff480640 0x28888888 0x88880000 0x00 0x00 0x39 0x40ea96 0x12000000 0x38000000 0x48 0xf84f6022 0x8888888 0x888858f8 0x4f713318 0x88888888 0x88232000 0x18000 0x00 0x00 0x00 0x108028 0x00 0x3900 0x23e00b0b 0xc25333e 0x342e0509 0x9101311 0x13111704 0xb0c2533 0x33392b05 0x90f1013 0x11131117 0x5fa0111 0x5320129>;
phandle = <0x13d>;
pinctrl-0 = <0xb6>;
Expand All @@ -851,7 +851,7 @@
prepare-delay-ms = <0x64>;
reg = <0x00>;
reset-delay-ms = <0x64>;
reset-gpios = <0x86 0x04 0x01>;
reset-gpios = <&gpio2 RK_PA4 0x01>;
status = "okay";
unprepare-delay-ms = <0x64>;

Expand Down Expand Up @@ -1203,7 +1203,7 @@
rx_delay = <0x11>;
snps,reset-active-low;
snps,reset-delays-us = <0x00 0x2710 0xc350>;
snps,reset-gpio = <0x19 0x0f 0x01>;
snps,reset-gpio = <&gpio3 RK_PB7 0x01>;
status = "okay";
tx_delay = <0x28>;
};
Expand Down Expand Up @@ -1263,15 +1263,15 @@
pinctrl-names = "default";

led@1 {
gpios = <0xcf 0x0d 0x00>;
gpios = <&gpio0 RK_PB5 0x00>;
label = "status_led";
linux,default-trigger = "heartbeat";
linux,default-trigger-delay-ms = <0x00>;
};
};

gpio_hp {
bb-rst-gpio = <0x3d 0x15 0x00>;
bb-rst-gpio = <&gpio4 RK_PC5 0x00>;
compatible = "rockchip,gpio_hp";
phandle = <0x18e>;
status = "okay";
Expand Down Expand Up @@ -1397,7 +1397,7 @@
pinctrl-0 = <0x3a>;
pinctrl-names = "default";
reg = <0x10>;
spk-con-gpio = <0x19 0x15 0x00>;
spk-con-gpio = <&gpio3 RK_PC5 0x00>;
status = "okay";
};
};
Expand Down Expand Up @@ -1431,8 +1431,8 @@

goodix_ts@5d {
compatible = "goodix,gt9xx";
goodix,irq-gpio = <0x35 0x16 0x00>;
goodix,rst-gpio = <0x3d 0x1d 0x01>;
goodix,irq-gpio = <&gpio1 RK_PC6 0x00>;
goodix,rst-gpio = <&gpio4 RK_PD5 0x01>;
interrupt-parent = <0x35>;
interrupts = <0x16 0x02>;
phandle = <0x104>;
Expand Down Expand Up @@ -1739,7 +1739,7 @@
regulator-name = "vdd_cpu_b";
regulator-ramp-delay = <0x3e8>;
vin-supply = <0x33>;
vsel-gpios = <0x35 0x11 0x00>;
vsel-gpios = <&gpio1 RK_PC1 0x00>;

regulator-state-mem {
regulator-off-in-suspend;
Expand All @@ -1762,7 +1762,7 @@
regulator-name = "vdd_gpu";
regulator-ramp-delay = <0x3e8>;
vin-supply = <0x33>;
vsel-gpios = <0x35 0x0e 0x00>;
vsel-gpios = <&gpio1 RK_PB6 0x00>;

regulator-state-mem {
regulator-off-in-suspend;
Expand Down Expand Up @@ -1796,13 +1796,13 @@

fusb30x@22 {
compatible = "fairchild,fusb302";
int-n-gpios = <0x35 0x02 0x00>;
int-n-gpios = <&gpio1 RK_PA2 0x00>;
phandle = <0x11e>;
pinctrl-0 = <0x81>;
pinctrl-names = "default";
reg = <0x22>;
status = "disabled";
vbus-5v-gpios = <0x35 0x04 0x00>;
vbus-5v-gpios = <&gpio1 RK_PA4 0x00>;
};

onewire_ts@2f {
Expand Down Expand Up @@ -2051,7 +2051,7 @@
reset-names = "h_isp0\0isp0";
resets = <0x08 0x10c 0x08 0x10e>;
rockchip,cru = <0x08>;
rockchip,gpios = <0x35 0x03 0x00>;
rockchip,gpios = <&gpio1 RK_PA3 0x00>;
rockchip,grf = <0x17>;
rockchip,isp,cifphy = <0x01>;
rockchip,isp,dsiphy,reg = <0xff968000 0x8000>;
Expand Down Expand Up @@ -2079,7 +2079,7 @@
reset-names = "h_isp1\0isp1";
resets = <0x08 0x10d 0x08 0x10f>;
rockchip,cru = <0x08>;
rockchip,gpios = <0x35 0x03 0x00>;
rockchip,gpios = <&gpio1 RK_PA3 0x00>;
rockchip,grf = <0x17>;
rockchip,isp,cifphy = <0x01>;
rockchip,isp,dsiphy,reg = <0xff968000 0x8000>;
Expand Down Expand Up @@ -2477,7 +2477,7 @@
otg-vbus-regulator {
compatible = "regulator-fixed";
enable-active-high;
gpio = <0x3d 0x1a 0x00>;
gpio = <&gpio4 RK_PD2 0x00>;
phandle = <0x96>;
pinctrl-0 = <0xe7>;
pinctrl-names = "default";
Expand Down Expand Up @@ -2507,7 +2507,7 @@
clock-names = "aclk\0aclk-perf\0hclk\0pm";
clocks = <0x08 0xc5 0x08 0xc4 0x08 0x147 0x08 0xa0>;
compatible = "rockchip,rk3399-pcie";
ep-gpios = <0x86 0x1c 0x00>;
ep-gpios = <&gpio2 RK_PD4 0x00>;
interrupt-map = <0x00 0x00 0x00 0x01 0x84 0x00 0x00 0x00 0x00 0x02 0x84 0x01 0x00 0x00 0x00 0x03 0x84 0x02 0x00 0x00 0x00 0x04 0x84 0x03>;
interrupt-map-mask = <0x00 0x00 0x00 0x07>;
interrupt-names = "sys\0legacy\0client";
Expand Down Expand Up @@ -2656,7 +2656,7 @@
};
};

gpio0@ff720000 {
gpio0: gpio0@ff720000 {
#gpio-cells = <0x02>;
#interrupt-cells = <0x02>;
clocks = <0x31 0x17>;
Expand All @@ -2668,7 +2668,7 @@
reg = <0x00 0xff720000 0x00 0x100>;
};

gpio1@ff730000 {
gpio1: gpio1@ff730000 {
#gpio-cells = <0x02>;
#interrupt-cells = <0x02>;
clocks = <0x31 0x18>;
Expand All @@ -2680,7 +2680,7 @@
reg = <0x00 0xff730000 0x00 0x100>;
};

gpio2@ff780000 {
gpio2: gpio2@ff780000 {
#gpio-cells = <0x02>;
#interrupt-cells = <0x02>;
clocks = <0x08 0x150>;
Expand All @@ -2692,7 +2692,7 @@
reg = <0x00 0xff780000 0x00 0x100>;
};

gpio3@ff788000 {
gpio3: gpio3@ff788000 {
#gpio-cells = <0x02>;
#interrupt-cells = <0x02>;
clocks = <0x08 0x151>;
Expand All @@ -2704,7 +2704,7 @@
reg = <0x00 0xff788000 0x00 0x100>;
};

gpio4@ff790000 {
gpio4: gpio4@ff790000 {
#gpio-cells = <0x02>;
#interrupt-cells = <0x02>;
clocks = <0x08 0x152>;
Expand Down Expand Up @@ -3973,7 +3973,7 @@

power-key {
gpio-key,wakeup;
gpios = <0xcf 0x05 0x01>;
gpios = <&gpio0 RK_PA5 0x01>;
label = "power";
linux,code = <0x74>;
};
Expand All @@ -3994,7 +3994,7 @@
rockchip-suspend {
compatible = "rockchip,pm-rk3399";
phandle = <0x182>;
rockchip,power-ctrl = <0x35 0x11 0x00 0x35 0x0e 0x00>;
rockchip,power-ctrl = <&gpio1 RK_PC1 0x00 &gpio1 RK_PB6 0x00>;
rockchip,pwm-regulator-config = <0x04>;
rockchip,sleep-debug-en = <0x01>;
rockchip,sleep-mode-config = <0xde>;
Expand Down Expand Up @@ -4045,7 +4045,7 @@
phandle = <0x1c>;
pinctrl-0 = <0xe3>;
pinctrl-names = "default";
reset-gpios = <0xcf 0x0a 0x01>;
reset-gpios = <&gpio0 RK_PB2 0x01>;
};

serial@ff180000 {
Expand Down Expand Up @@ -4647,7 +4647,7 @@
vcc-lcd {
compatible = "regulator-fixed";
enable-active-high;
gpio = <0x3d 0x1e 0x00>;
gpio = <&gpio4 RK_PD6 0x00>;
phandle = <0xe0>;
regulator-boot-on;
regulator-max-microvolt = <0x325aa0>;
Expand Down Expand Up @@ -4877,8 +4877,8 @@
};

wireless-bluetooth {
BT,reset_gpio = <0xcf 0x09 0x00>;
BT,wake_host_irq = <0xcf 0x04 0x00>;
BT,reset_gpio = <&gpio0 RK_PB1 0x00>;
BT,wake_host_irq = <&gpio0 RK_PA4 0x00>;
clock-names = "ext_clock";
clocks = <0xe4 0x01>;
compatible = "bluetooth-platdata";
Expand All @@ -4887,11 +4887,11 @@
pinctrl-1 = <0xe6>;
pinctrl-names = "default\0rts_gpio";
status = "okay";
uart_rts_gpios = <0x86 0x13 0x01>;
uart_rts_gpios = <&gpio2 RK_PC3 0x01>;
};

wireless-wlan {
WIFI,host_wake_irq = <0xcf 0x03 0x00>;
WIFI,host_wake_irq = <&gpio0 RK_PA3 0x00>;
compatible = "wlan-platdata";
phandle = <0x193>;
rockchip,grf = <0x17>;
Expand Down
Loading