diff --git a/rk3588/.dr4-rk3588.dtb.cmd b/rk3588/.dr4-rk3588.dtb.cmd index fc337e9..707810f 100644 --- a/rk3588/.dr4-rk3588.dtb.cmd +++ b/rk3588/.dr4-rk3588.dtb.cmd @@ -33,26 +33,12 @@ deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb := \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rd-rk3588-lcd-gpio.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie3.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-5g.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-audio-rt5640.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-wifi-bt-ap6275p-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dcphy1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb) diff --git a/rk3588/.dr4-rk3588.dtb.d.pre.tmp b/rk3588/.dr4-rk3588.dtb.d.pre.tmp index 3918e91..84dedc8 100644 --- a/rk3588/.dr4-rk3588.dtb.d.pre.tmp +++ b/rk3588/.dr4-rk3588.dtb.d.pre.tmp @@ -29,23 +29,9 @@ dr4-rk3588.o: arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-rk806-single.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-tp-i2c6-gt911.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rd-rk3588-lcd-gpio.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.dtsi \ + arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie3.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-5g.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-audio-rt5640.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-wifi-bt-ap6275p-rk3588.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dcphy1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi \ - arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi + arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index bafcdcc..51b3da0 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -14531,83 +14531,8 @@ }; }; # 6 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rd-rk3588-lcd-gpio.dtsi" 1 -/ { - vcc3v3_lcd_n: vcc3v3-lcd0-n { - gpio = <&gpio4 18 0>; - }; - - backlight_mipi: backlight { - pwms = <&pwm1 0 25000 0>; - }; - - backlight_edp: backlight-edp { - pwms = <&pwm0 0 25000 0>; - }; - - backlight_lvds: backlight-lvds { - pwms = <&pwm0 0 25000 0>; - }; - -}; - - -&pwm0 { - status = "okay"; - pinctrl-0 = <&pwm0m1_pins>; -}; - -&pwm1 { - status = "okay"; - pinctrl-0 = <&pwm1m1_pins>; -}; - -&dsi0 { - status = "disabled"; - dsi0_panel: panel@0 { - status = "disabled"; - reset-gpios = <&gpio4 22 1>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_rst_gpio>; - }; -}; - -&dsi1 { - status = "disabled"; - dsi1_panel: panel@0 { - status = "disabled"; - enable-gpios = <&gpio3 22 1>; - reset-gpios = <&gpio4 22 1>; - pinctrl-names = "default"; - pinctrl-0 = <&lcd_rst_gpio>; - }; -}; - - -&pinctrl { - lcd { - lcd_rst_gpio: lcd-rst-gpio { - rockchip,pins = <4 22 0 &pcfg_pull_none>; - }; - }; - - goodix { - goodix_irq: goodix-irq { - rockchip,pins = <3 24 0 &pcfg_pull_up>; - }; - }; -}; - -&goodix_ts { - goodix_rst_gpio = <&gpio0 22 0>; - goodix_irq_gpio = <&gpio3 24 8>; - pinctrl-names = "default"; - pinctrl-0 = <&goodix_irq>; -}; -# 7 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - # 1 "arch/arm64/boot/dts/rockchip/rk3588/rpdzkj_config.dtsi" 1 / { @@ -14632,145 +14557,7 @@ # 9 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi" 1 -/ { - vbus5v0_typec: vbus5v0-typec { - compatible = "regulator-fixed"; - regulator-name = "vbus5v0_typec"; - regulator-min-microvolt = <5000000>; - regulator-max-microvolt = <5000000>; - enable-active-high; - gpio = <&gpio1 2 0>; - vin-supply = <&vcc5v0_usb>; - pinctrl-names = "default"; - pinctrl-0 = <&typec5v_pwren>; - }; -}; - - - -&i2c4 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c4m1_xfer>; - - usbc0: fusb302@22 { - compatible = "fcs,fusb302"; - reg = <0x22>; - interrupt-parent = <&gpio0>; - interrupts = <27 8>; - pinctrl-names = "default"; - pinctrl-0 = <&usbc0_int>; - vbus-supply = <&vbus5v0_typec>; - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usbc0_role_sw: endpoint@0 { - remote-endpoint = <&dwc3_0_role_switch>; - }; - }; - }; - - usb_con: connector { - compatible = "usb-c-connector"; - label = "USB-C"; - data-role = "dual"; - power-role = "dual"; - try-power-role = "sink"; - op-sink-microwatt = <1000000>; - sink-pdos = - <(((0) << 30) | ((1 << 26)) | ((((5000) / 50) & 0x3ff) << 10) | ((((1000) / 10) & 0x3ff) << 0))>; - source-pdos = - <(((0) << 30) | ((1 << 26)) | ((((5000) / 50) & 0x3ff) << 10) | ((((3000) / 10) & 0x3ff) << 0))>; - - altmodes { - #address-cells = <1>; - #size-cells = <0>; - - altmode@0 { - reg = <0>; - svid = <0xff01>; - vdo = <0xffffffff>; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - usbc0_orien_sw: endpoint { - remote-endpoint = <&usbdp_phy0_orientation_switch>; - }; - }; - - port@1 { - reg = <1>; - dp_altmode_mux: endpoint { - remote-endpoint = <&usbdp_phy0_dp_altmode_mux>; - }; - }; - }; - }; - }; -}; - - -&usbdp_phy0 { - orientation-switch; - svid = <0xff01>; - sbu1-dc-gpios = <&gpio3 28 0>; - sbu2-dc-gpios = <&gpio3 29 0>; - - port { - #address-cells = <1>; - #size-cells = <0>; - usbdp_phy0_orientation_switch: endpoint@0 { - reg = <0>; - remote-endpoint = <&usbc0_orien_sw>; - }; - - usbdp_phy0_dp_altmode_mux: endpoint@1 { - reg = <1>; - remote-endpoint = <&dp_altmode_mux>; - }; - }; -}; - - -&usbdrd_dwc3_0 { - dr_mode = "otg"; - usb-role-switch; - port { - #address-cells = <1>; - #size-cells = <0>; - dwc3_0_role_switch: endpoint@0 { - reg = <0>; - remote-endpoint = <&usbc0_role_sw>; - }; - }; -}; - -&pinctrl { - usb-typec { - usbc0_int: usbc0-int { - rockchip,pins = <0 27 0 &pcfg_pull_up>; - }; - - typec5v_pwren: typec5v-pwren { - rockchip,pins = <1 2 0 &pcfg_pull_none>; - }; - - }; -}; -# 12 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi" 1 &u2phy2 { @@ -14817,23 +14604,47 @@ }; &usbhost_dwc3_0 { - status = "disabled"; + status = "okay"; }; # 13 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.dtsi" 1 -&combphy0_ps { - status = "okay"; + +# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi" 1 + +&mdio0 { + rgmii_phy0: phy@1 { + compatible = "ethernet-phy-ieee802.3-c22"; + reg = <0x1>; + }; }; -&pcie2x1l2 { - phys = <&combphy0_ps 2>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - reset-gpios = <&gpio4 2 0>; +&gmac0 { + + phy-mode = "rgmii-rxid"; + clock_in_out = "input"; + + snps,reset-gpio = <&gpio2 20 1>; + snps,reset-active-low; + + snps,reset-delays-us = <0 20000 100000>; + + pinctrl-names = "default"; + pinctrl-0 = <&gmac0_miim + &gmac0_tx_bus2 + &gmac0_rx_bus2 + &gmac0_rgmii_clk + &gmac0_rgmii_bus + &gmac0_clkinout + ð0_pins>; + + tx_delay = <0x44>; + + + phy-handle = <&rgmii_phy0>; status = "okay"; }; -# 16 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 +# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.dtsi" 1 &mdio1 { @@ -14869,7 +14680,7 @@ phy-handle = <&rgmii_phy1>; status = "okay"; }; -# 17 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 +# 18 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-power-rk3588.dtsi" 1 @@ -14907,932 +14718,9 @@ }; -}; -# 20 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-pcie3.dtsi" 1 -/ { - - pcie30_avdd1v8: pcie30-avdd1v8 { - compatible = "regulator-fixed"; - regulator-name = "pcie30_avdd1v8"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - vin-supply = <&avcc_1v8_s0>; - }; - - pcie30_avdd0v75: pcie30-avdd0v75 { - compatible = "regulator-fixed"; - regulator-name = "pcie30_avdd0v75"; - regulator-boot-on; - regulator-always-on; - regulator-min-microvolt = <750000>; - regulator-max-microvolt = <750000>; - vin-supply = <&avdd_0v75_s0>; - }; -}; - -&pcie30phy { - status = "okay"; -}; - -&pcie3x4 { - reset-gpios = <&gpio4 14 0>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; }; # 21 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-pcie-5g.dtsi" 1 -/{ - vdd_5G: vdd-5G{ - compatible = "regulator-fixed"; - regulator-name = "vdd_5G"; - enable-active-high; - regulator-boot-on; - regulator-always-on; - gpios = <&gpio4 4 0>; - }; -}; - -&combphy2_psu { - status = "okay"; -}; - -&pcie2x1l1 { - phys = <&combphy2_psu 2>; - reset-gpios = <&gpio2 21 0>; - - modem-en-gpios = <&gpio2 14 0>; - pcie-waken-gpios = <&gpio3 21 0>; - - pinctrl-names = "default"; - pinctrl-0 = <&modem_wakup>,<&modem_rst>,<&modem_pwr>,<&modem_en>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; -}; - - -&pinctrl { - modem { - modem_pwr: modem-pwr { - rockchip,pins = <4 4 0 &pcfg_pull_up>; - }; - modem_en: modem-en { - rockchip,pins = <2 14 0 &pcfg_pull_up>; - }; - modem_rst: modem-rst { - rockchip,pins = <2 21 0 &pcfg_pull_up>; - }; - modem_wakup: modem-wakup { - rockchip,pins = <3 21 0 &pcfg_pull_up>; - }; - }; -}; -# 22 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-audio-rt5640.dtsi" 1 - -/ { - rt5640-sound { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "rockchip,rt5640-codec"; - simple-audio-card,mclk-fs = <256>; - simple-audio-card,widgets = - "Microphone", "Mic Jack", - "Headphone", "Headphone Jack"; - simple-audio-card,routing = - "Mic Jack", "MICBIAS1", - "IN1P", "Mic Jack", - "Headphone Jack", "HPOL", - "Headphone Jack", "HPOR"; - simple-audio-card,cpu { - sound-dai = <&i2s0_8ch>; - }; - simple-audio-card,codec { - sound-dai = <&rt5640>; - }; - }; - - rk_headset: rk-headset { - status = "okay"; - compatible = "rockchip_headset"; - headset_gpio = <&gpio1 20 0>; - pinctrl-names = "default"; - pinctrl-0 = <&hp_det>; - }; -}; - -&i2s0_8ch { - status = "okay"; -}; - -&i2c7 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c7m0_xfer>; - - rt5640: rt5640@1c { - #sound-dai-cells = <0>; - compatible = "realtek,rt5640"; - reg = <0x1c>; - clocks = <&mclkout_i2s0>; - clock-names = "mclk"; - realtek,in1-differential; - pinctrl-names = "default"; - pinctrl-0 = <&i2s0_mclk>; - io-channels = <&saradc 4>; - hp-det-adc-value = <500>; - - spk-play-volume = <7>; - hp-play-volume = <15>; - capture-volume = <127>; - - - - }; -}; - - -&pinctrl { - rt5640_pinctrl { - hp_det:hp_det { - rockchip,pins = <1 20 0 &pcfg_pull_none>; - }; - }; -}; -# 25 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-wifi-bt-ap6275p-rk3588.dtsi" 1 - -/ { - wireless_bluetooth: wireless-bluetooth { - compatible = "bluetooth-platdata"; - clocks = <&hym8563>; - clock-names = "ext_clock"; - uart_rts_gpios = <&gpio4 20 1>; - pinctrl-names = "default", "rts_gpio"; - pinctrl-0 = <&uart9m0_rtsn>, <&bt_gpio>; - pinctrl-1 = <&uart9_gpios>; - BT,reset_gpio = <&gpio0 0 0>; - BT,wake_gpio = <&gpio2 11 0>; - BT,wake_host_irq = <&gpio2 8 0>; - status = "okay"; - }; - - wireless_wlan: wireless-wlan { - compatible = "wlan-platdata"; - wifi_chip_type = "ap6275p"; - pinctrl-names = "default"; - pinctrl-0 = <&wifi_host_wake_irq>, <&wifi_poweren_gpio>; - WIFI,host_wake_irq = <&gpio0 8 0>; - WIFI,poweren_gpio = <&gpio0 10 0>; - status = "okay"; - }; -}; - -&combphy1_ps { - status = "okay"; -}; - -&pcie2x1l0 { - phys = <&combphy1_ps 2>; - reset-gpios = <&gpio1 12 0>; - vpcie3v3-supply = <&vcc3v3_pcie30>; - status = "okay"; -}; - -&uart9 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&uart9m0_xfer &uart9m0_ctsn>; -}; - - -&pinctrl { - wireless-bluetooth { - uart9_gpios: uart9-gpios { - rockchip,pins = <4 20 0 &pcfg_pull_none>; - }; - bt_gpio: bt-gpio { - rockchip,pins = - <0 0 0 &pcfg_pull_none>, - <2 11 0 &pcfg_pull_up>, - <2 8 0 &pcfg_pull_down>; - }; - }; - - wireless-wlan { - wifi_host_wake_irq: wifi-host-wake-irq { - rockchip,pins = <0 8 0 &pcfg_pull_down>; - }; - - wifi_poweren_gpio: wifi-poweren-gpio { - rockchip,pins = <0 10 0 &pcfg_pull_up>; - }; - }; -}; -# 28 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-hdmirx.dtsi" 1 - -/ { - - reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - - cma { - compatible = "shared-dma-pool"; - reusable; - reg = <0x0 (256 * 0x100000) 0x0 (128 * 0x100000)>; - linux,cma-default; - }; - }; - - hdmiin-sound { - compatible = "simple-audio-card"; - simple-audio-card,format = "i2s"; - simple-audio-card,name = "rockchip,hdmiin"; - simple-audio-card,bitclock-master = <&dailink0_master>; - simple-audio-card,frame-master = <&dailink0_master>; - status = "okay"; - simple-audio-card,cpu { - sound-dai = <&i2s7_8ch>; - }; - dailink0_master: simple-audio-card,codec { - sound-dai = <&hdmiin_dc>; - }; - }; - - hdmiin_dc: hdmiin-dc { - compatible = "rockchip,dummy-codec"; - #sound-dai-cells = <0>; - }; - -}; - -&i2s7_8ch { - status = "okay"; -}; - - -&hdmirx_ctrler { - status = "okay"; - - - hpd-trigger-level = <1>; - hdmirx-det-gpios = <&gpio1 29 1>; - pinctrl-0 = <&hdmim1_rx_cec &hdmim2_rx_hpdin &hdmim1_rx_scl &hdmim1_rx_sda>; - pinctrl-names = "default"; -}; -# 31 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - - - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dcphy1.dtsi" 1 - - -&i2c2 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c2m4_xfer>; - - dw9763_1: dw9763_1@c { - compatible = "dongwoon,dw9763"; - status = "okay"; - reg = <0x0c>; - rockchip,vcm-max-current = <120>; - rockchip,vcm-start-current = <20>; - rockchip,vcm-rated-current = <90>; - rockchip,vcm-step-mode = <3>; - rockchip,vcm-t-src = <0x20>; - rockchip,vcm-t-div = <1>; - rockchip,camera-module-index = <1>; - rockchip,camera-module-facing = "back"; - }; - - ov13855_1: ov13855_1@36 { - compatible = "ovti,ov13855"; - status = "okay"; - reg = <0x36>; - clocks = <&cru 257>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera2_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 8 0>; - rockchip,camera-module-index = <1>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "CMK-OT2016-FV1"; - rockchip,camera-module-lens-name = "default"; - lens-focus = <&dw9763_1>; - port { - ov13855_out1: endpoint { - remote-endpoint = <&mipi_in_ov13855_1>; - data-lanes = <1 2 3 4>; - }; - }; - }; - gc8034_1: gc8034_1@37 { - compatible = "galaxycore,gc8034"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 257>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera2_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 8 1>; - rockchip,camera-module-index = <1>; - rockchip,camera-module-facing = "front"; - rockchip,camera-module-name = "RK-CMK-8M-2-v1"; - rockchip,camera-module-lens-name = "CK8401-4"; - port { - gc8034_out1: endpoint { - remote-endpoint = <&mipi_in_gc8034_1>; - data-lanes = <1 2 3 4>; - }; - }; - }; - imx415_1: imx415_1@37 { - compatible = "sony,imx415"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 257>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera2_clk>; - rockchip,grf = <&sys_grf>; - power-gpios = <&gpio1 8 0>; - rockchip,camera-module-index = <1>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "CMK-OT2022-PX1"; - rockchip,camera-module-lens-name = "IR0147-50IRC-8M-F20"; - port { - imx415_out1: endpoint { - remote-endpoint = <&mipi_in_imx415_1>; - data-lanes = <1 2 3 4>; - }; - }; - }; -}; - - -&mipi_dcphy1 { - status = "okay"; -}; - -&csi2_dcphy1 { - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - mipi_in_ov13855_1: endpoint@1 { - reg = <1>; - remote-endpoint = <&ov13855_out1>; - data-lanes = <1 2 3 4>; - }; - mipi_in_gc8034_1: endpoint@2 { - reg = <2>; - remote-endpoint = <&gc8034_out1>; - data-lanes = <1 2 3 4>; - }; - mipi_in_imx415_1: endpoint@3 { - reg = <3>; - remote-endpoint = <&imx415_out1>; - data-lanes = <1 2 3 4>; - }; - }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - csidcphy1_out: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi1_csi2_input>; - }; - }; - }; -}; - -&mipi1_csi2 { - status = "okay"; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - - mipi1_csi2_input: endpoint@0 { - reg = <0>; - remote-endpoint = <&csidcphy1_out>; - }; - }; - - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - - mipi1_csi2_output: endpoint@1 { - reg = <1>; - remote-endpoint = <&cif_mipi_in1>; - }; - }; - }; -}; - -&rkcif_mipi_lvds1 { - status = "okay"; - - port { - cif_mipi_in1: endpoint { - remote-endpoint = <&mipi1_csi2_output>; - }; - }; -}; - -&rkcif_mipi_lvds1_sditf { - status = "okay"; - - port { - mipi_lvds1_sditf: endpoint { - remote-endpoint = <&isp0_vir1>; - }; - }; -}; - -&rkisp0 { - status = "okay"; -}; - -&isp0_mmu { - status = "okay"; -}; - -&rkisp0_vir1 { - status = "okay"; - port { - #address-cells = <1>; - #size-cells = <0>; - - isp0_vir1: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi_lvds1_sditf>; - }; - }; -}; -# 37 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy0.dtsi" 1 - - -&i2c3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c3m0_xfer>; - - dw9763_2: dw9763_2@c { - compatible = "dongwoon,dw9763"; - status = "okay"; - reg = <0x0c>; - rockchip,vcm-max-current = <120>; - rockchip,vcm-start-current = <20>; - rockchip,vcm-rated-current = <90>; - rockchip,vcm-step-mode = <3>; - rockchip,vcm-t-src = <0x20>; - rockchip,vcm-t-div = <1>; - rockchip,camera-module-index = <2>; - rockchip,camera-module-facing = "front"; - }; - - ov13855_2: ov13855_2@36 { - compatible = "ovti,ov13855"; - status = "okay"; - reg = <0x36>; - clocks = <&cru 258>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera3_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 9 0>; - rockchip,camera-module-index = <2>; - rockchip,camera-module-facing = "front"; - rockchip,camera-module-name = "CMK-OT2016-FV1"; - rockchip,camera-module-lens-name = "default"; - lens-focus = <&dw9763_2>; - port { - ov13855_out2: endpoint { - remote-endpoint = <&mipi_in_ov13855_2>; - data-lanes = <1 2 3 4>; - }; - }; - }; - gc8034_2: gc8034_2@37 { - compatible = "galaxycore,gc8034"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 258>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera3_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 9 1>; - rockchip,camera-module-index = <0>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "RK-CMK-8M-2-v1"; - rockchip,camera-module-lens-name = "CK8401-4"; - port { - gc8034_out2: endpoint { - remote-endpoint = <&mipi_in_gc8034_2>; - data-lanes = <1 2 3 4>; - }; - }; - }; - imx415_2: imx415_2@1a { - compatible = "sony,imx415"; - status = "okay"; - reg = <0x1a>; - clocks = <&cru 258>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera3_clk>; - rockchip,grf = <&sys_grf>; - power-gpios = <&gpio1 9 1>; - - rockchip,camera-module-index = <2>; - rockchip,camera-module-facing = "front"; - rockchip,camera-module-name = "CMK-OT2022-PX1"; - rockchip,camera-module-lens-name = "IR0147-50IRC-8M-F20"; - port { - imx415_out2: endpoint { - remote-endpoint = <&mipi_in_imx415_2>; - data-lanes = <1 2 3 4>; - }; - }; - }; -}; - -&csi2_dphy0_hw { - status = "okay"; -}; - -&csi2_dphy0 { - status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - mipi_in_ov13855_2: endpoint@1 { - reg = <1>; - remote-endpoint = <&ov13855_out2>; - data-lanes = <1 2 3 4>; - }; - mipi_in_gc8034_2: endpoint@2 { - reg = <2>; - remote-endpoint = <&gc8034_out2>; - data-lanes = <1 2 3 4>; - }; - mipi_in_imx415_2: endpoint@3 { - reg = <3>; - remote-endpoint = <&imx415_out2>; - data-lanes = <1 2 3 4>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - csidphy0_out: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi2_csi2_input>; - }; - }; - }; -}; - -&mipi2_csi2 { - status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - mipi2_csi2_input: endpoint@1 { - reg = <1>; - remote-endpoint = <&csidphy0_out>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - mipi2_csi2_output: endpoint@0 { - reg = <0>; - remote-endpoint = <&cif_mipi_in2>; - }; - }; - }; -}; - - -&rkcif_mipi_lvds2 { - status = "okay"; - port { - cif_mipi_in2: endpoint { - remote-endpoint = <&mipi2_csi2_output>; - }; - }; -}; - -&rkcif_mipi_lvds2_sditf { - status = "okay"; - port { - mipi2_lvds_sditf: endpoint { - remote-endpoint = <&isp1_vir0>; - }; - }; -}; - -&rkisp1 { - status = "okay"; -}; - -&isp1_mmu { - status = "okay"; -}; - -&rkisp1_vir0 { - status = "okay"; - port { - #address-cells = <1>; - #size-cells = <0>; - - isp1_vir0: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi2_lvds_sditf>; - }; - }; -}; -# 38 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-camera-dphy1.dtsi" 1 - - -&i2c3 { - status = "okay"; - pinctrl-names = "default"; - pinctrl-0 = <&i2c3m0_xfer>; - - dw9763_3: dw9763_3@c { - compatible = "dongwoon,dw9763"; - status = "okay"; - reg = <0x0c>; - rockchip,vcm-max-current = <120>; - rockchip,vcm-start-current = <20>; - rockchip,vcm-rated-current = <90>; - rockchip,vcm-step-mode = <3>; - rockchip,vcm-t-src = <0x20>; - rockchip,vcm-t-div = <1>; - rockchip,camera-module-index = <3>; - rockchip,camera-module-facing = "back"; - }; - - ov13855_3: ov13855_3@36 { - compatible = "ovti,ov13855"; - status = "okay"; - reg = <0x36>; - clocks = <&cru 259>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera4_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 10 0>; - rockchip,camera-module-index = <3>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "CMK-OT2016-FV1"; - rockchip,camera-module-lens-name = "default"; - lens-focus = <&dw9763_3>; - port { - ov13855_out3: endpoint { - remote-endpoint = <&mipi_in_ov13855_3>; - data-lanes = <1 2 3 4>; - }; - }; - }; - gc8034_3: gc8034_3@37 { - compatible = "galaxycore,gc8034"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 259>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera4_clk>; - rockchip,grf = <&sys_grf>; - pwdn-gpios = <&gpio1 10 1>; - rockchip,camera-module-index = <3>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "RK-CMK-8M-2-v1"; - rockchip,camera-module-lens-name = "CK8401-4"; - port { - gc8034_out3: endpoint { - remote-endpoint = <&mipi_in_gc8034_3>; - data-lanes = <1 2 3 4>; - }; - }; - }; - imx415_3: imx415_3@37 { - compatible = "sony,imx415"; - status = "okay"; - reg = <0x37>; - clocks = <&cru 259>; - clock-names = "xvclk"; - power-domains = <&power 27>; - pinctrl-names = "default"; - pinctrl-0 = <&mipim0_camera4_clk>; - rockchip,grf = <&sys_grf>; - power-gpios = <&gpio1 10 0>; - rockchip,camera-module-index = <3>; - rockchip,camera-module-facing = "back"; - rockchip,camera-module-name = "CMK-OT2022-PX1"; - rockchip,camera-module-lens-name = "IR0147-50IRC-8M-F20"; - port { - imx415_out3: endpoint { - remote-endpoint = <&mipi_in_imx415_3>; - data-lanes = <1 2 3 4>; - }; - }; - }; -}; - - -&csi2_dphy1_hw { - status = "okay"; -}; - -&csi2_dphy3 { - status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - mipi_in_ov13855_3: endpoint@1 { - reg = <1>; - remote-endpoint = <&ov13855_out3>; - data-lanes = <1 2 3 4>; - }; - mipi_in_gc8034_3: endpoint@2 { - reg = <2>; - remote-endpoint = <&gc8034_out3>; - data-lanes = <1 2 3 4>; - }; - mipi_in_imx415_3: endpoint@3 { - reg = <3>; - remote-endpoint = <&imx415_out3>; - data-lanes = <1 2 3 4>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - csidphy1_out: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi4_csi2_input>; - }; - }; - }; -}; - -&mipi4_csi2 { - status = "okay"; - ports { - #address-cells = <1>; - #size-cells = <0>; - port@0 { - reg = <0>; - #address-cells = <1>; - #size-cells = <0>; - mipi4_csi2_input: endpoint@1 { - reg = <1>; - remote-endpoint = <&csidphy1_out>; - }; - }; - port@1 { - reg = <1>; - #address-cells = <1>; - #size-cells = <0>; - mipi4_csi2_output: endpoint@0 { - reg = <0>; - remote-endpoint = <&cif_mipi_in4>; - }; - }; - }; -}; - - -&rkcif_mipi_lvds4 { - status = "okay"; - port { - cif_mipi_in4: endpoint { - remote-endpoint = <&mipi4_csi2_output>; - }; - }; -}; - -&rkcif_mipi_lvds4_sditf { - status = "okay"; - port { - mipi4_lvds_sditf: endpoint { - remote-endpoint = <&isp1_vir1>; - }; - }; -}; - -&rkisp1 { - status = "okay"; -}; - -&isp1_mmu { - status = "okay"; -}; - -&rkisp1_vir1 { - status = "okay"; - port { - #address-cells = <1>; - #size-cells = <0>; - - isp1_vir1: endpoint@0 { - reg = <0>; - remote-endpoint = <&mipi4_lvds_sditf>; - }; - }; -}; -# 39 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 1 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi0.dtsi" 1 -&hdmi0 { - status = "okay"; -}; - -&hdmi0_in_vp0 { - status = "okay"; -}; - -&hdmi0_sound { - status = "okay"; -}; - -&i2s5_8ch { - status = "okay"; -}; - -&hdptxphy_hdmi0 { - status = "okay"; -}; - -&route_hdmi0 { - status = "okay"; - connect = <&vp0_out_hdmi0>; -}; -# 2 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 +# 64 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" # 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.dtsi" 1 &hdmi1 { status = "okay"; @@ -15862,253 +14750,8 @@ status = "okay"; connect = <&vp1_out_hdmi1>; }; -# 3 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-typec-dp0.dtsi" 1 -&dp0 { - status = "okay"; -}; - -&dp0_in_vp2 { - status = "okay"; -}; - -&dp0_sound{ - status = "okay"; -}; - -&spdif_tx2 { - status = "okay"; -}; -# 4 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 -# 66 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 - - -# 1 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi" 1 - -&backlight_mipi { - compatible = "pwm-backlight"; - - status = "okay"; - brightness-levels = < - 0 20 20 21 21 22 22 23 - 23 24 24 25 25 26 26 27 - 27 28 28 29 29 30 30 31 - 31 32 32 33 33 34 34 35 - 35 36 36 37 37 38 38 39 - 40 41 42 43 44 45 46 47 - 48 49 50 51 52 53 54 55 - 56 57 58 59 60 61 62 63 - 64 65 66 67 68 69 70 71 - 72 73 74 75 76 77 78 79 - 80 81 82 83 84 85 86 87 - 88 89 90 91 92 93 94 95 - 96 97 98 99 100 101 102 103 - 104 105 106 107 108 109 110 111 - 112 113 114 115 116 117 118 119 - 120 121 122 123 124 125 126 127 - 128 129 130 131 132 133 134 135 - 136 137 138 139 140 141 142 143 - 144 145 146 147 148 149 150 151 - 152 153 154 155 156 157 158 159 - 160 161 162 163 164 165 166 167 - 168 169 170 171 172 173 174 175 - 176 177 178 179 180 181 182 183 - 184 185 186 187 188 189 190 191 - 192 193 194 195 196 197 198 199 - 200 201 202 203 204 205 206 207 - 208 209 210 211 212 213 214 215 - 216 217 218 219 220 221 222 223 - 224 225 226 227 228 229 230 231 - 232 233 234 235 236 237 238 239 - 240 241 242 243 244 245 246 247 - 248 249 250 251 252 253 254 255 - >; - default-brightness-level = <200>; - }; - - -&vcc3v3_lcd_n { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3_lcd0_n"; - regulator-boot-on; - enable-active-high; - - vin-supply = <&vcc_1v8_s3>; -}; - - - - - -&dsi0 { - status = "okay"; - - dsi0_panel: panel@0 { - status = "okay"; - compatible = "simple-panel-dsi"; - reg = <0>; - - power-supply = <&vcc3v3_lcd_n>; - - - - - - backlight = <&backlight_mipi>; - init-delay-ms = <60>; - reset-delay-ms = <60>; - enable-delay-ms = <60>; - prepare-delay-ms = <60>; - unprepare-delay-ms = <60>; - disable-delay-ms = <60>; - dsi,flags = <((1 << 0) | (1 << 1) | - (1 << 11) | (1 << 9))>; - dsi,format = <0>; - dsi,lanes = <4>; - - panel-init-sequence = [ - 39 00 04 B9 F1 12 83 - - 39 00 1C BA 33 81 05 F9 0E 0E 20 00 00 00 00 00 00 00 44 25 00 91 0A 00 00 02 4F D1 00 00 37 - - 39 00 02 B8 26 - - 39 00 04 BF 02 10 00 - - 39 00 0B B3 07 0B 1E 1E 03 FF 00 00 00 00 - - 39 00 0A C0 73 73 50 50 00 00 08 70 00 - - 39 00 02 BC 46 - - 39 00 02 CC 0B - - 39 00 02 B4 80 - - 39 00 04 B2 C8 12 A0 - - 39 00 0F E3 07 07 0B 0B 03 0B 00 00 00 00 FF 80 C0 10 - - 39 00 0D C1 53 00 32 32 77 F1 FF FF CC CC 77 77 - - 39 00 03 B5 09 09 - - 39 00 03 B6 B7 B7 - - 39 00 40 E9 C2 10 0A 00 00 81 80 12 30 00 37 86 81 80 37 18 00 05 00 00 00 00 00 05 00 00 00 00 F8 BA 46 02 08 28 88 88 88 88 88 F8 BA 57 13 18 38 88 88 88 88 88 00 00 00 03 00 00 00 00 00 00 00 00 00 - - 39 00 3E EA 07 12 01 01 02 3C 00 00 00 00 00 00 8F BA 31 75 38 18 88 88 88 88 88 8F BA 20 64 28 08 88 88 88 88 88 23 10 00 00 04 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 - - 39 00 23 E0 00 02 04 1A 23 3F 2C 28 05 09 0B 10 11 10 12 12 19 00 02 04 1A 23 3F 2C 28 05 09 0B 10 11 10 12 12 19 - - 05 ff 01 11 - - 05 32 01 29 - ]; - - panel-exit-sequence = [ - 05 78 01 28 - 05 78 01 10 - ]; - - disp_timings0: display-timings { - native-mode = <&dsi0_timing0>; - dsi0_timing0: timing0 { - clock-frequency = <60000000>; - hactive = <720>; - vactive = <1280>; - hback-porch = <40>; - hfront-porch = <40>; - vback-porch = <11>; - vfront-porch = <16>; - hsync-len = <10>; - vsync-len = <3>; - 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_dsi: endpoint { - remote-endpoint = <&dsi_out_panel>; - }; - }; - }; - }; - - ports { - #address-cells = <1>; - #size-cells = <0>; - - port@1 { - reg = <1>; - dsi_out_panel: endpoint { - remote-endpoint = <&panel_in_dsi>; - }; - }; - }; - -}; - - -&dsi0_in_vp2 { - status = "disabled"; -}; - -&dsi0_in_vp3 { - status = "okay"; -}; - -&mipi_dcphy0 { - status = "okay"; -}; - -&route_dsi0 { - status = "okay"; - connect = <&vp3_out_dsi0>; -}; - - -&goodix_ts { - gtp_resolution_x = <720>; - gtp_resolution_y = <1280>; - gtp_int_tarigger = <1>; - gtp_change_x2y = <0>; - gtp_overturn_x = <0>; - gtp_overturn_y = <0>; - gtp_send_cfg = <1>; - gtp_touch_back = <1>; - gtp_touch_wakeup = <1>; - - goodix,cfg-group0 = [ - 4D D0 02 00 05 05 35 00 01 08 32 - 08 5A 3C 03 05 00 00 00 00 00 00 - 00 18 1A 1E 14 89 29 0A 55 57 B5 - 06 00 00 00 41 22 10 00 01 00 0F - 00 2A 00 00 19 50 32 3C 78 94 D5 - 02 08 00 00 04 A2 40 00 8F 4A 00 - 80 55 00 73 61 00 67 70 00 67 00 - 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 - 00 00 00 00 00 00 00 00 00 00 00 - 00 00 02 04 06 08 0A 0C 0E 10 12 - 14 FF FF FF FF FF FF FF FF FF FF - FF FF FF FF FF FF FF FF FF FF 22 - 21 20 1F 1E 1D 1C 18 16 00 02 04 - 06 08 0A 0F 10 12 FF FF FF FF FF - FF FF FF FF FF FF FF FF FF FF FF - FF FF FF FF FF FF FF FF 8D 01 - ]; - }; -# 69 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 -# 89 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" +# 65 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" 2 +# 90 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" / { model = "dr4-rk3588"; @@ -16137,19 +14780,14 @@ thermal-zone = "soc-thermal"; threshold-temp = <60000>; running-time = <10000>; - status = "okay"; + status = "disabled"; }; rp_power{ status = "okay"; compatible = "rp_power"; rp_not_deep_sleep = <1>; -# 136 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" - led { - gpio_num = <&gpio4 6 0>; - gpio_function = <3>; - }; - +# 142 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" usb-host-power { gpio_num = <&gpio2 17 0>; gpio_function = <4>; @@ -16179,10 +14817,34 @@ pinctrl-0 = <&uart0m0_xfer>; }; +&uart1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart1m1_xfer>; +}; + +&uart3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart3m0_xfer>; +}; + +&uart4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart4m1_xfer>; +}; + +&uart5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart5m0_xfer>; +}; + &uart6 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart6m0_xfer>; + pinctrl-0 = <&uart6m2_xfer>; }; &uart7 { @@ -16197,10 +14859,16 @@ pinctrl-0 = <&uart8m0_xfer>; }; +&uart9 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart9m2_xfer>; +}; + &can0 { assigned-clocks = <&cru 112>; assigned-clock-rates = <200000000>; - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&can0m0_pins>; }; @@ -16208,13 +14876,13 @@ &can1 { assigned-clocks = <&cru 114>; assigned-clock-rates = <200000000>; - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&can1m1_pins>; }; &i2c4 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&i2c4m1_xfer>; diff --git a/rk3588/dr4-rk3588.dtb b/rk3588/dr4-rk3588.dtb index 73b0b0b..44609db 100644 Binary files a/rk3588/dr4-rk3588.dtb and b/rk3588/dr4-rk3588.dtb differ diff --git a/rk3588/dr4-rk3588.dts b/rk3588/dr4-rk3588.dts index a9c01d8..c79f0a8 100755 --- a/rk3588/dr4-rk3588.dts +++ b/rk3588/dr4-rk3588.dts @@ -3,39 +3,40 @@ #include "rp-rk3588-board.dtsi" #include "rp-tp-i2c6-gt911.dtsi" -#include "rd-rk3588-lcd-gpio.dtsi" +// #include "rd-rk3588-lcd-gpio.dtsi" #include "rpdzkj_config.dtsi" /* usb */ -#include "rp-usb-typec-rk3588.dtsi" +// #include "rp-usb-typea-rk3588.dtsi" #include "rp-usb-host.dtsi" /* ethernet */ -#include "rp-eth-pcie2gmac-rk3588.dtsi" +// #include "rp-eth-pcie2gmac-rk3588.dtsi" +#include "rp-eth-gmac0.dtsi" #include "rp-eth-gmac1.dtsi" /* pcie */ #include "rp-pcie-power-rk3588.dtsi" -#include "rp-pcie3.dtsi" //need comment when use board of make it youself,and remove the pcie function -#include "rp-pcie-5g.dtsi" +// #include "rp-pcie3.dtsi" //need comment when use board of make it youself,and remove the pcie function +// #include "rp-pcie-5g.dtsi" /* audio */ -#include "rp-audio-rt5640.dtsi" +// #include "rp-audio-rt5640.dtsi" /* wifi/bt */ -#include "rp-wifi-bt-ap6275p-rk3588.dtsi" +// #include "rp-wifi-bt-ap6275p-rk3588.dtsi" /* hdmi rx */ -#include "rp-hdmirx.dtsi" +// #include "rp-hdmirx.dtsi" /* camera */ /***********all camera config********/ //#include "rp-camera-dcphy0.dtsi" -#include "rp-camera-dcphy1.dtsi" -#include "rp-camera-dphy0.dtsi" -#include "rp-camera-dphy1.dtsi" +// #include "rp-camera-dcphy1.dtsi" +// #include "rp-camera-dphy0.dtsi" +// #include "rp-camera-dphy1.dtsi" //#include "rp-camera-dcphy0-ov13855.dtsi" //#include "rp-camera-dcphy1-ov13855.dtsi" @@ -59,13 +60,13 @@ //#include "rp-camera-dphy0-imx415.dtsi" /******************************************/ -//#include "rp-lcd-hdmi0.dtsi" //batch ignore -//#include "rp-lcd-hdmi1.dtsi" //batch ignore +// #include "rp-lcd-hdmi0.dtsi" //batch ignore +#include "rp-lcd-hdmi1.dtsi" //batch ignore //#include "rp-lcd-typec-dp0.dtsi" //usb edp0, must be enable rp-usb-typec.dtsi, batch ignore -#include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" +// #include "rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" /* lcd */ -#include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi" +// #include "rp-lcd-mipi0-5-720-1280-v2-boxTP.dtsi" //#include "rp-lcd-mipi0-7-720-1280.dtsi" //#include "rp-lcd-mipi0-8-800-1280-v3.dtsi" //#include "rp-lcd-mipi0-8-1200-1920.dtsi" @@ -114,7 +115,7 @@ thermal-zone = "soc-thermal"; threshold-temp = <60000>; //60C running-time = <10000>; //10s - status = "okay"; + status = "disabled"; }; rp_power{ @@ -133,10 +134,10 @@ // gpio_function = <4>; //}; - led { - gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; - gpio_function = <3>; - }; + // led { + // gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; + // gpio_function = <3>; + // }; usb-host-power { gpio_num = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; @@ -167,10 +168,34 @@ pinctrl-0 = <&uart0m0_xfer>; }; +&uart1 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart1m1_xfer>; +}; + +&uart3 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart3m0_xfer>; +}; + +&uart4 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart4m1_xfer>; +}; + +&uart5 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart5m0_xfer>; +}; + &uart6 { status = "okay"; pinctrl-names = "default"; - pinctrl-0 = <&uart6m0_xfer>; + pinctrl-0 = <&uart6m2_xfer>; }; &uart7 { @@ -185,10 +210,16 @@ pinctrl-0 = <&uart8m0_xfer>; }; +&uart9 { + status = "okay"; + pinctrl-names = "default"; + pinctrl-0 = <&uart9m2_xfer>; +}; + &can0 { assigned-clocks = <&cru CLK_CAN0>; assigned-clock-rates = <200000000>; - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&can0m0_pins>; }; @@ -196,13 +227,13 @@ &can1 { assigned-clocks = <&cru CLK_CAN1>; assigned-clock-rates = <200000000>; - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&can1m1_pins>; }; &i2c4 { - status = "okay"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&i2c4m1_xfer>; diff --git a/rk3588/rp-eth-gmac0.dtsi b/rk3588/rp-eth-gmac0.dtsi index 3622350..1ba1662 100755 --- a/rk3588/rp-eth-gmac0.dtsi +++ b/rk3588/rp-eth-gmac0.dtsi @@ -9,9 +9,9 @@ &gmac0 { // Use rgmii-rxid mode to disable rx delay inside Soc phy-mode = "rgmii-rxid"; - clock_in_out = "output"; + clock_in_out = "input"; - snps,reset-gpio = <&gpio4 RK_PB3 GPIO_ACTIVE_LOW>; + snps,reset-gpio = <&gpio2 RK_PC4 GPIO_ACTIVE_LOW>; snps,reset-active-low; // Reset time is 20ms, 100ms for rtl8211f snps,reset-delays-us = <0 20000 100000>; @@ -21,7 +21,9 @@ &gmac0_tx_bus2 &gmac0_rx_bus2 &gmac0_rgmii_clk - &gmac0_rgmii_bus>; + &gmac0_rgmii_bus + &gmac0_clkinout + ð0_pins>; tx_delay = <0x44>; // rx_delay = <0x4f>; diff --git a/rk3588/rp-usb-host.dtsi b/rk3588/rp-usb-host.dtsi index 5603215..f075fea 100755 --- a/rk3588/rp-usb-host.dtsi +++ b/rk3588/rp-usb-host.dtsi @@ -43,6 +43,6 @@ }; &usbhost_dwc3_0 { - status = "disabled"; + status = "okay"; };