diff --git a/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts b/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
deleted file mode 100644
index 12d1bfa08..000000000
--- a/target/linux/rockchip/files-5.18/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
+++ /dev/null
@@ -1,19 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
- * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
- */
-
-/* TODO
- * Delete this file and migrate RockPi 4 to RockPi 4A after
- * removing Kernel 5.4.
- */
-
-
-/dts-v1/;
-#include "rk3399-rock-pi-4.dtsi"
-
-/ {
-	model = "SHAREVDI GuangMiao G4C";
-	compatible = "sharevdi,guangmiao-g4c", "rockchip,rk3399";
-};
diff --git a/target/linux/rockchip/files-5.4/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb3.yaml b/target/linux/rockchip/files/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb3.yaml
similarity index 100%
rename from target/linux/rockchip/files-5.4/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb3.yaml
rename to target/linux/rockchip/files/Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb3.yaml
diff --git a/target/linux/rockchip/files-5.4/arch/arm64/boot/dts/rockchip/rk3328-dram-nanopi2-timing.dtsi b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-dram-nanopi2-timing.dtsi
similarity index 100%
rename from target/linux/rockchip/files-5.4/arch/arm64/boot/dts/rockchip/rk3328-dram-nanopi2-timing.dtsi
rename to target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3328-dram-nanopi2-timing.dtsi
diff --git a/target/linux/rockchip/files-5.4/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
similarity index 100%
rename from target/linux/rockchip/files-5.4/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
rename to target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3399-guangmiao-g4c.dts
diff --git a/target/linux/rockchip/files-5.4/drivers/char/hw_random/rockchip-rng.c b/target/linux/rockchip/files/drivers/char/hw_random/rockchip-rng.c
similarity index 100%
rename from target/linux/rockchip/files-5.4/drivers/char/hw_random/rockchip-rng.c
rename to target/linux/rockchip/files/drivers/char/hw_random/rockchip-rng.c
diff --git a/target/linux/rockchip/files-5.4/drivers/devfreq/rk3328_dmc.c b/target/linux/rockchip/files/drivers/devfreq/rk3328_dmc.c
similarity index 100%
rename from target/linux/rockchip/files-5.4/drivers/devfreq/rk3328_dmc.c
rename to target/linux/rockchip/files/drivers/devfreq/rk3328_dmc.c
diff --git a/target/linux/rockchip/files-5.4/drivers/phy/rockchip/phy-rockchip-inno-usb3.c b/target/linux/rockchip/files/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
similarity index 100%
rename from target/linux/rockchip/files-5.4/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
rename to target/linux/rockchip/files/drivers/phy/rockchip/phy-rockchip-inno-usb3.c
diff --git a/target/linux/rockchip/files-5.4/include/dt-bindings/clock/rockchip-ddr.h b/target/linux/rockchip/files/include/dt-bindings/clock/rockchip-ddr.h
similarity index 100%
rename from target/linux/rockchip/files-5.4/include/dt-bindings/clock/rockchip-ddr.h
rename to target/linux/rockchip/files/include/dt-bindings/clock/rockchip-ddr.h
diff --git a/target/linux/rockchip/files-5.4/include/dt-bindings/memory/rk3328-dram.h b/target/linux/rockchip/files/include/dt-bindings/memory/rk3328-dram.h
similarity index 100%
rename from target/linux/rockchip/files-5.4/include/dt-bindings/memory/rk3328-dram.h
rename to target/linux/rockchip/files/include/dt-bindings/memory/rk3328-dram.h