修改RK3568设备树,以适配硬件板卡

This commit is contained in:
zhangpeng 2025-05-12 14:54:18 +08:00
parent 7c93b66e4d
commit 22d5a79ee6
13 changed files with 20054 additions and 27 deletions

View File

@ -0,0 +1,41 @@
cmd_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb := gcc -E -Wp,-MMD,arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.d.pre.tmp -nostdinc -I./scripts/dtc/include-prefixes -undef -D__DTS__ -x assembler-with-cpp -o arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.dts.tmp arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dts ; ./scripts/dtc/dtc -O dtb -o arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb -b 0 -iarch/arm64/boot/dts/rockchip/rk356x/ -i./scripts/dtc/include-prefixes -Wno-interrupt_provider -@ -Wno-unit_address_vs_reg -Wno-unit_address_format -Wno-avoid_unnecessary_addr_size -Wno-alias_paths -Wno-graph_child_address -Wno-simple_bus_reg -Wno-unique_unit_address -Wno-pci_device_reg -d arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.d.dtc.tmp arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.dts.tmp ; cat arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.d.pre.tmp arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.d.dtc.tmp > arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.d
source_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb := arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dts
deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb := \
arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-syr837.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 \
scripts/dtc/include-prefixes/dt-bindings/input/rk-input.h \
scripts/dtc/include-prefixes/dt-bindings/display/drm_mipi_dsi.h \
scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rk3568-cru.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/arm-gic.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/irq.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip,boot-mode.h \
scripts/dtc/include-prefixes/dt-bindings/phy/phy.h \
scripts/dtc/include-prefixes/dt-bindings/power/rk3568-power.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip-system-status.h \
scripts/dtc/include-prefixes/dt-bindings/suspend/rockchip-rk3568.h \
scripts/dtc/include-prefixes/dt-bindings/thermal/thermal.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-dram-default-timing.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rockchip-ddr.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rk3568-dram.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rockchip-dram.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-mipi-camera-gc2093-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m0-pro-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-mipi0-7-720-1280.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-hdmi.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb)
$(deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb):

View File

@ -0,0 +1 @@
arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dtb: arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3566.dtb.dts.tmp

View File

@ -0,0 +1,33 @@
dr4-rk3566.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3566.dts \
arch/arm64/boot/dts/rockchip/rk356x/rk3566-evb-rpdzkj-rk809-syr837.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 \
scripts/dtc/include-prefixes/dt-bindings/input/rk-input.h \
scripts/dtc/include-prefixes/dt-bindings/display/drm_mipi_dsi.h \
scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rk3568-cru.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/arm-gic.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/irq.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip,boot-mode.h \
scripts/dtc/include-prefixes/dt-bindings/phy/phy.h \
scripts/dtc/include-prefixes/dt-bindings/power/rk3568-power.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip-system-status.h \
scripts/dtc/include-prefixes/dt-bindings/suspend/rockchip-rk3568.h \
scripts/dtc/include-prefixes/dt-bindings/thermal/thermal.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-dram-default-timing.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rockchip-ddr.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rk3568-dram.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rockchip-dram.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-mipi-camera-gc2093-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m0-pro-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3566.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-mipi0-7-720-1280.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-hdmi.dtsi

10011
rk356x/.dr4-rk3566.dtb.dts.tmp Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,44 @@
cmd_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb := gcc -E -Wp,-MMD,arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.d.pre.tmp -nostdinc -I./scripts/dtc/include-prefixes -undef -D__DTS__ -x assembler-with-cpp -o arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.dts.tmp arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts ; ./scripts/dtc/dtc -O dtb -o arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb -b 0 -iarch/arm64/boot/dts/rockchip/rk356x/ -i./scripts/dtc/include-prefixes -Wno-interrupt_provider -@ -Wno-unit_address_vs_reg -Wno-unit_address_format -Wno-avoid_unnecessary_addr_size -Wno-alias_paths -Wno-graph_child_address -Wno-simple_bus_reg -Wno-unique_unit_address -Wno-pci_device_reg -d arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.d.dtc.tmp arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.dts.tmp ; cat arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.d.pre.tmp arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.d.dtc.tmp > arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.d
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 \
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 \
scripts/dtc/include-prefixes/dt-bindings/input/rk-input.h \
scripts/dtc/include-prefixes/dt-bindings/display/drm_mipi_dsi.h \
scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rk3568-cru.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/arm-gic.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/irq.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip,boot-mode.h \
scripts/dtc/include-prefixes/dt-bindings/phy/phy.h \
scripts/dtc/include-prefixes/dt-bindings/power/rk3568-power.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip-system-status.h \
scripts/dtc/include-prefixes/dt-bindings/suspend/rockchip-rk3568.h \
scripts/dtc/include-prefixes/dt-bindings/thermal/thermal.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-dram-default-timing.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rockchip-ddr.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rk3568-dram.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rockchip-dram.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can0-m0-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can1-m1-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can2-m0-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie3x2.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-sata1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb)
$(deps_arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb):

View File

@ -0,0 +1 @@
arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dtb: arch/arm64/boot/dts/rockchip/rk356x/.dr4-rk3568.dtb.dts.tmp

View File

@ -0,0 +1,36 @@
dr4-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-evb-rpdzkj-rk809-pwm.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 \
scripts/dtc/include-prefixes/dt-bindings/input/rk-input.h \
scripts/dtc/include-prefixes/dt-bindings/display/drm_mipi_dsi.h \
scripts/dtc/include-prefixes/dt-bindings/sensor-dev.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rk3568-cru.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/arm-gic.h \
scripts/dtc/include-prefixes/dt-bindings/interrupt-controller/irq.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip,boot-mode.h \
scripts/dtc/include-prefixes/dt-bindings/phy/phy.h \
scripts/dtc/include-prefixes/dt-bindings/power/rk3568-power.h \
scripts/dtc/include-prefixes/dt-bindings/soc/rockchip-system-status.h \
scripts/dtc/include-prefixes/dt-bindings/suspend/rockchip-rk3568.h \
scripts/dtc/include-prefixes/dt-bindings/thermal/thermal.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-dram-default-timing.dtsi \
scripts/dtc/include-prefixes/dt-bindings/clock/rockchip-ddr.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rk3568-dram.h \
scripts/dtc/include-prefixes/dt-bindings/memory/rockchip-dram.h \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-pinctrl.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rockchip-pinconf.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/../rk3568-linux.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-camera-mipi-gc2093-single-2lane.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can0-m0-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can1-m1-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-can2-m0-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie2x1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-pcie3x2.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rk3568-sata1.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/lcd-gpio-dr4-rk3568.dtsi

File diff suppressed because it is too large Load Diff

BIN
rk356x/dr4-rk3566.dtb Normal file

Binary file not shown.

BIN
rk356x/dr4-rk3568.dtb Normal file

Binary file not shown.

View File

@ -23,6 +23,7 @@
/*************************gmac***********************/
#include "rp-gmac1-m1-pro-rk3568.dtsi"
#include "rp-gmac0-pro-rk3568.dtsi"
/***************************************************/
/*************************CAN**********************/
@ -62,7 +63,7 @@
/** LVDS + HDMI */
//#include "rp-lcd-lvds-7-1024-600-v2.dtsi"
#include "rp-lcd-lvds-10-1280-800-v2.dtsi"
// #include "rp-lcd-lvds-10-1280-800-v2.dtsi"
//#include "rp-lcd-lvds-10-1280-800.dtsi"
/** EDP + HDMI */
@ -169,7 +170,7 @@
};
rp_gpio{
status = "okay";
status = "disabled";
compatible = "rp_gpio";
/**
@ -282,10 +283,6 @@
};
};
&uart0 {
status = "okay";
};
&uart3 {
status = "okay";
pinctrl-names = "default";
@ -295,13 +292,20 @@
&uart4 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart4m1_xfer>;
pinctrl-0 = <&uart4m0_xfer>;
};
&uart5 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart5m1_xfer>;
pinctrl-0 = <&uart5m0_xfer>;
};
&uart6 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart6m1_xfer>;
};
&uart7 {
@ -313,17 +317,12 @@
&uart8 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart8m1_xfer>;
pinctrl-0 = <&uart8m0_xfer>;
};
&uart9 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart9m1_xfer>;
};
&spi0 {
status = "okay";
status = "disabled";
/** redefine pins for cs1 used to be pwm5 */
pinctrl-0 = <&spi0m0_cs0 &spi0m0_pins>;
pinctrl-1 = <&spi0m0_cs0 &spi0m0_pins_hs>;
@ -408,6 +407,12 @@
status = "okay";
};
&gmac0 {
tx_delay = <0x49>;
rx_delay = <0x29>;
status = "okay";
};
/** headphone detect pin */
&rk_headset {
@ -427,7 +432,7 @@
};
&sdmmc1 {
status = "okay";
status = "disabled";
max-frequency = <150000000>;
supports-sdio;
@ -456,14 +461,10 @@
BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "okay";
status = "disabled";
};
&uart1 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
};
/** pcie2x1 */
&vcc3v3_pcie {
@ -475,7 +476,7 @@
};
&pcie2x1 {
status = "okay";
status = "disabled";
reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
};
@ -484,7 +485,7 @@
/** pcie3x2 */
&pcie3x2 {
status = "okay";
status = "disabled";
reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie3>;
};
@ -576,5 +577,5 @@
BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "okay";
status = "disabled";
};

View File

@ -3,7 +3,7 @@
phy-mode = "rgmii";
clock_in_out = "input";
snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
snps,reset-gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;

View File

@ -3,7 +3,7 @@
phy-mode = "rgmii";
clock_in_out = "input";
snps,reset-gpio = <&gpio2 RK_PD1 GPIO_ACTIVE_LOW>;
snps,reset-gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;