7 Commits

Author SHA1 Message Date
zhangpeng
10980d7306 pcie 网卡插槽 2025-10-20 13:49:06 +08:00
zhangpeng
591fa0c3f9 只使用串口pcie 2025-10-16 17:00:39 +08:00
zhangpeng
77d62eaa60 禁用串口 2025-10-09 13:29:27 +08:00
zhangpeng
29b4af2f0d 配置USB 2025-10-09 13:15:30 +08:00
zhangpeng
c58ccf6f9c 配置PCIE 2025-10-09 13:05:58 +08:00
zhangpeng
af654bb685 usb3.0 2025-06-24 17:27:05 +08:00
zhangpeng
0ae4e1e318 已经全部测试完成 2025-04-28 13:38:54 +08:00
32 changed files with 535 additions and 31117 deletions

View File

@@ -227,25 +227,6 @@
}; };
/* RK3568J cpu OPPs */ /* RK3568J cpu OPPs */
opp-j-408000000 {
opp-supported-hw = <0xfb 0xffff>;
opp-hz = /bits/ 64 <408000000>;
opp-microvolt = <850000 850000 1150000>;
clock-latency-ns = <40000>;
};
opp-j-600000000 {
opp-supported-hw = <0xfb 0xffff>;
opp-hz = /bits/ 64 <600000000>;
opp-microvolt = <850000 850000 1150000>;
clock-latency-ns = <40000>;
};
opp-j-816000000 {
opp-supported-hw = <0xfb 0xffff>;
opp-hz = /bits/ 64 <816000000>;
opp-microvolt = <850000 850000 1150000>;
clock-latency-ns = <40000>;
opp-suspend;
};
opp-j-1008000000 { opp-j-1008000000 {
opp-supported-hw = <0x04 0xffff>; opp-supported-hw = <0x04 0xffff>;
opp-hz = /bits/ 64 <1008000000>; opp-hz = /bits/ 64 <1008000000>;

View File

@@ -1,41 +0,0 @@
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

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

View File

@@ -1,33 +0,0 @@
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

File diff suppressed because it is too large Load Diff

View File

@@ -1,36 +0,0 @@
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/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 \
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/zkzg-pcie-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/zkzg-can-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

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

View File

@@ -1,28 +0,0 @@
dr4-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/dr4-rk3568.dts \
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 \
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/zkzg-pcie-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/zkzg-can-rk3568.dtsi

File diff suppressed because it is too large Load Diff

View File

@@ -1,43 +0,0 @@
cmd_arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dtb := gcc -E -Wp,-MMD,arch/arm64/boot/dts/rockchip/rk356x/.pro-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/.pro-rk3568.dtb.dts.tmp arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dts ; ./scripts/dtc/dtc -O dtb -o arch/arm64/boot/dts/rockchip/rk356x/pro-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/.pro-rk3568.dtb.d.dtc.tmp arch/arm64/boot/dts/rockchip/rk356x/.pro-rk3568.dtb.dts.tmp ; cat arch/arm64/boot/dts/rockchip/rk356x/.pro-rk3568.dtb.d.pre.tmp arch/arm64/boot/dts/rockchip/rk356x/.pro-rk3568.dtb.d.dtc.tmp > arch/arm64/boot/dts/rockchip/rk356x/.pro-rk3568.dtb.d
source_arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dtb := arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dts
deps_arch/arm64/boot/dts/rockchip/rk356x/pro-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-mipi-camera-gc2093x2-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-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-sata2.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568-single-lcd-gpio.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-mipi1-10-1920-1200.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-hdmi.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dtb)
$(deps_arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568.dtb):

View File

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

View File

@@ -1,35 +0,0 @@
pro-rk3568.o: arch/arm64/boot/dts/rockchip/rk356x/pro-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-mipi-camera-gc2093x2-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-adc-key.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac0-pro-rk3568.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-gmac1-m1-pro-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-sata2.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/pro-rk3568-single-lcd-gpio.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-mipi1-10-1920-1200.dtsi \
arch/arm64/boot/dts/rockchip/rk356x/rp-lcd-hdmi.dtsi

File diff suppressed because it is too large Load Diff

Binary file not shown.

Binary file not shown.

View File

@@ -8,45 +8,41 @@
//rk3568-evb1-ddr4-v10 //rk3568-evb1-ddr4-v10
//#include "rk3568-evb1-ddr4-v10.dtsi" //#include "rk3568-evb1-ddr4-v10.dtsi"
#include "rk3566-evb-rpdzkj-rk809-tcs4525.dtsi" #include "rk3568-evb-rpdzkj-rk809-pwm.dtsi"
#include "../rk3568-linux.dtsi" #include "../rk3568-linux.dtsi"
/**************************pcie***********************/
#include "zkzg-pcie-rk3568.dtsi"
/*************************camera***********************/ /*************************camera***********************/
// #include "rp-camera-mipi-gc2093-single-2lane.dtsi" #include "rp-camera-mipi-gc2093-single-2lane.dtsi"
/***************************************************/ /***************************************************/
/*************************adc key***********************/ /*************************adc key***********************/
// #include "rp-adc-key.dtsi" #include "rp-adc-key.dtsi"
/***************************************************/ /***************************************************/
/*************************gmac***********************/ /*************************gmac***********************/
// #include "rp-gmac1-m1-pro-rk3568.dtsi" #include "rp-gmac1-m1-pro-rk3568.dtsi"
#include "rp-gmac0-pro-rk3568.dtsi"
/***************************************************/ /***************************************************/
/*************************CAN**********************/ /*************************CAN**********************/
// #include "rp-can0-m0-rk3568.dtsi" #include "rp-can0-m0-rk3568.dtsi"
// #include "rp-can1-m1-rk3568.dtsi" #include "rp-can1-m1-rk3568.dtsi"
// #include "rp-can2-m0-rk3568.dtsi" #include "rp-can2-m0-rk3568.dtsi"
#include "zkzg-can-rk3568.dtsi"
/**************************************************/ /**************************************************/
/*********************PCIE**************************/ /*********************PCIE**************************/
// #include "rk3568-pcie2x1.dtsi" #include "rk3568-pcie2x1.dtsi"
// #include "rk3568-pcie3x2.dtsi" #include "rk3568-pcie3x2.dtsi"
/***************************************************/ /***************************************************/
/*************************SATA***********************/ /*************************SATA***********************/
// #include "rk3568-sata1.dtsi" #include "rk3568-sata1.dtsi"
/***************************************************/ /***************************************************/
// #include "lcd-gpio-dr4-rk3568.dtsi" //gpio config for lcd #include "lcd-gpio-dr4-rk3568.dtsi" //gpio config for lcd
/****** LCD config reference **/ /****** LCD config reference **/
/** single HDMI */ /** single HDMI */
@@ -66,7 +62,7 @@
/** LVDS + HDMI */ /** LVDS + HDMI */
//#include "rp-lcd-lvds-7-1024-600-v2.dtsi" //#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" //#include "rp-lcd-lvds-10-1280-800.dtsi"
/** EDP + HDMI */ /** EDP + HDMI */
@@ -89,7 +85,7 @@
thermal-zone = "soc-thermal"; thermal-zone = "soc-thermal";
threshold-temp = <60000>; //60C threshold-temp = <60000>; //60C
running-time = <10000>; //10s running-time = <10000>; //10s
status = "disabled"; status = "okay";
}; };
rp_power{ rp_power{
@@ -113,10 +109,10 @@
* }; * };
*/ */
// led { //system led led { //system led
// gpio_num = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio0 RK_PD6 GPIO_ACTIVE_HIGH>;
// gpio_function = <3>; gpio_function = <3>;
// }; };
//fan { //fan //fan { //fan
// gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>; // gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; // gpio_function = <4>;
@@ -131,49 +127,49 @@
gpio_function = <4>; gpio_function = <4>;
}; };
// hub_rst { //usb hub hub_rst { //usb hub
// gpio_num = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// usb_pwr0 { //host0 power en usb_pwr0 { //host0 power en
// gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// usb_pwr1 { //host1 power en usb_pwr1 { //host1 power en
// gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// usb_pwr2 { //host2 power en usb_pwr2 { //host2 power en
// gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// usb_pwr3 { //host3 power en usb_pwr3 { //host3 power en
// gpio_num = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio1 RK_PD4 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// usb_pwr4 { //host4 power en usb_pwr4 { //host4 power en
// gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// spk_en { //spk enable spk_en { //spk enable
// gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// spk_mute { //spk mute spk_mute { //spk mute
// gpio_num = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>; gpio_num = <&gpio3 RK_PA7 GPIO_ACTIVE_LOW>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
// vdd_3g { //4G module power en vdd_3g { //4G module power en
// gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;
// gpio_function = <4>; gpio_function = <4>;
// }; };
}; };
rp_gpio{ rp_gpio{
status = "disabled"; status = "okay";
compatible = "rp_gpio"; compatible = "rp_gpio";
/** /**
@@ -268,17 +264,17 @@
vccio3-supply = <&vccio_sd>; vccio3-supply = <&vccio_sd>;
vccio4-supply = <&vcc_1v8>; vccio4-supply = <&vcc_1v8>;
vccio5-supply = <&vcc_3v3>; vccio5-supply = <&vcc_3v3>;
vccio6-supply = <&vcc_1v8>; vccio6-supply = <&vcc_3v3>;
vccio7-supply = <&vcc_3v3>; vccio7-supply = <&vcc_3v3>;
}; };
&i2c3 { &i2c3 {
status = "disabled"; status = "okay";
}; };
&i2c5 { &i2c5 {
status = "disabled"; status = "okay";
rtc@51 { rtc@51 {
status = "okay"; status = "okay";
compatible = "rtc,hym8563"; compatible = "rtc,hym8563";
@@ -286,46 +282,48 @@
}; };
}; };
&uart0 {
status = "okay";
};
&uart3 { &uart3 {
status = "disabled"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart3m1_xfer>; pinctrl-0 = <&uart3m1_xfer>;
}; };
&uart4 { &uart4 {
status = "disabled"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart4m0_xfer>; pinctrl-0 = <&uart4m1_xfer>;
}; };
&uart5 { &uart5 {
status = "disabled"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart5m0_xfer>; pinctrl-0 = <&uart5m1_xfer>;
};
&uart6 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart6m1_xfer>;
}; };
&uart7 { &uart7 {
status = "disabled"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7m1_xfer>; pinctrl-0 = <&uart7m1_xfer>;
}; };
&uart8 { &uart8 {
status = "disabled"; status = "okay";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart8m0_xfer>; pinctrl-0 = <&uart8m1_xfer>;
}; };
&uart9 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart9m1_xfer>;
};
&spi0 { &spi0 {
status = "disabled"; status = "okay";
/** redefine pins for cs1 used to be pwm5 */ /** redefine pins for cs1 used to be pwm5 */
pinctrl-0 = <&spi0m0_cs0 &spi0m0_pins>; pinctrl-0 = <&spi0m0_cs0 &spi0m0_pins>;
pinctrl-1 = <&spi0m0_cs0 &spi0m0_pins_hs>; pinctrl-1 = <&spi0m0_cs0 &spi0m0_pins_hs>;
@@ -338,22 +336,8 @@
}; };
}; };
&spi1 {
status = "okay";
/** redefine pins for cs1 used to be pwm5 */
pinctrl-0 = <&spi1m1_cs0 &spi1m1_pins>;
pinctrl-0 = <&spi1m1_cs0 &spi1m1_pins_hs>;
spi_dev@0 {
compatible = "rockchip,spidev";
reg = <0>;
spi-max-frequency = <12000000>;
spi-lsb-first;
};
};
&video_phy1 { &video_phy1 {
status = "disabled"; status = "okay";
}; };
/******** must be close,if not system no run ******/ /******** must be close,if not system no run ******/
@@ -381,54 +365,48 @@
* and if mutiple lcd used, we just use the backlight5, backlight10. * and if mutiple lcd used, we just use the backlight5, backlight10.
*/ */
/** LCD configuration */ /** LCD configuration */
// #if defined(RP_SINGLE_LCD) #if defined(RP_SINGLE_LCD)
// #if defined(RP_MIPI02LVDS) #if defined(RP_MIPI02LVDS)
// &dsi0_panel { &dsi0_panel {
// enable-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_LOW>; //raw interface is inverse, so set to low enable-gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_LOW>; //raw interface is inverse, so set to low
// }; };
// #if defined(RP_DUALLVDS) #if defined(RP_DUALLVDS)
// // dual lvds donot need invert // dual lvds donot need invert
// &backlight4 { &backlight4 {
// pwms = <&pwm5 0 25000 0>; pwms = <&pwm5 0 25000 0>;
// }; };
// #else #else
// //pwm and enable pin may be inverted if use mipi to single lvds //pwm and enable pin may be inverted if use mipi to single lvds
// &backlight4 { &backlight4 {
// pwms = <&pwm5 0 25000 1>; pwms = <&pwm5 0 25000 1>;
// }; };
// #endif #endif
// #elif defined(RP_EDP_USED) #elif defined(RP_EDP_USED)
// &backlight4 { &backlight4 {
// pwms = <&pwm10 0 25000 0>; pwms = <&pwm10 0 25000 0>;
// }; };
// #endif #endif
// #else #else
// &edp_panel { &edp_panel {
// backlight = <&backlight10>; backlight = <&backlight10>;
// }; };
// #ifdef RP_MIPI02LVDS #ifdef RP_MIPI02LVDS
// &dsi0_panel { &dsi0_panel {
// backlight = <&backlight5>; backlight = <&backlight5>;
// }; };
// #endif #endif
// #endif #endif
/** Ethernet config*/ /** Ethernet config*/
// &gmac1 { &gmac1 {
// tx_delay = <0x49>; tx_delay = <0x49>;
// rx_delay = <0x29>; rx_delay = <0x29>;
// status = "okay"; status = "okay";
// }; };
// &gmac0 {
// tx_delay = <0x49>;
// rx_delay = <0x29>;
// status = "okay";
// };
/** headphone detect pin */ /** headphone detect pin */
@@ -449,7 +427,7 @@
}; };
&sdmmc1 { &sdmmc1 {
status = "disabled"; status = "okay";
max-frequency = <150000000>; max-frequency = <150000000>;
supports-sdio; supports-sdio;
@@ -478,56 +456,60 @@
BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "disabled"; status = "okay";
};
&uart1 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;
};
/** pcie2x1 */
&vcc3v3_pcie {
/**
* delete for gpio used to be bt_wake_host
* and the vcc3v3_pcie need not control on our board.
*/
/delete-property/ gpio;
};
&pcie2x1 {
status = "okay";
reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
}; };
/** pcie2x1 */
// &vcc3v3_pcie {
// /**
// * delete for gpio used to be bt_wake_host
// * and the vcc3v3_pcie need not control on our board.
// */
// /delete-property/ gpio;
// };
// &pcie2x1 {
// status = "disabled";
// reset-gpios = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>;
// };
/** pcie3x2 */ /** pcie3x2 */
// &pcie3x2 { &pcie3x2 {
// status = "disabled"; status = "okay";
// reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>; reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
// vpcie3v3-supply = <&vcc3v3_pcie3>; vpcie3v3-supply = <&vcc3v3_pcie3>;
// }; };
// &vcc3v3_pcie3 { &vcc3v3_pcie3 {
// pinctrl-names = "default"; pinctrl-names = "default";
// pinctrl-0 = <&pcie3_3v3>; pinctrl-0 = <&pcie3_3v3>;
// gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>; gpio = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
// startup-delay-us = <8000>; //5000 is faild startup-delay-us = <8000>; //5000 is faild
// }; };
/** mipi camera config */ /** mipi camera config */
// &vcc_camera { &vcc_camera {
// gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; gpio = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
// pinctrl-names = "default"; pinctrl-names = "default";
// pinctrl-0 = <&camera_en>; pinctrl-0 = <&camera_en>;
// }; };
// &gc2093 { &gc2093 {
// pinctrl-names = "default"; pinctrl-names = "default";
// pinctrl-0 = <&cif_clk>; pinctrl-0 = <&cif_clk>;
// pinctrl-1 = <&camera_ctl>; pinctrl-1 = <&camera_ctl>;
// pwdn-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>; pwdn-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_HIGH>;
// reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>; reset-gpios = <&gpio2 RK_PB1 GPIO_ACTIVE_LOW>;
// }; };
&pinctrl { &pinctrl {
@@ -570,20 +552,20 @@
}; };
}; };
// camera-pins { camera-pins {
// camera_en: camera-en { camera_en: camera-en {
// rockchip,pins = rockchip,pins =
// /** gc2093 camera en */ /** gc2093 camera en */
// <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>; <2 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
// }; };
// camera_ctl: camera-ctl { camera_ctl: camera-ctl {
// rockchip,pins = rockchip,pins =
// /** gc2093 camera power down */ /** gc2093 camera power down */
// <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>, <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
// /** gc2093 camera reset */ /** gc2093 camera reset */
// <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; <2 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>;
// }; };
// }; };
}; };
@@ -594,5 +576,5 @@
BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>; BT,reset_gpio = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>; BT,wake_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; BT,wake_host_irq = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
status = "disabled"; status = "okay";
}; };

Binary file not shown.

View File

@@ -14,7 +14,7 @@
#include <dt-bindings/pinctrl/rockchip.h> #include <dt-bindings/pinctrl/rockchip.h>
#include "../rk3568.dtsi" #include "../rk3566.dtsi"
/ { / {
@@ -131,7 +131,7 @@
}; };
rk809_sound: rk809-sound { rk809_sound: rk809-sound {
status = "disabled"; status = "okay";
compatible = "rockchip,multicodecs-card"; compatible = "rockchip,multicodecs-card";
rockchip,card-name = "rockchip-rk809"; rockchip,card-name = "rockchip-rk809";
//hp-det-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //hp-det-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
@@ -188,7 +188,6 @@
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
vin-supply = <&dc_12v>; vin-supply = <&dc_12v>;
}; };
/* /*
vcc5v0_usb: vcc5v0-usb { vcc5v0_usb: vcc5v0-usb {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
@@ -367,7 +366,7 @@
&i2c0 { &i2c0 {
status = "disabled"; status = "okay";
rk809: pmic@20 { rk809: pmic@20 {
compatible = "rockchip,rk809"; compatible = "rockchip,rk809";
reg = <0x20>; reg = <0x20>;
@@ -768,12 +767,12 @@
*/ */
&pmu_io_domains { &pmu_io_domains {
status = "okay"; status = "okay";
pmuio2-supply = <&vcc_3v3>; pmuio2-supply = <&vcc3v3_pmu>;
vccio1-supply = <&vcc_3v3>; vccio1-supply = <&vccio_acodec>;
vccio3-supply = <&vcc_3v3>; vccio3-supply = <&vccio_sd>;
vccio4-supply = <&vcc_1v8>; vccio4-supply = <&vcc_3v3>;
vccio5-supply = <&vcc_3v3>; vccio5-supply = <&vcc_3v3>;
vccio6-supply = <&vcc_1v8>; vccio6-supply = <&vcc_3v3>;
vccio7-supply = <&vcc_3v3>; vccio7-supply = <&vcc_3v3>;
}; };

View File

@@ -1,30 +1,30 @@
&gmac0 { &gmac0 {
phy-mode = "rgmii"; phy-mode = "rgmii";
clock_in_out = "input"; clock_in_out = "input";
snps,reset-gpio = <&gpio2 RK_PC5 GPIO_ACTIVE_LOW>;
snps,reset-active-low;
/* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;
assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>; snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&gmac0_clkin>; snps,reset-active-low;
assigned-clock-rates = <0>, <125000000>; /* Reset time is 20ms, 100ms for rtl8211f */
snps,reset-delays-us = <0 20000 100000>;
pinctrl-names = "default"; assigned-clocks = <&cru SCLK_GMAC0_RX_TX>, <&cru SCLK_GMAC0>, <&cru CLK_MAC0_OUT>;
pinctrl-0 = <&gmac0_miim assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>, <&gmac0_clkin>, <&cru CLK_MAC0_2TOP>;
&gmac0_tx_bus2 assigned-clock-rates = <0>, <125000000>, <25000000>;
&gmac0_rx_bus2
&gmac0_rgmii_clk_level2
&gmac0_rgmii_bus
&gmac0_clkinout>;
pinctrl-names = "default";
pinctrl-0 = <&gmac0_miim
&gmac0_tx_bus2
&gmac0_rx_bus2
&gmac0_rgmii_clk
&gmac0_rgmii_bus
&eth0_pins
&gmac0_clkinout>;
tx_delay = <0x3c>; tx_delay = <0x2d>;
rx_delay = <0x2f>; rx_delay = <0x2c>;
phy-handle = <&rgmii_phy0>;
phy-handle = <&rgmii_phy0>; status = "okay";
status = "okay";
}; };
@@ -32,5 +32,6 @@
rgmii_phy0: phy@0 { rgmii_phy0: phy@0 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>; reg = <0x0>;
clocks = <&cru CLK_MAC0_OUT>;
}; };
}; };

View File

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

View File

@@ -1,17 +0,0 @@
&can0 {
compatible = "rockchip,rk3568-can-2.0";
assigned-clocks = <&cru CLK_CAN0>;
assigned-clock-rates = <150000000>;
pinctrl-names = "default";
pinctrl-0 = <&can0m1_pins>;
status = "okay";
};
&can1 {
compatible = "rockchip,rk3568-can-2.0";
assigned-clocks = <&cru CLK_CAN1>;
assigned-clock-rates = <150000000>;
pinctrl-names = "default";
pinctrl-0 = <&can1m1_pins>;
status = "okay";
};

View File

@@ -1,8 +0,0 @@
&pcie30phy {
status = "okay";
};
&pcie3x2 {
compatible = "rockchip,rk3568-pcie-ep";
status = "okay";
};

View File

@@ -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-rk806-single.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.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/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/rpdzkj_config.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.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/zkzg-pcie.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-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) arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb: $(deps_arch/arm64/boot/dts/rockchip/rk3588/dr4-rk3588.dtb)

View File

@@ -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-rk806-single.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/../rk3588-linux.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/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/rpdzkj_config.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-typec-rk3588.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/zkzg-usb-host.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-usb-host.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac0.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-eth-pcie2gmac-rk3588.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-eth-gmac1.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/zkzg-pcie.dtsi \
arch/arm64/boot/dts/rockchip/rk3588/rp-pcie3.dtsi \ arch/arm64/boot/dts/rockchip/rk3588/rp-lcd-hdmi1.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

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@@ -3,39 +3,44 @@
#include "rp-rk3588-board.dtsi" #include "rp-rk3588-board.dtsi"
#include "rp-tp-i2c6-gt911.dtsi" #include "rp-tp-i2c6-gt911.dtsi"
#include "rd-rk3588-lcd-gpio.dtsi" // #include "rd-rk3588-lcd-gpio.dtsi"
#include "rpdzkj_config.dtsi" #include "rpdzkj_config.dtsi"
/* usb */ /* usb */
#include "rp-usb-typec-rk3588.dtsi" // #include "rp-usb-typec-rk3588.dtsi"
#include "rp-usb-host.dtsi" // #include "rp-usb-host.dtsi"
#include "zkzg-usb-host.dtsi"
/* ethernet */ /* ethernet */
#include "rp-eth-pcie2gmac-rk3588.dtsi" // #include "rp-eth-pcie2gmac-rk3588.dtsi"
#include "rp-eth-gmac0.dtsi"
#include "rp-eth-gmac1.dtsi" #include "rp-eth-gmac1.dtsi"
/* pcie */ /* pcie */
#include "rp-pcie-power-rk3588.dtsi" #include "zkzg-pcie.dtsi"
#include "rp-pcie3.dtsi" //need comment when use board of make it youself,and remove the pcie function
#include "rp-pcie-5g.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"
/* audio */ /* audio */
#include "rp-audio-rt5640.dtsi" // #include "rp-audio-rt5640.dtsi"
/* wifi/bt */ /* wifi/bt */
#include "rp-wifi-bt-ap6275p-rk3588.dtsi" // #include "rp-wifi-bt-ap6275p-rk3588.dtsi"
/* hdmi rx */ /* hdmi rx */
#include "rp-hdmirx.dtsi" // #include "rp-hdmirx.dtsi"
/* camera */ /* camera */
/***********all camera config********/ /***********all camera config********/
//#include "rp-camera-dcphy0.dtsi" //#include "rp-camera-dcphy0.dtsi"
#include "rp-camera-dcphy1.dtsi" // #include "rp-camera-dcphy1.dtsi"
#include "rp-camera-dphy0.dtsi" // #include "rp-camera-dphy0.dtsi"
#include "rp-camera-dphy1.dtsi" // #include "rp-camera-dphy1.dtsi"
//#include "rp-camera-dcphy0-ov13855.dtsi" //#include "rp-camera-dcphy0-ov13855.dtsi"
//#include "rp-camera-dcphy1-ov13855.dtsi" //#include "rp-camera-dcphy1-ov13855.dtsi"
@@ -59,13 +64,13 @@
//#include "rp-camera-dphy0-imx415.dtsi" //#include "rp-camera-dphy0-imx415.dtsi"
/******************************************/ /******************************************/
//#include "rp-lcd-hdmi0.dtsi" //batch ignore // #include "rp-lcd-hdmi0.dtsi" //batch ignore
//#include "rp-lcd-hdmi1.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-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 */ /* 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-7-720-1280.dtsi"
//#include "rp-lcd-mipi0-8-800-1280-v3.dtsi" //#include "rp-lcd-mipi0-8-800-1280-v3.dtsi"
//#include "rp-lcd-mipi0-8-1200-1920.dtsi" //#include "rp-lcd-mipi0-8-1200-1920.dtsi"
@@ -114,7 +119,7 @@
thermal-zone = "soc-thermal"; thermal-zone = "soc-thermal";
threshold-temp = <60000>; //60C threshold-temp = <60000>; //60C
running-time = <10000>; //10s running-time = <10000>; //10s
status = "okay"; status = "disabled";
}; };
rp_power{ rp_power{
@@ -133,10 +138,10 @@
// gpio_function = <4>; // gpio_function = <4>;
//}; //};
led { // led {
gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>; // gpio_num = <&gpio4 RK_PA6 GPIO_ACTIVE_HIGH>;
gpio_function = <3>; // gpio_function = <3>;
}; // };
usb-host-power { usb-host-power {
gpio_num = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>; gpio_num = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
@@ -162,33 +167,63 @@
&uart0 { &uart0 {
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart0m0_xfer>; pinctrl-0 = <&uart0m0_xfer>;
}; };
&uart6 { &uart1 {
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart6m0_xfer>; pinctrl-0 = <&uart1m1_xfer>;
};
&uart3 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart3m0_xfer>;
};
&uart4 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart4m1_xfer>;
};
&uart5 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart5m0_xfer>;
};
&uart6 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart6m2_xfer>;
}; };
&uart7 { &uart7 {
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart7m1_xfer>; pinctrl-0 = <&uart7m1_xfer>;
}; };
&uart8 { &uart8 {
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&uart8m0_xfer>; pinctrl-0 = <&uart8m0_xfer>;
}; };
&uart9 {
status = "disabled";
pinctrl-names = "default";
pinctrl-0 = <&uart9m2_xfer>;
};
&can0 { &can0 {
assigned-clocks = <&cru CLK_CAN0>; assigned-clocks = <&cru CLK_CAN0>;
assigned-clock-rates = <200000000>; assigned-clock-rates = <200000000>;
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&can0m0_pins>; pinctrl-0 = <&can0m0_pins>;
}; };
@@ -196,13 +231,13 @@
&can1 { &can1 {
assigned-clocks = <&cru CLK_CAN1>; assigned-clocks = <&cru CLK_CAN1>;
assigned-clock-rates = <200000000>; assigned-clock-rates = <200000000>;
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&can1m1_pins>; pinctrl-0 = <&can1m1_pins>;
}; };
&i2c4 { &i2c4 {
status = "okay"; status = "disabled";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&i2c4m1_xfer>; pinctrl-0 = <&i2c4m1_xfer>;

View File

@@ -9,9 +9,9 @@
&gmac0 { &gmac0 {
// Use rgmii-rxid mode to disable rx delay inside Soc // Use rgmii-rxid mode to disable rx delay inside Soc
phy-mode = "rgmii-rxid"; 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; snps,reset-active-low;
// Reset time is 20ms, 100ms for rtl8211f // Reset time is 20ms, 100ms for rtl8211f
snps,reset-delays-us = <0 20000 100000>; snps,reset-delays-us = <0 20000 100000>;
@@ -21,7 +21,9 @@
&gmac0_tx_bus2 &gmac0_tx_bus2
&gmac0_rx_bus2 &gmac0_rx_bus2
&gmac0_rgmii_clk &gmac0_rgmii_clk
&gmac0_rgmii_bus>; &gmac0_rgmii_bus
&gmac0_clkinout
&eth0_pins>;
tx_delay = <0x44>; tx_delay = <0x44>;
// rx_delay = <0x4f>; // rx_delay = <0x4f>;

View File

@@ -43,6 +43,6 @@
}; };
&usbhost_dwc3_0 { &usbhost_dwc3_0 {
status = "disabled"; status = "okay";
}; };

View File

@@ -11,6 +11,20 @@
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&typec5v_pwren>; pinctrl-0 = <&typec5v_pwren>;
}; };
vcc5v0_host: vcc5v0-host {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_host";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_usb>;
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en>;
};
}; };
@@ -111,7 +125,7 @@
&usbdrd_dwc3_0 { &usbdrd_dwc3_0 {
dr_mode = "otg"; dr_mode = "host";
usb-role-switch; usb-role-switch;
port { port {
#address-cells = <1>; #address-cells = <1>;
@@ -123,6 +137,24 @@
}; };
}; };
&u2phy1_otg {
phy-supply = <&vcc5v0_host>;
};
// 使能USB3.1/SATA/PCIe Combo PHY
&combphy2_psu {
status = "okay";
};
// 配置USB3.1 HOST2 Controller
&usbhost3_0 {
status = "okay";
};
&usbhost_dwc3_0 {
dr_mode = "host";
status = "okay";
};
&pinctrl { &pinctrl {
usb-typec { usb-typec {
usbc0_int: usbc0-int { usbc0_int: usbc0-int {
@@ -134,4 +166,9 @@
}; };
}; };
usb {
vcc5v0_host_en: vcc5v0-host-en {
rockchip,pins = <4 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
};
};
}; };

62
rk3588/zkzg-pcie.dtsi Executable file
View File

@@ -0,0 +1,62 @@
/ {
vcc3v3_pcie30: vcc3v3-pcie30 {
compatible = "regulator-fixed";
regulator-name = "vcc3v3_pcie30";
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
enable-active-high;
gpios = <&gpio3 RK_PC3 GPIO_ACTIVE_HIGH>;
startup-delay-us = <5000>;
vin-supply = <&vcc12v_dcin>;
};
};
&combphy0_ps {
status = "okay";
};
&combphy1_ps {
status = "okay";
};
&combphy2_psu {
status = "okay";
};
&pcie2x1l0 {
phys = <&combphy1_ps PHY_TYPE_PCIE>;
reset-gpios = <&gpio4 RK_PA5 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "disabled";
};
&pcie2x1l1 {
phys = <&combphy2_psu PHY_TYPE_PCIE>;
reset-gpios = <&gpio4 RK_PA2 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "disabled";
};
&pcie2x1l2 {
reset-gpios = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "disabled";
};
&pcie30phy {
rockchip,pcie30-phymode = <PHY_MODE_PCIE_NANBNB>;
status = "okay";
};
&pcie3x2 {
reset-gpios = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "okay";
};
&pcie3x4 {
num-lanes = <2>;
reset-gpios = <&gpio4 RK_PB6 GPIO_ACTIVE_HIGH>;
vpcie3v3-supply = <&vcc3v3_pcie30>;
status = "okay";
};

24
rk3588/zkzg-usb-host.dtsi Executable file
View File

@@ -0,0 +1,24 @@
&u2phy2_host {
status = "okay";
};
&u2phy3_host {
status = "okay";
};
// USB2.0 HOST0/1 Controller
&usb_host0_ehci {
status = "okay";
};
&usb_host0_ohci {
status = "okay";
};
&usb_host1_ehci {
status = "okay";
};
&usb_host1_ohci {
status = "okay";
};