Update linux SDK build shell script and patches

android

2024-07-12 992d1969fcf222b072ac338908b21805611c9b36

 linux_sdk/patches/kernel.patch

@@ -1,16 +1,16 @@
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
index f13c2387f1d2..df730a87027e 100644
index f13c2387f1d2..9793bf3dd27e 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb.dtsi
@@ -348,7 +348,7 @@ wireless_wlan: wireless-wlan {
@@ -346,7 +346,7 @@ sdio_pwrseq: sdio-pwrseq {
    wireless_wlan: wireless-wlan {
       compatible = "wlan-platdata";
       rockchip,grf = <&grf>;
       wifi_chip_type = "ap6398s";
-      wifi_chip_type = "ap6398s";
+      wifi_chip_type = "mt7601u";
       WIFI,poweren_gpio = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>;
-      status = "okay";
+      status = "disabled";
       status = "okay";
    };
 
    wireless_bluetooth: wireless-bluetooth {
@@ -363,7 +363,7 @@ wireless_bluetooth: wireless-bluetooth {
       BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
       BT,wake_gpio     = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
@@ -38,14 +38,14 @@
+            vactive = <1080>;
+            hfront-porch = <48>;
+            hsync-len = <32>;
+            hback-porch = <147>;
+            hback-porch = <187>;
+            vfront-porch = <3>;
+            vsync-len = <6>;
+            vback-porch = <51>;
             hsync-active = <0>;
             vsync-active = <0>;
             de-active = <0>;
@@ -1375,13 +1375,15 @@ rk809_codec: codec {
@@ -1375,14 +1375,42 @@ rk809_codec: codec {
 &i2c1 {
    status = "okay";
 
@@ -64,9 +64,47 @@
+      reset-gpios = <&gpio0 RK_PB6 GPIO_ACTIVE_LOW>;
+      max-fingers = <6>;
    };
+
+/*
+   i2c-hid-dev@40 {
+      compatible = "hid-over-i2c";
+      reg = <0x40>;
+      hid-descr-addr = <0x0001>;
+      pinctrl-names = "default";
+      pinctrl-0 = <&touch_gpio>;
+      interrupt-parent = <&gpio0>;
+      interrupts = <13 IRQ_TYPE_EDGE_FALLING>;
+      post-power-on-delay-ms = <70>;
+   };
+
+
+
+         gt9271@14 {
+           compatible = "goodix,gt9271";
+           reg = <0x14>;
+      pinctrl-names = "default";
+                pinctrl-0 = <&touch_gpio>;
+                interrupt-parent = <&gpio0>;
+                interrupts = <13 0>;
+            reset-gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>;
+      irq-gpio = <&gpio0 RK_PB5 IRQ_TYPE_LEVEL_LOW>;
+   };
+*/
 };
 
@@ -1545,9 +1547,9 @@ &pmu_io_domains {
 &i2c5 {
@@ -1496,8 +1524,8 @@ soc_slppin_rst: soc_slppin_rst {
    touch {
       touch_gpio: touch-gpio {
          rockchip,pins =
-            <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>,
-            <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>;
+            <0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_up>,
+            <0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
       };
    };
 
@@ -1545,9 +1573,9 @@ &pmu_io_domains {
    pmuio2-supply = <&vcc3v3_pmu>;
    vccio1-supply = <&vccio_acodec>;
    vccio3-supply = <&vccio_sd>;
@@ -78,14 +116,109 @@
    vccio7-supply = <&vcc_3v3>;
 };
 
@@ -1560,7 +1588,7 @@ &pwm5 {
 };
 
 &pwm7 {
-   status = "okay";
+   status = "disabled";
 
    compatible = "rockchip,remotectl-pwm";
    remote_pwm_id = <3>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
index b6b618bb561a..36cd17a68309 100644
index b6b618bb561a..238ab7d55580 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10-linux.dts
@@ -15,3 +15,50 @@ &vp0 {
 &vp1 {
    cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
@@ -3,15 +3,151 @@
  * Copyright (c) 2020 Rockchip Electronics Co., Ltd.
  *
  */
-
+#include <dt-bindings/display/media-bus-format.h>
 #include "rk3568-evb1-ddr4-v10.dtsi"
 #include "rk3568-linux.dtsi"
 #include <dt-bindings/display/rockchip_vop.h>
+/*
+/ {
+        panel-lvds0 {
+                compatible = "simple-panel";
+      power-supply = <&vcc3v3_lcd0_n>;
+                enable-delay-ms = <20>;
+                prepare-delay-ms = <20>;
+                unprepare-delay-ms = <20>;
+                disable-delay-ms = <20>;
+                bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>;
+      width-mm = <217>;
+                height-mm = <136>;
+
+                display-timings {
+                        native-mode = <&timing0>;
+                        timing0: timing0 {
+                                clock-frequency = <73400000>;
+                                hactive = <1280>;
+                                vactive = <800>;
+                                hback-porch = <40>;
+                                hfront-porch = <80>;
+                                vback-porch = <9>;
+                                vfront-porch = <9>;
+                                hsync-len = <40>;
+                                vsync-len = <5>;
+                                hsync-active = <0>;
+                                vsync-active = <0>;
+                                de-active = <0>;
+                                pixelclk-active = <0>;
+                        };
+                };
+
+                ports {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        port@0 {
+                                reg = <0>;
+                                panel_in_lvds0: endpoint {
+                                        remote-endpoint = <&lvds0_out_panel>;
+                                };
+                        };
+                };
+        };
+
+};
+&lvds0 {
+        status = "okay";
+        ports {
+                port@1 {
+                        reg = <1>;
+                        lvds0_out_panel: endpoint {
+                                remote-endpoint = <&panel_in_lvds0>;
+                        };
+                };
+        };
+};
+
+&lvds0_in_vp1 {
+        status = "okay";
+};
+
+&route_lvds{
+   status = "okay";
+   connect = <&vp1_out_lvds>;
+};
+*/
 
 &vp0 {
-   cursor-win-id = <ROCKCHIP_VOP2_CLUSTER0>;
+        cursor-win-id = <ROCKCHIP_VOP2_CLUSTER0>;
 };
 
 &vp1 {
-   cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
+        cursor-win-id = <ROCKCHIP_VOP2_CLUSTER1>;
+};
+
+&backlight {
+        status = "okay";
+};
+
+
+&uart3{
+        dma-names = "tx", "rx";
@@ -101,9 +234,16 @@
+        status = "okay";
+};
+
+&uart6 {
+        dma-name = "tx", "rx";
+        pinctrl-0 = <&uart6m1_xfer>;
+        status = "okay";
+};
+
+
+&uart9 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&uart9m1_xfer &rs485_ctrl>;
+        pinctrl-0 = <&uart9m1_xfer &rs485_ctrl &dout0_gpio>;
+        status = "okay";
+};
+
@@ -125,6 +265,10 @@
+        status = "okay";
+};
+
+&pwm15 {
+    status = "okay";
+};
+
+&pinctrl {
+
+   rs485 {
@@ -132,9 +276,16 @@
+         rockchip,pins = <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
+      };
+   };
+	
+        dout0 {
+                dout0_gpio: dout0-gpio {
+                        rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+};
+        };
+	
 };
diff --git a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
index dc9ad4236dd3..ec5a5f7bcf6c 100644
index dc9ad4236dd3..afaa65550717 100644
--- a/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3568-evb1-ddr4-v10.dtsi
@@ -186,15 +186,15 @@ &dsi1_panel {
@@ -156,6 +307,15 @@
 };
 
 &edp_in_vp1 {
@@ -250,7 +250,7 @@ &gmac1m1_rgmii_clk
 
    tx_delay = <0x4f>;
    rx_delay = <0x26>;
-
+	
    phy-handle = <&rgmii_phy1>;
    status = "okay";
 };
@@ -259,10 +259,11 @@ &gmac1m1_rgmii_clk
  * power-supply should switche to vcc3v3_lcd1_n
  * when mipi panel is connected to dsi1.
@@ -194,6 +354,15 @@
    connect = <&vp0_out_edp>;
 };
 
@@ -460,7 +461,7 @@ &uart8 {
    pinctrl-names = "default";
    pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
 };
-
+/*mipi_dsi下这个要调成HIGHT，但是lvds通过这个引脚来拉低打开背光所以有所区别 */
 &vcc3v3_lcd0_n {
    gpio = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;
    enable-active-high;
@@ -489,5 +490,5 @@ &wireless_bluetooth {
    BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
    BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
@@ -202,7 +371,7 @@
+   status = "disabled";
 };
diff --git a/arch/arm64/configs/rockchip_linux_defconfig b/arch/arm64/configs/rockchip_linux_defconfig
index 688203de6bae..47da208d49e3 100644
index 688203de6bae..dc9320a4b42f 100644
--- a/arch/arm64/configs/rockchip_linux_defconfig
+++ b/arch/arm64/configs/rockchip_linux_defconfig
@@ -60,13 +60,10 @@ CONFIG_ARMV8_DEPRECATED=y
@@ -229,7 +398,15 @@
 CONFIG_BT=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_HIDP=y
@@ -212,8 +212,19 @@ CONFIG_STMMAC_ETH=y
@@ -130,6 +130,7 @@ CONFIG_BT_HCIBFUSB=y
 CONFIG_BT_HCIVHCI=y
 CONFIG_BT_MRVL=y
 CONFIG_BT_MRVL_SDIO=y
+CONFIG_CFG80211_WEXT=y
 CONFIG_RFKILL=y
 CONFIG_RFKILL_RK=y
 CONFIG_PCI=y
@@ -212,8 +213,23 @@ CONFIG_STMMAC_ETH=y
 CONFIG_MOTORCOMM_PHY=y
 CONFIG_ROCKCHIP_PHY=y
 CONFIG_RK630_PHY=y
@@ -246,18 +423,25 @@
 CONFIG_USB_RTL8152=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_CDC_MBIM=y
+CONFIG_HOSTAP=y
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_MT7601U=y
 CONFIG_WL_ROCKCHIP=y
 CONFIG_WIFI_BUILD_MODULE=y
 CONFIG_AP6XXX=m
@@ -230,6 +241,7 @@ CONFIG_INPUT_TOUCHSCREEN=y
@@ -228,8 +244,10 @@ CONFIG_MOUSE_CYAPA=y
 CONFIG_MOUSE_ELAN_I2C=y
 CONFIG_INPUT_TOUCHSCREEN=y
 CONFIG_TOUCHSCREEN_ATMEL_MXT=y
+CONFIG_TOUCHSCREEN_GOODIX=y
 CONFIG_TOUCHSCREEN_GSL3673=y
 CONFIG_TOUCHSCREEN_GT1X=y
+CONFIG_TOUCHSCREEN_ILI210X=y
 CONFIG_TOUCHSCREEN_ELAN=y
 CONFIG_TOUCHSCREEN_USB_COMPOSITE=y
 CONFIG_ROCKCHIP_REMOTECTL=y
@@ -628,7 +640,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
@@ -628,7 +646,6 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_DEV_ROCKCHIP=y
 CONFIG_CRYPTO_DEV_ROCKCHIP_DEV=y