From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Wed, 03 Jan 2024 09:43:39 +0000 Subject: [PATCH] update kernel to 5.10.198 --- kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi | 64 +++++++++++++++++++++++++------ 1 files changed, 51 insertions(+), 13 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi index 92a194c..ad8ce8e 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi @@ -137,7 +137,7 @@ }; hp_en { - gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3 + gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3 gpio_function = <0>; }; @@ -145,6 +145,47 @@ 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>; + gpio_function = <0>; + }; + + do2 { + gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do3 { + gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do4 { + gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>; + gpio_function = <0>; + }; + + do5 { + gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + do6 { + gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + do7 { + gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; + gpio_function = <0>; + }; + + di1 { + gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>; + gpio_function = <1>; + }; + #endif }; #if 0 nk_io_init { @@ -339,12 +380,12 @@ remote-endpoint = <&panel_in>; }; }; - }; + + }; }; &edp_phy { - status = "okay"; - + status = "okay"; }; &edp_in_vp0 { @@ -408,7 +449,7 @@ phy-mode = "rgmii"; clock_in_out = "output"; - snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>; snps,reset-active-low; /* Reset time is 20ms, 100ms for rtl8211f */ snps,reset-delays-us = <0 20000 100000>; @@ -428,7 +469,9 @@ rx_delay = <0x2f>; phy-handle = <&rgmii_phy0>; + status = "disabled"; + }; &gmac1 { @@ -462,9 +505,7 @@ * power-supply should switche to vcc3v3_lcd1_n * when mipi panel is connected to dsi1. */ ->1x { - power-supply = <&vcc3v3_lcd0_n>; -}; + &i2c3 { status = "okay"; @@ -483,7 +524,7 @@ }; &i2c4 { - status = "okay"; + status = "disabled"; gc8034: gc8034@37 { compatible = "galaxycore,gc8034"; status = "okay"; @@ -495,7 +536,6 @@ reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>; pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>; rockchip,grf = <&grf>; - power-domains = <&power RK3568_PD_VI>; rockchip,camera-module-index = <0>; rockchip,camera-module-facing = "back"; rockchip,camera-module-name = "RK-CMK-8M-2-v1"; @@ -529,7 +569,7 @@ }; }; ov5695: ov5695@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5695"; reg = <0x36>; clocks = <&cru CLK_CIF_OUT>; @@ -672,8 +712,6 @@ }; }; }; - - -- Gitblit v1.6.2