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 | 384 ++++++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 308 insertions(+), 76 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi index 2c59a55..ad8ce8e 100755 --- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi @@ -8,6 +8,7 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/pinctrl/rockchip.h> +#include <dt-bindings/display/media-bus-format.h> #include "rk3568.dtsi" #include "rk3568-evb.dtsi" @@ -17,7 +18,8 @@ rk_headset: rk-headset { compatible = "rockchip_headset"; - headset_gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>; + headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>; + spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3 pinctrl-names = "default"; pinctrl-0 = <&hp_det>; }; @@ -32,15 +34,6 @@ vin-supply = <&vcc3v3_sys>; }; - vcc3v3_vga: vcc3v3-vga { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_vga"; - regulator-always-on; - regulator-boot-on; - gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; - enable-active-high; - vin-supply = <&vcc3v3_sys>; - }; pcie30_avdd0v9: pcie30-avdd0v9 { compatible = "regulator-fixed"; @@ -67,7 +60,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>; @@ -94,38 +89,166 @@ regulator-boot-on; }; #endif - + ndj_io_init { + compatible = "nk_io_control"; + pinctrl-names = "default"; + pinctrl-0 = <&nk_io_gpio>; + + //gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; + + vcc_5v { + gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3 + gpio_function = <0>; + }; + + vcc_12v { + gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3 + gpio_function = <0>; + }; + + hub_host2_rst { + gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3 + gpio_function = <3>; + }; + + hub_host3 { + gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8 + gpio_function = <0>; + }; + + wake_4g { + gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3 + gpio_function = <0>; + }; + + air_mode_4g { + gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3 + gpio_function = <0>; + }; + + reset_4g { + gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3 + gpio_function = <3>; + }; + + en_4g { + gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6 + gpio_function = <0>; + }; + + hp_en { + gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3 + gpio_function = <0>; + }; + + wifi_power_en { + 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 { compatible = "nk_io_control"; - usb_en_oc_gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; //USB_EN_OC_GPIO0_A5 - lcd_bk_en_gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3 - lcd_pwblk_gpio = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3 - vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3 +// vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8 -// hub_host3_5V_rest_gpio = <&gpio0 RK_PB6 GPIO_ACTIVE_HIGH>; vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3 vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3 en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6 reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3 - - edp_enable_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; - edp_gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_LOW>; //7511_GPIO0-GPIO3_D2 - edp_gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_LOW>; //7511_GPIO1-GPIO3_D3 - edp_gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_LOW>; //7511_GPIO2-GPIO3_D4 - edp_gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_LOW>; //7511_GPIO3-GPIO3_D5 - edp_reset = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1 -// tp_reset = <&gpio3 RK_PA7 GPIO_ACTIVE_HIGH>; -// vddio_mipi = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; - + hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3 +// spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3 wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8 - +// pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4 pinctrl-names = "default"; - pinctrl-0 = <&nk_io_gpio>; - nodka_lvds = <9>; + pinctrl-0 = <&nk_io_gpio>; }; +#endif + panel: panel { + compatible = "simple-panel"; + backlight = <&backlight>; + power-supply = <&vcc3v3_lcd0_n>; + 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>; + prepare-delay-ms = <200>; + enable-delay-ms = <20>; + lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 + lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 + lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 + lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5 + nodka-lvds = <15>; + + display-timings { + native-mode = <&timing0>; + timing0: timing0 { + clock-frequency = <72500000>; + hactive = <1280>; + vactive = <800>; + hfront-porch = <70>; + hsync-len = <2>; + hback-porch = <88>; + vfront-porch = <7>; + vsync-len = <4>; + vback-porch = <17>; + hsync-active = <21>; + vsync-active = <0>; + de-active = <0>; + pixelclk-active = <0>; + }; + }; + ports { + panel_in: endpoint { + remote-endpoint = <&edp_out>; + }; + }; + }; }; &combphy0_us { @@ -141,11 +264,11 @@ }; &csi2_dphy_hw { - status = "okay"; + status = "disabled"; }; &csi2_dphy0 { - status = "okay"; + status = "disabled"; ports { #address-cells = <1>; @@ -188,8 +311,12 @@ * video_phy0 needs to be enabled * when dsi0 is enabled */ +&video_phy0 { + status = "disabled"; +}; + &dsi0 { - status = "okay"; + status = "disabled"; }; &dsi0_in_vp0 { @@ -197,7 +324,7 @@ }; &dsi0_in_vp1 { - status = "okay"; + status = "disabled"; }; &dsi0_panel { @@ -208,6 +335,10 @@ * video_phy1 needs to be enabled * when dsi1 is enabled */ + +&video_phy1 { + status = "okay"; +}; &dsi1 { status = "disabled"; }; @@ -217,16 +348,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>; - status = "okay"; + force-hpd; + status = "okay"; + ports { + port@1 { + reg = <1>; + edp_out: endpoint { + remote-endpoint = <&panel_in>; + }; + }; + + }; }; &edp_phy { @@ -234,18 +389,67 @@ }; &edp_in_vp0 { - status = "okay"; + status = "disabled"; }; &edp_in_vp1 { + status = "okay"; + +}; + +&route_edp { + status = "okay"; + connect = <&vp1_out_edp>; +}; + +&route_edp { + status = "okay"; +}; +/* +* edp_end +*/ + +/* +* Hdmi_start +*/ + +&hdmi { + status = "okay"; + rockchip,phy-table = + <92812500 0x8009 0x0000 0x0270>, + <165000000 0x800b 0x0000 0x026d>, + <185625000 0x800b 0x0000 0x01ed>, + <297000000 0x800b 0x0000 0x01ad>, + <594000000 0x8029 0x0000 0x0088>, + <000000000 0x0000 0x0000 0x0000>; +}; + +&route_hdmi { + status = "okay"; + connect = <&vp0_out_hdmi>; +}; + +&hdmi_in_vp0 { + status = "okay"; +}; + +&hdmi_in_vp1 { status = "disabled"; }; + +&hdmi_sound { + status = "okay"; +}; + +/* + * Hdmi_END +*/ &gmac0 { 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>; @@ -265,7 +469,9 @@ rx_delay = <0x2f>; phy-handle = <&rgmii_phy0>; + status = "disabled"; + }; &gmac1 { @@ -299,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"; @@ -317,13 +521,10 @@ compatible = "nk_mcu"; reg = <0x15>; }; - - - }; &i2c4 { - status = "okay"; + status = "disabled"; gc8034: gc8034@37 { compatible = "galaxycore,gc8034"; status = "okay"; @@ -335,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"; @@ -369,7 +569,7 @@ }; }; ov5695: ov5695@36 { - status = "okay"; + status = "disabled"; compatible = "ovti,ov5695"; reg = <0x36>; clocks = <&cru CLK_CIF_OUT>; @@ -392,6 +592,19 @@ }; }; +&i2c5 { + status = "okay"; + + hym8563: hym8563@51 { + compatible = "haoyu,hym8563"; + reg = <0x51>; + #clock-cells = <0>; + clock-frequency = <32768>; + clock-output-names = "xin32k"; + /* rtc_int is not connected */ + }; +}; + &mdio0 { rgmii_phy0: phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; @@ -406,20 +619,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"; }; @@ -434,7 +641,8 @@ // }; headphone { hp_det: hp-det { - rockchip,pins = <3 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; + rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>, + <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>; }; }; @@ -449,23 +657,50 @@ rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>; }; }; + + lcd1 { + lcd1_rst_gpio: lcd1-rst-gpio { + rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>; + }; + }; + nk_io_init{ nk_io_gpio: nk-io-gpio{ - rockchip,pins = <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_up>; + rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PB7 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, + <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>, + <4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>, + <0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>, + <1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>, + <3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>, + <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>, + <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 + <3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3 + <0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>; }; }; }; &rkisp { - status = "okay"; + status = "disabled"; }; &rkisp_mmu { - status = "okay"; + status = "disabled"; }; &rkisp_vir0 { - status = "okay"; + status = "disabled"; port { #address-cells = <1>; @@ -478,15 +713,7 @@ }; }; -&route_dsi0 { - status = "okay"; - connect = <&vp1_out_dsi0>; -}; -&route_edp { - status = "okay"; - connect = <&vp0_out_edp>; -}; &sata2 { status = "okay"; @@ -525,12 +752,12 @@ }; &vcc3v3_lcd0_n { - gpio = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; + gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; enable-active-high; }; &vcc3v3_lcd1_n { - gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>; + gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3 enable-active-high; }; @@ -546,20 +773,25 @@ clock-names = "ext_clock"; //wifi-bt-power-toggle; uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>; - BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; pinctrl-names = "default", "rts_gpio"; pinctrl-0 = <&uart1m0_rtsn>; pinctrl-1 = <&uart1_gpios>; - BT,reset_gpio = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>; - status = "disabled"; + BT,reset_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>; + BT,wake_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; + BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; + status = "okay"; }; &uart0 { status = "okay"; }; +&uart1 { + pinctrl-names = "default"; + pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>; + status = "okay"; +}; + &uart3 { status = "okay"; pinctrl-0 = <&uart3m1_xfer>; -- Gitblit v1.6.2