diff --git a/rk356x/.dr4-rk3568.dtb.cmd b/rk356x/.dr4-rk3568.dtb.cmd index 4430bd9..53231e6 100644 --- a/rk356x/.dr4-rk3568.dtb.cmd +++ b/rk356x/.dr4-rk3568.dtb.cmd @@ -3,7 +3,7 @@ cmd_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := gcc -E -Wp,-MMD,arch/a source_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi \ + arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi \ scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h \ scripts/dtc/include-prefixes/dt-bindings/pwm/pwm.h \ scripts/dtc/include-prefixes/dt-bindings/pinctrl/rockchip.h \ diff --git a/rk356x/.dr4-rk3568.dtb.d.pre.tmp b/rk356x/.dr4-rk3568.dtb.d.pre.tmp index 6a61702..4ffa353 100644 --- a/rk356x/.dr4-rk3568.dtb.d.pre.tmp +++ b/rk356x/.dr4-rk3568.dtb.d.pre.tmp @@ -1,5 +1,5 @@ dr4-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts \ - arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi \ + arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi \ scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h \ scripts/dtc/include-prefixes/dt-bindings/pwm/pwm.h \ scripts/dtc/include-prefixes/dt-bindings/pinctrl/rockchip.h \ diff --git a/rk356x/.dr4-rk3568.dtb.dts.tmp b/rk356x/.dr4-rk3568.dtb.dts.tmp index 1c429f2..b241e04 100644 --- a/rk356x/.dr4-rk3568.dtb.dts.tmp +++ b/rk356x/.dr4-rk3568.dtb.dts.tmp @@ -1,6 +1,6 @@ -# 0 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" -# 0 "" -# 0 "" +# 1 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 1 "" +# 1 "" # 1 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" @@ -12,7 +12,7 @@ -# 1 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 1 +# 1 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 1 @@ -20,17 +20,17 @@ # 1 "./scripts/dtc/include-prefixes/dt-bindings/gpio/gpio.h" 1 -# 8 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 8 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 # 1 "./scripts/dtc/include-prefixes/dt-bindings/pwm/pwm.h" 1 -# 9 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 9 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 # 1 "./scripts/dtc/include-prefixes/dt-bindings/pinctrl/rockchip.h" 1 -# 10 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 10 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 # 1 "./scripts/dtc/include-prefixes/dt-bindings/input/rk-input.h" 1 -# 11 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 11 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 # 1 "./scripts/dtc/include-prefixes/dt-bindings/display/drm_mipi_dsi.h" 1 -# 12 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 12 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 # 1 "./scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h" 1 -# 13 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 13 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 @@ -7849,57 +7849,38 @@ }; }; }; -# 3873 "arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi" 2 -# 18 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" 2 +# 3872 "arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi" 2 +# 18 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" 2 / { - rpdzkj:rpdzkj_config { - compatible = "rp_config"; - user_version = "rpdzkj"; - system_rotate = "0"; - csi_camera_rotate = "0"; - csi_camera_facing = "0"; - usb_camera_rotate = "0"; - usb_camera_facing = "0"; - lcd_density = "160"; - language = "zh-CN"; - time_zone = "Asia/Shanghai"; - not_navigation_bar = "false"; - not_status_bar = "false"; - default_launcher = "true"; - has_root = "true"; - usb_not_permission = "true"; - gps_use = "false"; - gps_serial_port = "/dev/ttyS4"; - primary_device = "DSI"; - extend_device = "HDMI-A"; - extend_rotate = "0"; - rotation_efull = "false"; - extend_rotate_2 = "0"; - rotation_efull_2 = "true"; - extend_rotate_3 = "0"; - rotation_efull_3 = "true"; - home_apk = "null"; - status = "okay"; - }; + rpdzkj:rpdzkj_config { + compatible = "rp_config"; + user_version = "rpdzkj"; + system_rotate = "0"; + csi_camera_rotate = "0"; + csi_camera_facing = "0"; + usb_camera_rotate = "0"; + usb_camera_facing = "0"; + lcd_density = "160"; + language = "zh-CN"; + time_zone = "Asia/Shanghai"; + not_navigation_bar = "false"; + not_status_bar = "false"; + default_launcher = "true"; + has_root = "true"; + usb_not_permission = "true"; + gps_use = "false"; + gps_serial_port = "/dev/ttyS4"; + primary_device = "DSI"; + extend_device = "HDMI-A"; + extend_rotate = "0"; + rotation_efull = "false"; + home_apk = "null"; + status = "okay"; + }; - vdd_cpu: vdd-cpu { - compatible = "pwm-regulator"; - pwms = <&pwm0 0 5000 1>; - regulator-name = "vdd_cpu"; - regulator-min-microvolt = <675000>; - regulator-max-microvolt = <1250000>; - regulator-init-microvolt = <1000000>; - regulator-ramp-delay = <6001>; - regulator-always-on; - regulator-boot-on; - regulator-settling-time-up-us = <250>; - pwm-supply = <&vcc5v0_sys>; - status = "okay"; - }; - edp_panel:panel { status = "disabled"; }; @@ -7957,7 +7938,7 @@ sound-dai = <&hdmi>; }; }; - +# 115 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" pdmics: dummy-codec { status = "disabled"; compatible = "rockchip,dummy-codec"; @@ -8034,8 +8015,7 @@ regulator-max-microvolt = <5000000>; vin-supply = <&dc_12v>; }; - - +# 256 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" vcc3v3_lcd0_n: vcc3v3-lcd0-n { compatible = "regulator-fixed"; regulator-name = "vcc3v3_lcd0_n"; @@ -8065,20 +8045,7 @@ regulator-off-in-suspend; }; }; - - - vcc2v5_sys: vcc2v5-ddr { - compatible = "regulator-fixed"; - regulator-name = "vcc2v5-sys"; - regulator-always-on; - regulator-boot-on; - regulator-min-microvolt = <2500000>; - regulator-max-microvolt = <2500000>; - vin-supply = <&vcc3v3_sys>; - }; - - - +# 299 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" sdio_pwrseq: sdio-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rk809 1>; @@ -8108,13 +8075,13 @@ clocks = <&rk809 1>; clock-names = "ext_clock"; - uart_rts_gpios = <&gpio2 9 1>; - pinctrl-names = "default", "rts_gpio"; - pinctrl-0 = <&uart8m0_rtsn>; - pinctrl-1 = <&uart8_gpios>; - BT,reset_gpio = <&gpio3 0 0>; - BT,wake_gpio = <&gpio3 1 0>; - BT,wake_host_irq = <&gpio3 2 0>; + uart_rts_gpios = <&gpio4 14 1>; + pinctrl-names = "default", "rts_gpio"; + pinctrl-0 = <&uart1m1_rtsn>; + pinctrl-1 = <&uart1_gpios>; + BT,reset_gpio = <&gpio4 5 0>; + BT,wake_gpio = <&gpio4 6 0>; + BT,wake_host_irq = <&gpio4 9 0>; status = "okay"; }; @@ -8129,11 +8096,6 @@ status = "okay"; }; -&pwm0 { - status = "okay"; - pinctrl-names = "active"; -}; - &cpu0 { cpu-supply = <&vdd_cpu>; }; @@ -8155,7 +8117,7 @@ &i2c0 { - status = "okay"; + status = "disabled"; rk809: pmic@20 { compatible = "rockchip,rk809"; reg = <0x20>; @@ -8413,16 +8375,37 @@ assigned-clock-parents = <&cru 72>, <&cru 72>; pinctrl-names = "default"; pinctrl-0 = <&i2s1m0_mclk>; - hp-volume = <3>; - spk-volume = <30>; + hp-volume = <50>; + spk-volume = <50>; capture_volume = <255>; - adc-for-loopback; status = "okay"; }; }; }; + +&i2c0 { + status = "okay"; + vdd_cpu: tcs4525@1c { + compatible = "tcs,tcs452x"; + reg = <0x1c>; + vin-supply = <&vcc5v0_sys>; + regulator-compatible = "fan53555-reg"; + regulator-name = "vdd_cpu"; + regulator-min-microvolt = <712500>; + regulator-max-microvolt = <1390000>; + regulator-init-microvolt = <1000000>; + regulator-ramp-delay = <2300>; + fcs,suspend-voltage-selector = <1>; + regulator-boot-on; + regulator-always-on; + regulator-state-mem { + regulator-off-in-suspend; + }; + }; +}; + &i2s0_8ch { status = "okay"; }; @@ -8499,23 +8482,22 @@ rockchip,pins = <3 29 0 &pcfg_pull_none>; }; }; -# 679 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" +# 746 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" wireless-bluetooth { - uart8_gpios: uart8-gpios { - rockchip,pins = <2 9 0 &pcfg_pull_none>; + uart1_gpios: uart1-gpios { + rockchip,pins = <4 14 0 &pcfg_pull_none>; }; }; - }; -# 703 "arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.dtsi" +# 769 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" &pmu_io_domains { status = "okay"; - pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; - vccio4-supply = <&vcc_3v3>; + pmuio2-supply = <&vcc_3v3>; + vccio1-supply = <&vcc_3v3>; + vccio3-supply = <&vcc_3v3>; + vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; - vccio6-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_1v8>; vccio7-supply = <&vcc_3v3>; }; @@ -8719,10 +8701,37 @@ dsi1_panel: panel@0 { }; -&combphy0_us { - status = "okay"; +&audiopwmout_diff { + status = "disabled"; }; +&dig_acodec { + status = "disabled"; + rockchip,pwm-output-mode; + pinctrl-names = "default"; + pinctrl-0 = <&audiopwm_loutp + &audiopwm_loutn + &audiopwm_routp + &audiopwm_routn + >; +}; +&pdm { + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&pdmm1_clk1 + &pdmm1_sdi1 + &pdmm1_sdi2 + &pdmm1_sdi3>; +}; + +&pdmics { + status = "disabled"; +}; + +&pdm_mic_array { + status = "disabled"; +}; +# 1019 "arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" &combphy1_usq { status = "okay"; }; @@ -8736,7 +8745,6 @@ dsi1_panel: panel@0 { /delete-node/ &xin32k; # 12 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 - # 1 "arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi" 1 @@ -8808,7 +8816,7 @@ dsi1_panel: panel@0 { &vop { disable-win-move; }; -# 14 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 +# 13 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi" 1 @@ -8915,8 +8923,8 @@ dsi1_panel: panel@0 { }; }; }; -# 17 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 -# 25 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 16 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 +# 24 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi" 1 &gmac1 { @@ -8955,7 +8963,7 @@ dsi1_panel: panel@0 { clocks = <&cru 198>; }; }; -# 26 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 +# 25 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 # 1 "arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi" 1 &gmac0 { @@ -8994,8 +9002,8 @@ dsi1_panel: panel@0 { clocks = <&cru 183>; }; }; -# 27 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 -# 79 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 26 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" 2 +# 78 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" /{ model = "dr4-rk3568"; compatible = "rpdzkj,dr4-rk3568", "rockchip,rk3568"; @@ -9016,7 +9024,7 @@ dsi1_panel: panel@0 { pinctrl-name = "default"; pinctrl-0 = <&rp_power>; -# 113 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 112 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" led { gpio_num = <&gpio0 30 0>; gpio_function = <3>; @@ -9079,7 +9087,7 @@ dsi1_panel: panel@0 { rp_gpio{ status = "disabled"; compatible = "rp_gpio"; -# 183 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 182 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" gpio0a0 { gpio_num = <&gpio0 0 1>; gpio_function = <0>; @@ -9256,7 +9264,7 @@ dsi1_panel: panel@0 { status = "disabled"; }; -# 418 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 417 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" &rk_headset { pinctrl-0 = <&hp_det>; headset_gpio = <&gpio2 27 0>; @@ -9305,7 +9313,7 @@ dsi1_panel: panel@0 { BT,wake_host_irq = <&gpio0 28 0>; status = "disabled"; }; -# 516 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 515 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" &pinctrl { rp_pins { rp_power: rp-power { @@ -9345,7 +9353,7 @@ dsi1_panel: panel@0 { <3 2 0 &pcfg_pull_none>; }; }; -# 570 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" +# 569 "arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts" }; diff --git a/rk356x/dr4-rk3568.dtb b/rk356x/dr4-rk3568.dtb index 19be78d..53e4990 100644 Binary files a/rk356x/dr4-rk3568.dtb and b/rk356x/dr4-rk3568.dtb differ diff --git a/rk356x/dr4-rk3568.dts b/rk356x/dr4-rk3568.dts index 6a8eb8d..e626f74 100755 --- a/rk356x/dr4-rk3568.dts +++ b/rk356x/dr4-rk3568.dts @@ -8,8 +8,7 @@ //rk3568-evb1-ddr4-v10 //#include "rk3568-evb1-ddr4-v10.dtsi" -#include "rk3568-evb-rpdzkj-rk809-pwm.dtsi" - +#include "rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" #include "../rk3568-linux.dtsi" /*************************camera***********************/ diff --git a/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi b/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi index c5df879..7ecab47 100755 --- a/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi +++ b/rk356x/rk3566-evb-rpdzkj-rk809-tcs4525.dtsi @@ -14,7 +14,7 @@ #include -#include "../rk3566.dtsi" +#include "../rk3568.dtsi" / { @@ -188,6 +188,7 @@ regulator-max-microvolt = <5000000>; vin-supply = <&dc_12v>; }; + /* vcc5v0_usb: vcc5v0-usb { compatible = "regulator-fixed"; @@ -366,7 +367,7 @@ &i2c0 { - status = "okay"; + status = "disabled"; rk809: pmic@20 { compatible = "rockchip,rk809"; reg = <0x20>; @@ -767,12 +768,12 @@ */ &pmu_io_domains { status = "okay"; - pmuio2-supply = <&vcc3v3_pmu>; - vccio1-supply = <&vccio_acodec>; - vccio3-supply = <&vccio_sd>; - vccio4-supply = <&vcc_3v3>; + pmuio2-supply = <&vcc_3v3>; + vccio1-supply = <&vcc_3v3>; + vccio3-supply = <&vcc_3v3>; + vccio4-supply = <&vcc_1v8>; vccio5-supply = <&vcc_3v3>; - vccio6-supply = <&vcc_3v3>; + vccio6-supply = <&vcc_1v8>; vccio7-supply = <&vcc_3v3>; }; diff --git a/rk3588/.dr4-rk3588.dtb.dts.tmp b/rk3588/.dr4-rk3588.dtb.dts.tmp index bafcdcc..2ffc95d 100644 --- a/rk3588/.dr4-rk3588.dtb.dts.tmp +++ b/rk3588/.dr4-rk3588.dtb.dts.tmp @@ -1,6 +1,6 @@ -# 0 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" -# 0 "" -# 0 "" +# 1 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" +# 1 "" +# 1 "" # 1 "arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dts" @@ -10674,7 +10674,7 @@ }; }; }; -# 6888 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588s.dtsi" 2 +# 6887 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588s.dtsi" 2 # 8 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588.dtsi" 2 # 1 "arch/arm64/boot/dts/rockchip/rk3588/../rk3588-vccio3-pinctrl.dtsi" 1 @@ -15879,7 +15879,7 @@ &spdif_tx2 { status = "okay"; }; -# 4 "arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-multi-hdmi0-hdmi1-dp0.dtsi" 2 +# 3 "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