From 08f87f769b595151be1afeff53e144f543faa614 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 06 Dec 2023 09:51:13 +0000
Subject: [PATCH] add dts config
---
kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi | 983 +++++++++++++++++++++----------------------------
mk-rootfs.sh | 4
kernel/arch/arm64/configs/rockchip_linux_defconfig | 77 +--
kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4
kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi | 8
kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | 95 ++--
6 files changed, 506 insertions(+), 665 deletions(-)
diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
index 58ba3dc..3135b2f 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
@@ -69,7 +69,9 @@
regulator-name = "vcc3v3_pcie";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
+ regulator-always-on;
enable-active-high;
+ regulator-boot-on;
gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
startup-delay-us = <5000>;
vin-supply = <&dc_12v>;
@@ -148,17 +150,10 @@
gpio_function = <0>;
};
- usb_ogt {
- gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
+ wifi_power_en {
+ gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
gpio_function = <0>;
};
-
- m2_wifi_pwr {
- gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
- gpio_function = <0>;
- };
-
-
#if 0
do1 {
gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>;
@@ -225,8 +220,9 @@
compatible = "simple-panel";
backlight = <&backlight>;
power-supply = <&vcc3v3_lcd0_n>;
- enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
- edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_PWBLK_H_GPIO0_B7
+ enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
+ reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
+ edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
bpc = <8>;
@@ -239,8 +235,8 @@
nodka-lvds = <15>;
display-timings {
- native-mode = <&timing>;
- timing: timing {
+ native-mode = <&timing0>;
+ timing0: timing0 {
clock-frequency = <72500000>;
hactive = <1280>;
vactive = <800>;
@@ -256,9 +252,9 @@
pixelclk-active = <0>;
};
};
- port {
- panel_in_lvds: endpoint {
- remote-endpoint = <&lvds_out>;
+ ports {
+ panel_in: endpoint {
+ remote-endpoint = <&edp_out>;
};
};
};
@@ -348,6 +344,10 @@
* video_phy1 needs to be enabled
* when dsi1 is enabled
*/
+
+&video_phy1 {
+ status = "okay";
+};
&dsi1 {
status = "disabled";
};
@@ -357,39 +357,40 @@
};
&dsi1_in_vp1 {
- status = "disabled";
+ status = "okay";
};
&dsi1_panel {
- power-supply = <&vcc3v3_lcd1_n>;
+ power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
+ vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
+ reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
+ vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
+ pinctrl-names = "default";
+ pinctrl-0 = <&lcd1_rst_gpio>;
};
+
+&route_dsi1 {
+ status = "disabled";
+ connect = <&vp1_out_dsi1>;
+};
+
+
+/*
+* edp_start
+*/
&edp {
- //hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;
force-hpd;
status = "okay";
-};
-
-&lvds {
- status = "disabled";
ports {
port@1 {
reg = <1>;
- lvds_out: endpoint {
- remote-endpoint = <&panel_in_lvds>;
+ edp_out: endpoint {
+ remote-endpoint = <&panel_in>;
};
};
};
-};
-
-&route_lvds{
- status = "disabled";
- connect = <&vp2_out_lvds>;
-};
-
-&lvds_in_vp2 {
- status = "disabled";
};
&edp_phy {
@@ -410,7 +411,9 @@
connect = <&vp1_out_edp>;
};
-
+&route_edp {
+ status = "okay";
+};
/*
* edp_end
*/
@@ -625,20 +628,14 @@
};
};
-&video_phy0 {
- status = "okay";
-};
-&video_phy1 {
- status = "disabled";
-};
&pcie30phy {
status = "okay";
};
-&pcie3x2 {
- reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
+&pcie2x1 {
+ reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie>;
status = "okay";
};
@@ -694,10 +691,6 @@
<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
- <0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>, //12
- <0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>, //13
- <0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>, //16
- <0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>, //17
<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
@@ -799,13 +792,13 @@
};
&uart0 {
- status = "disabled";
+ status = "okay";
};
&uart1 {
pinctrl-names = "default";
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
- status = "disabled";
+ status = "okay";
};
&uart3 {
@@ -824,11 +817,11 @@
};
&uart7 {
- status = "disabled";
+ status = "okay";
pinctrl-0 = <&uart7m1_xfer>;
};
&uart9 {
- status = "disabled";
+ status = "okay";
pinctrl-0 = <&uart9m1_xfer>;
};
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
old mode 100644
new mode 100755
index 9a3fc19..93e1bd7
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
@@ -361,7 +361,6 @@
compatible = "wlan-platdata";
rockchip,grf = <&grf>;
wifi_chip_type = "ap6398s";
- WIFI,poweren_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -422,267 +421,198 @@
dsi,format = <MIPI_DSI_FMT_RGB888>;
dsi,lanes = <4>;
panel-init-sequence = [
- 23 00 02 FE 21
- 23 00 02 04 00
- 23 00 02 00 64
- 23 00 02 2A 00
- 23 00 02 26 64
- 23 00 02 54 00
- 23 00 02 50 64
- 23 00 02 7B 00
- 23 00 02 77 64
- 23 00 02 A2 00
- 23 00 02 9D 64
- 23 00 02 C9 00
- 23 00 02 C5 64
- 23 00 02 01 71
- 23 00 02 27 71
- 23 00 02 51 71
- 23 00 02 78 71
- 23 00 02 9E 71
- 23 00 02 C6 71
- 23 00 02 02 89
- 23 00 02 28 89
- 23 00 02 52 89
- 23 00 02 79 89
- 23 00 02 9F 89
- 23 00 02 C7 89
- 23 00 02 03 9E
- 23 00 02 29 9E
- 23 00 02 53 9E
- 23 00 02 7A 9E
- 23 00 02 A0 9E
- 23 00 02 C8 9E
- 23 00 02 09 00
- 23 00 02 05 B0
- 23 00 02 31 00
- 23 00 02 2B B0
- 23 00 02 5A 00
- 23 00 02 55 B0
- 23 00 02 80 00
- 23 00 02 7C B0
- 23 00 02 A7 00
- 23 00 02 A3 B0
- 23 00 02 CE 00
- 23 00 02 CA B0
- 23 00 02 06 C0
- 23 00 02 2D C0
- 23 00 02 56 C0
- 23 00 02 7D C0
- 23 00 02 A4 C0
- 23 00 02 CB C0
- 23 00 02 07 CF
- 23 00 02 2F CF
- 23 00 02 58 CF
- 23 00 02 7E CF
- 23 00 02 A5 CF
- 23 00 02 CC CF
- 23 00 02 08 DD
- 23 00 02 30 DD
- 23 00 02 59 DD
- 23 00 02 7F DD
- 23 00 02 A6 DD
- 23 00 02 CD DD
- 23 00 02 0E 15
- 23 00 02 0A E9
- 23 00 02 36 15
- 23 00 02 32 E9
- 23 00 02 5F 15
- 23 00 02 5B E9
- 23 00 02 85 15
- 23 00 02 81 E9
- 23 00 02 AD 15
- 23 00 02 A9 E9
- 23 00 02 D3 15
- 23 00 02 CF E9
- 23 00 02 0B 14
- 23 00 02 33 14
- 23 00 02 5C 14
- 23 00 02 82 14
- 23 00 02 AA 14
- 23 00 02 D0 14
- 23 00 02 0C 36
- 23 00 02 34 36
- 23 00 02 5D 36
- 23 00 02 83 36
- 23 00 02 AB 36
- 23 00 02 D1 36
- 23 00 02 0D 6B
- 23 00 02 35 6B
- 23 00 02 5E 6B
- 23 00 02 84 6B
- 23 00 02 AC 6B
- 23 00 02 D2 6B
- 23 00 02 13 5A
- 23 00 02 0F 94
- 23 00 02 3B 5A
- 23 00 02 37 94
- 23 00 02 64 5A
- 23 00 02 60 94
- 23 00 02 8A 5A
- 23 00 02 86 94
- 23 00 02 B2 5A
- 23 00 02 AE 94
- 23 00 02 D8 5A
- 23 00 02 D4 94
- 23 00 02 10 D1
- 23 00 02 38 D1
- 23 00 02 61 D1
- 23 00 02 87 D1
- 23 00 02 AF D1
- 23 00 02 D5 D1
- 23 00 02 11 04
- 23 00 02 39 04
- 23 00 02 62 04
- 23 00 02 88 04
- 23 00 02 B0 04
- 23 00 02 D6 04
- 23 00 02 12 05
- 23 00 02 3A 05
- 23 00 02 63 05
- 23 00 02 89 05
- 23 00 02 B1 05
- 23 00 02 D7 05
- 23 00 02 18 AA
- 23 00 02 14 36
- 23 00 02 42 AA
- 23 00 02 3D 36
- 23 00 02 69 AA
- 23 00 02 65 36
- 23 00 02 8F AA
- 23 00 02 8B 36
- 23 00 02 B7 AA
- 23 00 02 B3 36
- 23 00 02 DD AA
- 23 00 02 D9 36
- 23 00 02 15 74
- 23 00 02 3F 74
- 23 00 02 66 74
- 23 00 02 8C 74
- 23 00 02 B4 74
- 23 00 02 DA 74
- 23 00 02 16 9F
- 23 00 02 40 9F
- 23 00 02 67 9F
- 23 00 02 8D 9F
- 23 00 02 B5 9F
- 23 00 02 DB 9F
- 23 00 02 17 DC
- 23 00 02 41 DC
- 23 00 02 68 DC
- 23 00 02 8E DC
- 23 00 02 B6 DC
- 23 00 02 DC DC
- 23 00 02 1D FF
- 23 00 02 19 03
- 23 00 02 47 FF
- 23 00 02 43 03
- 23 00 02 6E FF
- 23 00 02 6A 03
- 23 00 02 94 FF
- 23 00 02 90 03
- 23 00 02 BC FF
- 23 00 02 B8 03
- 23 00 02 E2 FF
- 23 00 02 DE 03
- 23 00 02 1A 35
- 23 00 02 44 35
- 23 00 02 6B 35
- 23 00 02 91 35
- 23 00 02 B9 35
- 23 00 02 DF 35
- 23 00 02 1B 45
- 23 00 02 45 45
- 23 00 02 6C 45
- 23 00 02 92 45
- 23 00 02 BA 45
- 23 00 02 E0 45
- 23 00 02 1C 55
- 23 00 02 46 55
- 23 00 02 6D 55
- 23 00 02 93 55
- 23 00 02 BB 55
- 23 00 02 E1 55
- 23 00 02 22 FF
- 23 00 02 1E 68
- 23 00 02 4C FF
- 23 00 02 48 68
- 23 00 02 73 FF
- 23 00 02 6F 68
- 23 00 02 99 FF
- 23 00 02 95 68
- 23 00 02 C1 FF
- 23 00 02 BD 68
- 23 00 02 E7 FF
- 23 00 02 E3 68
- 23 00 02 1F 7E
- 23 00 02 49 7E
- 23 00 02 70 7E
- 23 00 02 96 7E
- 23 00 02 BE 7E
- 23 00 02 E4 7E
- 23 00 02 20 97
- 23 00 02 4A 97
- 23 00 02 71 97
- 23 00 02 97 97
- 23 00 02 BF 97
- 23 00 02 E5 97
- 23 00 02 21 B5
- 23 00 02 4B B5
- 23 00 02 72 B5
- 23 00 02 98 B5
- 23 00 02 C0 B5
- 23 00 02 E6 B5
- 23 00 02 25 F0
- 23 00 02 23 E8
- 23 00 02 4F F0
- 23 00 02 4D E8
- 23 00 02 76 F0
- 23 00 02 74 E8
- 23 00 02 9C F0
- 23 00 02 9A E8
- 23 00 02 C4 F0
- 23 00 02 C2 E8
- 23 00 02 EA F0
- 23 00 02 E8 E8
- 23 00 02 24 FF
- 23 00 02 4E FF
- 23 00 02 75 FF
- 23 00 02 9B FF
- 23 00 02 C3 FF
- 23 00 02 E9 FF
- 23 00 02 FE 3D
- 23 00 02 00 04
- 23 00 02 FE 23
- 23 00 02 08 82
- 23 00 02 0A 00
- 23 00 02 0B 00
- 23 00 02 0C 01
- 23 00 02 16 00
- 23 00 02 18 02
- 23 00 02 1B 04
- 23 00 02 19 04
- 23 00 02 1C 81
- 23 00 02 1F 00
- 23 00 02 20 03
- 23 00 02 23 04
- 23 00 02 21 01
- 23 00 02 54 63
- 23 00 02 55 54
- 23 00 02 6E 45
- 23 00 02 6D 36
- 23 00 02 FE 3D
- 23 00 02 55 78
- 23 00 02 FE 20
- 23 00 02 26 30
- 23 00 02 FE 3D
- 23 00 02 20 71
- 23 00 02 50 8F
- 23 00 02 51 8F
- 23 00 02 FE 00
- 23 00 02 35 00
- 05 78 01 11
- 05 1E 01 29
+ 39 00 05 FF 03 98 81 03
+ 39 00 03 01 01 00
+ 39 00 03 02 01 00
+ 39 00 03 03 01 53
+ 39 00 03 04 01 D3
+ 39 00 03 05 01 00
+ 39 00 03 06 01 0D
+ 39 00 03 07 01 08
+ 39 00 03 08 01 00
+ 39 00 03 09 01 00
+ 39 00 03 0a 01 00
+ 39 00 03 0b 01 00
+ 39 00 03 0c 01 00
+ 39 00 03 0d 01 00
+ 39 00 03 0e 01 00
+ 39 00 03 0f 01 28
+ 39 00 03 10 01 28
+ 39 00 03 11 01 00
+ 39 00 03 12 01 00
+ 39 00 03 13 01 00
+ 39 00 03 14 01 00
+ 39 00 03 15 01 00
+ 39 00 03 16 01 00
+ 39 00 03 17 01 00
+ 39 00 03 18 01 00
+ 39 00 03 19 01 00
+ 39 00 03 1a 01 00
+ 39 00 03 1b 01 00
+ 39 00 03 1c 01 00
+ 39 00 03 1d 01 00
+ 39 00 03 1e 01 40
+ 39 00 03 1f 01 80
+ 39 00 03 20 01 06
+ 39 00 03 21 01 01
+ 39 00 03 22 01 00
+ 39 00 03 23 01 00
+ 39 00 03 24 01 00
+ 39 00 03 25 01 00
+ 39 00 03 26 01 00
+ 39 00 03 27 01 00
+ 39 00 03 28 01 33
+ 39 00 03 29 01 33
+ 39 00 03 2a 01 00
+ 39 00 03 2b 01 00
+ 39 00 03 2c 01 00
+ 39 00 03 2d 01 00
+ 39 00 03 2e 01 00
+ 39 00 03 2f 01 00
+ 39 00 03 30 01 00
+ 39 00 03 31 01 00
+ 39 00 03 32 01 00
+ 39 00 03 33 01 00
+ 39 00 03 34 01 03
+ 39 00 03 35 01 00
+ 39 00 03 36 01 00
+ 39 00 03 37 01 00
+ 39 00 03 38 01 96
+ 39 00 03 39 01 00
+ 39 00 03 3a 01 00
+ 39 00 03 3b 01 00
+ 39 00 03 3c 01 00
+ 39 00 03 3d 01 00
+ 39 00 03 3e 01 00
+ 39 00 03 3f 01 00
+ 39 00 03 40 01 00
+ 39 00 03 41 01 00
+ 39 00 03 42 01 00
+ 39 00 03 43 01 00
+ 39 00 03 44 01 00
+ 39 00 03 50 01 00
+ 39 00 03 51 01 23
+ 39 00 03 52 01 45
+ 39 00 03 53 01 67
+ 39 00 03 54 01 89
+ 39 00 03 55 01 AB
+ 39 00 03 56 01 01
+ 39 00 03 57 01 23
+ 39 00 03 58 01 45
+ 39 00 03 59 01 67
+ 39 00 03 5a 01 89
+ 39 00 03 5b 01 AB
+ 39 00 03 5c 01 CD
+ 39 00 03 5d 01 EF
+ 39 00 03 5e 01 00
+ 39 00 03 5f 01 08
+ 39 00 03 60 01 08
+ 39 00 03 61 01 06
+ 39 00 03 62 01 06
+ 39 00 03 63 01 01
+ 39 00 03 64 01 01
+ 39 00 03 65 01 00
+ 39 00 03 66 01 00
+ 39 00 03 67 01 02
+ 39 00 03 68 01 15
+ 39 00 03 69 01 15
+ 39 00 03 6a 01 14
+ 39 00 03 6b 01 14
+ 39 00 03 6c 01 0D
+ 39 00 03 6d 01 0D
+ 39 00 03 6e 01 0C
+ 39 00 03 6f 01 0C
+ 39 00 03 70 01 0F
+ 39 00 03 71 01 0F
+ 39 00 03 72 01 0E
+ 39 00 03 73 01 0E
+ 39 00 03 74 01 02
+ 39 00 03 75 01 08
+ 39 00 03 76 01 08
+ 39 00 03 77 01 06
+ 39 00 03 78 01 06
+ 39 00 03 79 01 01
+ 39 00 03 7a 01 01
+ 39 00 03 7b 01 00
+ 39 00 03 7c 01 00
+ 39 00 03 7d 01 02
+ 39 00 03 7e 01 15
+ 39 00 03 7f 01 15
+ 39 00 03 80 01 14
+ 39 00 03 81 01 14
+ 39 00 03 82 01 0D
+ 39 00 03 83 01 0D
+ 39 00 03 84 01 0C
+ 39 00 03 85 01 0C
+ 39 00 03 86 01 0F
+ 39 00 03 87 01 0F
+ 39 00 03 88 01 0E
+ 39 00 03 89 01 0E
+ 39 00 03 8A 01 02
+ 39 00 05 FF 03 98 81 04
+ 39 00 03 C5 01 3A
+ 39 00 03 6E 01 2B
+ 39 00 03 6F 01 37
+ 39 00 03 3A 01 24
+ 39 00 03 8D 01 1A
+ 39 00 03 87 01 BA
+ 39 00 03 B2 01 D1
+ 39 00 03 88 01 0B
+ 39 00 03 38 01 01
+ 39 00 03 39 01 00
+ 39 00 03 B5 01 02
+ 39 00 03 31 01 25
+ 39 00 03 3B 01 98
+ 39 00 05 FF 03 98 81 01
+ 39 00 03 22 01 0A
+ 39 00 03 31 01 00
+ 39 00 03 53 01 3D
+ 39 00 03 55 01 3D
+ 39 00 03 50 01 85
+ 39 00 03 51 01 80
+ 39 00 03 60 01 06
+ 39 00 03 62 01 20
+ 39 00 03 A0 01 00
+ 39 00 03 A1 01 21
+ 39 00 03 A2 01 35
+ 39 00 03 A3 01 19
+ 39 00 03 A4 01 1E
+ 39 00 03 A5 01 33
+ 39 00 03 A6 01 27
+ 39 00 03 A7 01 26
+ 39 00 03 A8 01 AF
+ 39 00 03 A9 01 1B
+ 39 00 03 AA 01 27
+ 39 00 03 AB 01 8D
+ 39 00 03 AC 01 1A
+ 39 00 03 AD 01 1B
+ 39 00 03 AE 01 50
+ 39 00 03 AF 01 26
+ 39 00 03 B0 01 2B
+ 39 00 03 B1 01 54
+ 39 00 03 B2 01 5E
+ 39 00 03 B3 01 23
+ 39 00 03 C0 01 00
+ 39 00 03 C1 01 21
+ 39 00 03 C2 01 35
+ 39 00 03 C3 01 19
+ 39 00 03 C4 01 1E
+ 39 00 03 C5 01 33
+ 39 00 03 C6 01 27
+ 39 00 03 C7 01 26
+ 39 00 03 C8 01 AF
+ 39 00 03 C9 01 1B
+ 39 00 03 CA 01 27
+ 39 00 03 CB 01 8D
+ 39 00 03 CC 01 1A
+ 39 00 03 CD 01 1B
+ 39 00 03 CE 01 50
+ 39 00 03 CF 01 26
+ 39 00 03 D0 01 2B
+ 39 00 03 D1 01 54
+ 39 00 03 D2 01 5E
+ 39 00 03 D3 01 23
+ 39 00 05 FF 03 98 81 00
];
panel-exit-sequence = [
@@ -743,303 +673,242 @@
status = "okay";
compatible = "simple-panel-dsi";
reg = <0>;
- backlight = <&backlight1>;
- reset-delay-ms = <60>;
- enable-delay-ms = <60>;
- prepare-delay-ms = <60>;
- unprepare-delay-ms = <60>;
- disable-delay-ms = <60>;
- dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
- MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
- dsi,format = <MIPI_DSI_FMT_RGB888>;
- dsi,lanes = <4>;
- panel-init-sequence = [
- 23 00 02 FE 21
- 23 00 02 04 00
- 23 00 02 00 64
- 23 00 02 2A 00
- 23 00 02 26 64
- 23 00 02 54 00
- 23 00 02 50 64
- 23 00 02 7B 00
- 23 00 02 77 64
- 23 00 02 A2 00
- 23 00 02 9D 64
- 23 00 02 C9 00
- 23 00 02 C5 64
- 23 00 02 01 71
- 23 00 02 27 71
- 23 00 02 51 71
- 23 00 02 78 71
- 23 00 02 9E 71
- 23 00 02 C6 71
- 23 00 02 02 89
- 23 00 02 28 89
- 23 00 02 52 89
- 23 00 02 79 89
- 23 00 02 9F 89
- 23 00 02 C7 89
- 23 00 02 03 9E
- 23 00 02 29 9E
- 23 00 02 53 9E
- 23 00 02 7A 9E
- 23 00 02 A0 9E
- 23 00 02 C8 9E
- 23 00 02 09 00
- 23 00 02 05 B0
- 23 00 02 31 00
- 23 00 02 2B B0
- 23 00 02 5A 00
- 23 00 02 55 B0
- 23 00 02 80 00
- 23 00 02 7C B0
- 23 00 02 A7 00
- 23 00 02 A3 B0
- 23 00 02 CE 00
- 23 00 02 CA B0
- 23 00 02 06 C0
- 23 00 02 2D C0
- 23 00 02 56 C0
- 23 00 02 7D C0
- 23 00 02 A4 C0
- 23 00 02 CB C0
- 23 00 02 07 CF
- 23 00 02 2F CF
- 23 00 02 58 CF
- 23 00 02 7E CF
- 23 00 02 A5 CF
- 23 00 02 CC CF
- 23 00 02 08 DD
- 23 00 02 30 DD
- 23 00 02 59 DD
- 23 00 02 7F DD
- 23 00 02 A6 DD
- 23 00 02 CD DD
- 23 00 02 0E 15
- 23 00 02 0A E9
- 23 00 02 36 15
- 23 00 02 32 E9
- 23 00 02 5F 15
- 23 00 02 5B E9
- 23 00 02 85 15
- 23 00 02 81 E9
- 23 00 02 AD 15
- 23 00 02 A9 E9
- 23 00 02 D3 15
- 23 00 02 CF E9
- 23 00 02 0B 14
- 23 00 02 33 14
- 23 00 02 5C 14
- 23 00 02 82 14
- 23 00 02 AA 14
- 23 00 02 D0 14
- 23 00 02 0C 36
- 23 00 02 34 36
- 23 00 02 5D 36
- 23 00 02 83 36
- 23 00 02 AB 36
- 23 00 02 D1 36
- 23 00 02 0D 6B
- 23 00 02 35 6B
- 23 00 02 5E 6B
- 23 00 02 84 6B
- 23 00 02 AC 6B
- 23 00 02 D2 6B
- 23 00 02 13 5A
- 23 00 02 0F 94
- 23 00 02 3B 5A
- 23 00 02 37 94
- 23 00 02 64 5A
- 23 00 02 60 94
- 23 00 02 8A 5A
- 23 00 02 86 94
- 23 00 02 B2 5A
- 23 00 02 AE 94
- 23 00 02 D8 5A
- 23 00 02 D4 94
- 23 00 02 10 D1
- 23 00 02 38 D1
- 23 00 02 61 D1
- 23 00 02 87 D1
- 23 00 02 AF D1
- 23 00 02 D5 D1
- 23 00 02 11 04
- 23 00 02 39 04
- 23 00 02 62 04
- 23 00 02 88 04
- 23 00 02 B0 04
- 23 00 02 D6 04
- 23 00 02 12 05
- 23 00 02 3A 05
- 23 00 02 63 05
- 23 00 02 89 05
- 23 00 02 B1 05
- 23 00 02 D7 05
- 23 00 02 18 AA
- 23 00 02 14 36
- 23 00 02 42 AA
- 23 00 02 3D 36
- 23 00 02 69 AA
- 23 00 02 65 36
- 23 00 02 8F AA
- 23 00 02 8B 36
- 23 00 02 B7 AA
- 23 00 02 B3 36
- 23 00 02 DD AA
- 23 00 02 D9 36
- 23 00 02 15 74
- 23 00 02 3F 74
- 23 00 02 66 74
- 23 00 02 8C 74
- 23 00 02 B4 74
- 23 00 02 DA 74
- 23 00 02 16 9F
- 23 00 02 40 9F
- 23 00 02 67 9F
- 23 00 02 8D 9F
- 23 00 02 B5 9F
- 23 00 02 DB 9F
- 23 00 02 17 DC
- 23 00 02 41 DC
- 23 00 02 68 DC
- 23 00 02 8E DC
- 23 00 02 B6 DC
- 23 00 02 DC DC
- 23 00 02 1D FF
- 23 00 02 19 03
- 23 00 02 47 FF
- 23 00 02 43 03
- 23 00 02 6E FF
- 23 00 02 6A 03
- 23 00 02 94 FF
- 23 00 02 90 03
- 23 00 02 BC FF
- 23 00 02 B8 03
- 23 00 02 E2 FF
- 23 00 02 DE 03
- 23 00 02 1A 35
- 23 00 02 44 35
- 23 00 02 6B 35
- 23 00 02 91 35
- 23 00 02 B9 35
- 23 00 02 DF 35
- 23 00 02 1B 45
- 23 00 02 45 45
- 23 00 02 6C 45
- 23 00 02 92 45
- 23 00 02 BA 45
- 23 00 02 E0 45
- 23 00 02 1C 55
- 23 00 02 46 55
- 23 00 02 6D 55
- 23 00 02 93 55
- 23 00 02 BB 55
- 23 00 02 E1 55
- 23 00 02 22 FF
- 23 00 02 1E 68
- 23 00 02 4C FF
- 23 00 02 48 68
- 23 00 02 73 FF
- 23 00 02 6F 68
- 23 00 02 99 FF
- 23 00 02 95 68
- 23 00 02 C1 FF
- 23 00 02 BD 68
- 23 00 02 E7 FF
- 23 00 02 E3 68
- 23 00 02 1F 7E
- 23 00 02 49 7E
- 23 00 02 70 7E
- 23 00 02 96 7E
- 23 00 02 BE 7E
- 23 00 02 E4 7E
- 23 00 02 20 97
- 23 00 02 4A 97
- 23 00 02 71 97
- 23 00 02 97 97
- 23 00 02 BF 97
- 23 00 02 E5 97
- 23 00 02 21 B5
- 23 00 02 4B B5
- 23 00 02 72 B5
- 23 00 02 98 B5
- 23 00 02 C0 B5
- 23 00 02 E6 B5
- 23 00 02 25 F0
- 23 00 02 23 E8
- 23 00 02 4F F0
- 23 00 02 4D E8
- 23 00 02 76 F0
- 23 00 02 74 E8
- 23 00 02 9C F0
- 23 00 02 9A E8
- 23 00 02 C4 F0
- 23 00 02 C2 E8
- 23 00 02 EA F0
- 23 00 02 E8 E8
- 23 00 02 24 FF
- 23 00 02 4E FF
- 23 00 02 75 FF
- 23 00 02 9B FF
- 23 00 02 C3 FF
- 23 00 02 E9 FF
- 23 00 02 FE 3D
- 23 00 02 00 04
- 23 00 02 FE 23
- 23 00 02 08 82
- 23 00 02 0A 00
- 23 00 02 0B 00
- 23 00 02 0C 01
- 23 00 02 16 00
- 23 00 02 18 02
- 23 00 02 1B 04
- 23 00 02 19 04
- 23 00 02 1C 81
- 23 00 02 1F 00
- 23 00 02 20 03
- 23 00 02 23 04
- 23 00 02 21 01
- 23 00 02 54 63
- 23 00 02 55 54
- 23 00 02 6E 45
- 23 00 02 6D 36
- 23 00 02 FE 3D
- 23 00 02 55 78
- 23 00 02 FE 20
- 23 00 02 26 30
- 23 00 02 FE 3D
- 23 00 02 20 71
- 23 00 02 50 8F
- 23 00 02 51 8F
- 23 00 02 FE 00
- 23 00 02 35 00
- 05 78 01 11
- 05 1E 01 29
- ];
+ power-supply = <&vcc3v3_lcd1_n>; //MIPI_3V3EN_GPIO3_A3_d_3V3
+ vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
+ reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
+ vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
+ reset-delay-ms = <200>;
+ enable-delay-ms = <60>;
+ init-delay-ms = <120>;
+ disable-delay-ms = <60>;
+ prepare-delay-ms = <120>;
+ unprepare-delay-ms = <120>;
+ backlight = <&backlight1>;
+ dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST |
+ MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>;
+ dsi,format = <MIPI_DSI_FMT_RGB888>;
+ dsi,lanes = <4>;
+
+ panel-init-sequence = [
+ 39 00 04 FF 98 81 03
+ 15 00 02 01 00
+ 15 00 02 02 00
+ 15 00 02 03 53
+ 15 00 02 04 D3
+ 15 00 02 05 00
+ 15 00 02 06 0D
+ 15 00 02 07 08
+ 15 00 02 08 00
+ 15 00 02 09 00
+ 15 00 02 0a 00
+ 15 00 02 0b 00
+ 15 00 02 0c 00
+ 15 00 02 0d 00
+ 15 00 02 0e 00
+ 15 00 02 0f 28
+ 15 00 02 10 28
+ 15 00 02 11 00
+ 15 00 02 12 00
+ 15 00 02 13 00
+ 15 00 02 14 00
+ 15 00 02 15 00
+ 15 00 02 16 00
+ 15 00 02 17 00
+ 15 00 02 18 00
+ 15 00 02 19 00
+ 15 00 02 1a 00
+ 15 00 02 1b 00
+ 15 00 02 1c 00
+ 15 00 02 1d 00
+ 15 00 02 1e 40
+ 15 00 02 1f 80
+ 15 00 02 20 06
+ 15 00 02 21 01
+ 15 00 02 22 00
+ 15 00 02 23 00
+ 15 00 02 24 00
+ 15 00 02 25 00
+ 15 00 02 26 00
+ 15 00 02 27 00
+ 15 00 02 28 33
+ 15 00 02 29 33
+ 15 00 02 2a 00
+ 15 00 02 2b 00
+ 15 00 02 2c 00
+ 15 00 02 2d 00
+ 15 00 02 2e 00
+ 15 00 02 2f 00
+ 15 00 02 30 00
+ 15 00 02 31 00
+ 15 00 02 32 00
+ 15 00 02 33 00
+ 15 00 02 34 03
+ 15 00 02 35 00
+ 15 00 02 36 00
+ 15 00 02 37 00
+ 15 00 02 38 96
+ 15 00 02 39 00
+ 15 00 02 3a 00
+ 15 00 02 3b 00
+ 15 00 02 3c 00
+ 15 00 02 3d 00
+ 15 00 02 3e 00
+ 15 00 02 3f 00
+ 15 00 02 40 00
+ 15 00 02 41 00
+ 15 00 02 42 00
+ 15 00 02 43 00
+ 15 00 02 44 00
+ 15 00 02 50 00
+ 15 00 02 51 23
+ 15 00 02 52 45
+ 15 00 02 53 67
+ 15 00 02 54 89
+ 15 00 02 55 AB
+ 15 00 02 56 01
+ 15 00 02 57 23
+ 15 00 02 58 45
+ 15 00 02 59 67
+ 15 00 02 5a 89
+ 15 00 02 5b AB
+ 15 00 02 5c CD
+ 15 00 02 5d EF
+ 15 00 02 5e 00
+ 15 00 02 5f 08
+ 15 00 02 60 08
+ 15 00 02 61 06
+ 15 00 02 62 06
+ 15 00 02 63 01
+ 15 00 02 64 01
+ 15 00 02 65 00
+ 15 00 02 66 00
+ 15 00 02 67 02
+ 15 00 02 68 15
+ 15 00 02 69 15
+ 15 00 02 6a 14
+ 15 00 02 6b 14
+ 15 00 02 6c 0D
+ 15 00 02 6d 0D
+ 15 00 02 6e 0C
+ 15 00 02 6f 0C
+ 15 00 02 70 0F
+ 15 00 02 71 0F
+ 15 00 02 72 0E
+ 15 00 02 73 0E
+ 15 00 02 74 02
+ 15 00 02 75 08
+ 15 00 02 76 08
+ 15 00 02 77 06
+ 15 00 02 78 06
+ 15 00 02 79 01
+ 15 00 02 7a 01
+ 15 00 02 7b 00
+ 15 00 02 7c 00
+ 15 00 02 7d 02
+ 15 00 02 7e 15
+ 15 00 02 7f 15
+ 15 00 02 80 14
+ 15 00 02 81 14
+ 15 00 02 82 0D
+ 15 00 02 83 0D
+ 15 00 02 84 0C
+ 15 00 02 85 0C
+ 15 00 02 86 0F
+ 15 00 02 87 0F
+ 15 00 02 88 0E
+ 15 00 02 89 0E
+ 15 00 02 8A 02
+ 39 00 04 FF 98 81 04
+ 15 00 02 C5 3A
+ 15 00 02 6E 2B
+ 15 00 02 6F 37
+ 15 00 02 3A 24
+ 15 00 02 8D 1A
+ 15 00 02 87 BA
+ 15 00 02 B2 D1
+ 15 00 02 88 0B
+ 15 00 02 38 01
+ 15 00 02 39 00
+ 15 00 02 B5 02
+ 15 00 02 31 25
+ 15 00 02 3B 98
+ 39 00 04 FF 98 81 01
+ 15 00 02 22 0A
+ 15 00 02 31 00
+ 15 00 02 53 3D
+ 15 00 02 55 3D
+ 15 00 02 50 85
+ 15 00 02 51 80
+ 15 00 02 60 06
+ 15 00 02 62 20
+ 15 00 02 A0 00
+ 15 00 02 A1 21
+ 15 00 02 A2 35
+ 15 00 02 A3 19
+ 15 00 02 A4 1E
+ 15 00 02 A5 33
+ 15 00 02 A6 27
+ 15 00 02 A7 26
+ 15 00 02 A8 AF
+ 15 00 02 A9 1B
+ 15 00 02 AA 27
+ 15 00 02 AB 8D
+ 15 00 02 AC 1A
+ 15 00 02 AD 1B
+ 15 00 02 AE 50
+ 15 00 02 AF 26
+ 15 00 02 B0 2B
+ 15 00 02 B1 54
+ 15 00 02 B2 5E
+ 15 00 02 B3 23
+ 15 00 02 C0 00
+ 15 00 02 C1 21
+ 15 00 02 C2 35
+ 15 00 02 C3 19
+ 15 00 02 C4 1E
+ 15 00 02 C5 33
+ 15 00 02 C6 27
+ 15 00 02 C7 26
+ 15 00 02 C8 AF
+ 15 00 02 C9 1B
+ 15 00 02 CA 27
+ 15 00 02 CB 8D
+ 15 00 02 CC 1A
+ 15 00 02 CD 1B
+ 15 00 02 CE 50
+ 15 00 02 CF 26
+ 15 00 02 D0 2B
+ 15 00 02 D1 54
+ 15 00 02 D2 5E
+ 15 00 02 D3 23
+ 39 00 04 FF 98 81 00
+ 15 78 01 11
+ 15 05 01 29
+ ];
panel-exit-sequence = [
05 00 01 28
05 00 01 10
];
- disp_timings1: display-timings {
- native-mode = <&dsi1_timing0>;
- dsi1_timing0: timing0 {
- clock-frequency = <132000000>;
- hactive = <1080>;
- vactive = <1920>;
- hfront-porch = <15>;
- hsync-len = <2>;
- hback-porch = <30>;
- vfront-porch = <15>;
- vsync-len = <2>;
- vback-porch = <15>;
- hsync-active = <0>;
- vsync-active = <0>;
- de-active = <0>;
- pixelclk-active = <1>;
- };
- };
+ disp_timings1: display-timings {
+ native-mode = <&dsi1_timing0>;
+ dsi1_timing0: timing0 {
+ clock-frequency = <69000000>;
+ hactive = <800>;
+ vactive = <1280>;
+ hfront-porch = <32>;
+ hsync-len = <20>;
+ hback-porch = <20>;
+ vfront-porch = <16>;
+ vsync-len = <5>;
+ vback-porch = <12>;
+ hsync-active = <0>;
+ vsync-active = <0>;
+ de-active = <0>;
+ pixelclk-active = <1>;
+ };
+ };
ports {
#address-cells = <1>;
@@ -1738,14 +1607,6 @@
&sfc {
status = "okay";
-
- flash@0 {
- compatible = "spi-nand";
- reg = <0>;
- spi-max-frequency = <75000000>;
- spi-rx-bus-width = <4>;
- spi-tx-bus-width = <1>;
- };
};
&spdif_8ch {
diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi
old mode 100644
new mode 100755
index e31be0c..8a3e1fe
--- a/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/rk3568.dtsi
@@ -286,7 +286,7 @@
logo,kernel = "logo_kernel.bmp";
logo,mode = "center";
charge_logo,mode = "center";
- connect = <&vp0_out_dsi1>;
+ connect = <&vp1_out_dsi1>;
};
route_edp: route-edp {
status = "disabled";
@@ -294,7 +294,7 @@
logo,kernel = "logo_kernel.bmp";
logo,mode = "center";
charge_logo,mode = "center";
- connect = <&vp0_out_edp>;
+ connect = <&vp1_out_edp>;
};
route_hdmi: route-hdmi {
status = "disabled";
@@ -302,7 +302,7 @@
logo,kernel = "logo_kernel.bmp";
logo,mode = "center";
charge_logo,mode = "center";
- connect = <&vp1_out_hdmi>;
+ connect = <&vp0_out_hdmi>;
};
route_lvds: route-lvds {
status = "disabled";
@@ -1782,7 +1782,7 @@
clock-names = "pclk_csi2host";
resets = <&cru SRST_P_CSI2HOST1>;
reset-names = "srst_csihost_p";
- status = "okay";
+ status = "disabled";
};
rkcif: rkcif@fdfe0000 {
diff --git a/kernel/arch/arm64/configs/rockchip_linux_defconfig b/kernel/arch/arm64/configs/rockchip_linux_defconfig
index d071e43..3b370f8 100644
--- a/kernel/arch/arm64/configs/rockchip_linux_defconfig
+++ b/kernel/arch/arm64/configs/rockchip_linux_defconfig
@@ -2,10 +2,10 @@
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.10.160 Kernel Configuration
#
-CONFIG_CC_VERSION_TEXT="aarch64-none-linux-gnu-gcc (GNU Toolchain for the A-profile Architecture 10.3-2021.07 (arm-10.29)) 10.3.1 20210621"
+CONFIG_CC_VERSION_TEXT="gcc (Ubuntu 7.5.0-3ubuntu1~18.04) 7.5.0"
CONFIG_CC_IS_GCC=y
-CONFIG_GCC_VERSION=100301
-CONFIG_LD_VERSION=236010000
+CONFIG_GCC_VERSION=70500
+CONFIG_LD_VERSION=230000000
CONFIG_CLANG_VERSION=0
CONFIG_LLD_VERSION=0
CONFIG_CC_CAN_LINK=y
@@ -267,6 +267,7 @@
CONFIG_PGTABLE_LEVELS=3
CONFIG_ARCH_SUPPORTS_UPROBES=y
CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_BROKEN_GAS_INST=y
#
# Platform selection
@@ -410,9 +411,6 @@
#
CONFIG_ARM64_HW_AFDBM=y
CONFIG_ARM64_PAN=y
-CONFIG_AS_HAS_LDAPR=y
-CONFIG_AS_HAS_LSE_ATOMICS=y
-CONFIG_ARM64_LSE_ATOMICS=y
CONFIG_ARM64_USE_LSE_ATOMICS=y
CONFIG_ARM64_VHE=y
# end of ARMv8.1 architectural features
@@ -429,31 +427,20 @@
#
# ARMv8.3 architectural features
#
-# CONFIG_ARM64_PTR_AUTH is not set
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET=y
-CONFIG_CC_HAS_SIGN_RETURN_ADDRESS=y
-CONFIG_AS_HAS_PAC=y
-CONFIG_AS_HAS_CFI_NEGATE_RA_STATE=y
# end of ARMv8.3 architectural features
#
# ARMv8.4 architectural features
#
# CONFIG_ARM64_AMU_EXTN is not set
-CONFIG_AS_HAS_ARMV8_4=y
-# CONFIG_ARM64_TLB_RANGE is not set
# end of ARMv8.4 architectural features
#
# ARMv8.5 architectural features
#
-CONFIG_AS_HAS_ARMV8_5=y
# CONFIG_ARM64_BTI is not set
-CONFIG_CC_HAS_BRANCH_PROT_PAC_RET_BTI=y
# CONFIG_ARM64_E0PD is not set
# CONFIG_ARCH_RANDOM is not set
-CONFIG_ARM64_AS_HAS_MTE=y
-# CONFIG_ARM64_MTE is not set
# end of ARMv8.5 architectural features
# CONFIG_ARM64_SVE is not set
@@ -462,8 +449,6 @@
# CONFIG_ARM64_DEBUG_PRIORITY_MASKING is not set
CONFIG_RELOCATABLE=y
# CONFIG_RANDOMIZE_BASE is not set
-CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
-CONFIG_STACKPROTECTOR_PER_TASK=y
# end of Kernel Features
#
@@ -511,19 +496,7 @@
#
# CPU Idle
#
-CONFIG_CPU_IDLE=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
-# CONFIG_CPU_IDLE_GOV_LADDER is not set
-CONFIG_CPU_IDLE_GOV_MENU=y
-# CONFIG_CPU_IDLE_GOV_TEO is not set
-CONFIG_DT_IDLE_STATES=y
-
-#
-# ARM CPU Idle Drivers
-#
-CONFIG_ARM_CPUIDLE=y
-# CONFIG_ARM_PSCI_CPUIDLE is not set
-# end of ARM CPU Idle Drivers
+# CONFIG_CPU_IDLE is not set
# end of CPU Idle
#
@@ -594,7 +567,6 @@
CONFIG_EFI_EARLYCON=y
CONFIG_ARM_PSCI_FW=y
-# CONFIG_ARM_PSCI_CHECKER is not set
CONFIG_HAVE_ARM_SMCCC=y
CONFIG_HAVE_ARM_SMCCC_DISCOVERY=y
CONFIG_ARM_SMCCC_SOC_ID=y
@@ -717,10 +689,6 @@
# end of GCOV-based kernel profiling
CONFIG_HAVE_GCC_PLUGINS=y
-CONFIG_GCC_PLUGINS=y
-# CONFIG_GCC_PLUGIN_CYC_COMPLEXITY is not set
-# CONFIG_GCC_PLUGIN_LATENT_ENTROPY is not set
-# CONFIG_GCC_PLUGIN_RANDSTRUCT is not set
# end of General architecture-dependent options
CONFIG_RT_MUTEXES=y
@@ -991,6 +959,7 @@
# CONFIG_NETFILTER_XT_TARGET_HL is not set
# CONFIG_NETFILTER_XT_TARGET_HMARK is not set
# CONFIG_NETFILTER_XT_TARGET_IDLETIMER is not set
+# CONFIG_NETFILTER_XT_TARGET_LED is not set
# CONFIG_NETFILTER_XT_TARGET_LOG is not set
# CONFIG_NETFILTER_XT_TARGET_MARK is not set
# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set
@@ -1201,6 +1170,7 @@
CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
# CONFIG_WIMAX is not set
CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
# CONFIG_RFKILL_INPUT is not set
# CONFIG_RFKILL_GPIO is not set
CONFIG_RFKILL_RK=y
@@ -1542,7 +1512,7 @@
#
# EEPROM support
#
-# CONFIG_EEPROM_AT24 is not set
+CONFIG_EEPROM_AT24=y
# CONFIG_EEPROM_AT25 is not set
# CONFIG_EEPROM_LEGACY is not set
# CONFIG_EEPROM_MAX6875 is not set
@@ -1827,6 +1797,7 @@
CONFIG_PHYLINK=y
CONFIG_PHYLIB=y
CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
CONFIG_FIXED_PHY=y
# CONFIG_SFP is not set
@@ -4603,6 +4574,7 @@
CONFIG_USB_OHCI_LITTLE_ENDIAN=y
CONFIG_USB_SUPPORT=y
CONFIG_USB_COMMON=y
+# CONFIG_USB_LED_TRIG is not set
# CONFIG_USB_ULPI_BUS is not set
# CONFIG_USB_CONN_GPIO is not set
CONFIG_USB_ARCH_HAS_HCD=y
@@ -4620,6 +4592,7 @@
# CONFIG_USB_OTG_PRODUCTLIST is not set
# CONFIG_USB_OTG_DISABLE_EXTERNAL_HUB is not set
# CONFIG_USB_OTG_FSM is not set
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
CONFIG_USB_AUTOSUSPEND_DELAY=2
CONFIG_USB_MON=y
@@ -5020,7 +4993,26 @@
#
# LED Triggers
#
-# CONFIG_LEDS_TRIGGERS is not set
+CONFIG_LEDS_TRIGGERS=y
+# CONFIG_LEDS_TRIGGER_TIMER is not set
+# CONFIG_LEDS_TRIGGER_ONESHOT is not set
+# CONFIG_LEDS_TRIGGER_DISK is not set
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=y
+# CONFIG_LEDS_TRIGGER_BACKLIGHT is not set
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+# CONFIG_LEDS_TRIGGER_GPIO is not set
+# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+# CONFIG_LEDS_TRIGGER_TRANSIENT is not set
+# CONFIG_LEDS_TRIGGER_CAMERA is not set
+# CONFIG_LEDS_TRIGGER_PANIC is not set
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+# CONFIG_LEDS_TRIGGER_AUDIO is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_INFINIBAND is not set
CONFIG_EDAC_SUPPORT=y
@@ -6462,10 +6454,6 @@
# Memory initialization
#
CONFIG_INIT_STACK_NONE=y
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_USER is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF is not set
-# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
-# CONFIG_GCC_PLUGIN_STACKLEAK is not set
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
# end of Memory initialization
@@ -6893,8 +6881,6 @@
CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y
-CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
-# CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y
# CONFIG_KFENCE is not set
# end of Memory Debugging
@@ -6982,7 +6968,6 @@
CONFIG_HAVE_FUNCTION_TRACER=y
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
CONFIG_HAVE_DYNAMIC_FTRACE=y
-CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
CONFIG_HAVE_C_RECORDMCOUNT=y
diff --git a/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index e3cce73..f395a69 100644
--- a/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/kernel/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3093,6 +3093,7 @@
int i, ret = 0;
memset(metedata, 0, sizeof(*metedata));
+#if 0
edid = dw_hdmi_get_edid(hdmi, connector);
if (edid) {
int vic = 0;
@@ -3120,6 +3121,7 @@
kfree(edid);
} else {
+#endif
hdmi->support_hdmi = true;
hdmi->sink_has_audio = true;
for (i = 0; i < ARRAY_SIZE(dw_hdmi_default_modes); i++) {
@@ -3139,7 +3141,7 @@
info->color_formats = 0;
dev_info(hdmi->dev, "failed to get edid\n");
- }
+// }
dw_hdmi_update_hdr_property(connector);
dw_hdmi_check_output_type_changed(hdmi);
diff --git a/mk-rootfs.sh b/mk-rootfs.sh
index 83eb25e..3a106e9 100755
--- a/mk-rootfs.sh
+++ b/mk-rootfs.sh
@@ -1,7 +1,7 @@
#!/bin/bash -e
#TARGET_ROOTFS_DIR=/home/data/rootfs/rk356x/ubuntu20-lxde/lxde_ubuntu20_rootfs
#TARGET_ROOTFS_DIR=/home/data/rootfs/rk356x/debian10/rk3568_likong
-TARGET_ROOTFS_DIR=/home/data/rootfs/rk356x/ubuntu18.04/ubuntu18.04_lite_ksl
+TARGET_ROOTFS_DIR=/home/data/rootfs/rk356x/debian11/debian11_rootfs
MOUNTPOINT=./temp
ROOTFSIMAGE=rootfs.ext4
OUT=$PWD/tools/linux/Linux_Pack_Firmware/rockdev/Image/
@@ -17,7 +17,7 @@
# Create directories
mkdir ${MOUNTPOINT}
-dd if=/dev/zero of=${ROOTFSIMAGE} bs=1M count=0 seek=1300
+dd if=/dev/zero of=${ROOTFSIMAGE} bs=1M count=0 seek=4300
finish() {
sudo umount ${MOUNTPOINT} || true
--
Gitblit v1.6.2