From e05b24175d7a27a7cbbe3e456bb0ceb1e7c47e10 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Mon, 23 Sep 2024 13:15:57 +0800 Subject: [PATCH] rockchip: reorder nanopc t6 patches Reorder nanopc t6 patches to 055 to avoid conflict with nanopi r6c patches. Fixes: 55c46cbabd76 ("rockchip: add FriendlyElec NanoPi R6C") Signed-off-by: Tianling Shen Link: https://github.com/openwrt/openwrt/pull/16461 Signed-off-by: Nick Hainke --- ...1-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch} | 0 ...-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch} | 0 ...m64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch} | 0 ...v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch} | 0 ...m64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch} | 0 ...6-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch} | 0 ...6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch} | 0 ...09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch} | 0 ...-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch} | 0 ...1-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch} | 0 ...055-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch} | 0 ...5-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch} | 0 ...-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch} | 0 ...64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch} | 0 14 files changed, 0 insertions(+), 0 deletions(-) rename target/linux/rockchip/patches-6.6/{054-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch => 055-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch => 055-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch => 055-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch => 055-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch => 055-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch => 055-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch => 055-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch => 055-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch => 055-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch => 055-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch => 055-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch => 055-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch => 055-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch} (100%) rename target/linux/rockchip/patches-6.6/{054-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch => 055-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch} (100%) diff --git a/target/linux/rockchip/patches-6.6/054-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-01-v6.8-arm64-dts-rockchip-Support-poweroff-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch b/target/linux/rockchip/patches-6.6/055-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch rename to target/linux/rockchip/patches-6.6/055-02-v6.9-arm64-dts-rockchip-nanopc-t6-sdmmc-beautification.patch diff --git a/target/linux/rockchip/patches-6.6/054-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch b/target/linux/rockchip/patches-6.6/055-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch rename to target/linux/rockchip/patches-6.6/055-03-v6.9-arm64-dts-rockchip-correct-gpio_pwrctrl1-typo-on-nanopc-t.patch diff --git a/target/linux/rockchip/patches-6.6/054-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch b/target/linux/rockchip/patches-6.6/055-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch rename to target/linux/rockchip/patches-6.6/055-04-v6.9-arm64-dts-rockchip-enable-NanoPC-T6-MiniPCIe-power.patch diff --git a/target/linux/rockchip/patches-6.6/054-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch b/target/linux/rockchip/patches-6.6/055-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch rename to target/linux/rockchip/patches-6.6/055-05-v6.9-arm64-dts-rockchip-add-sdmmc-card-detect-to-the-nanopc-t6.patch diff --git a/target/linux/rockchip/patches-6.6/054-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch b/target/linux/rockchip/patches-6.6/055-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch rename to target/linux/rockchip/patches-6.6/055-06-v6.9-arm64-dts-rockchip-fix-nanopc-t6-sdmmc-regulator.patch diff --git a/target/linux/rockchip/patches-6.6/054-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch b/target/linux/rockchip/patches-6.6/055-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch rename to target/linux/rockchip/patches-6.6/055-08-v6.12-arm64-dts-rockchip-prepare-NanoPC-T6-for-LTS-board.patch diff --git a/target/linux/rockchip/patches-6.6/054-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch b/target/linux/rockchip/patches-6.6/055-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch rename to target/linux/rockchip/patches-6.6/055-09-v6.12-arm64-dts-rockchip-move-NanoPC-T6-parts-to-DTS.patch diff --git a/target/linux/rockchip/patches-6.6/054-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-10-v6.12-arm64-dts-rockchip-add-SPI-flash-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-11-v6.12-arm64-dts-rockchip-add-IR-receiver-to-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-12-v6.12-arm64-dts-rockchip-enable-GPU-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-13-v6.12-arm64-dts-rockchip-enable-USB-C-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch b/target/linux/rockchip/patches-6.6/055-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch rename to target/linux/rockchip/patches-6.6/055-14-v6.12-arm64-dts-rockchip-add-Mask-Rom-key-on-NanoPC-T6.patch diff --git a/target/linux/rockchip/patches-6.6/054-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch b/target/linux/rockchip/patches-6.6/055-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch similarity index 100% rename from target/linux/rockchip/patches-6.6/054-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch rename to target/linux/rockchip/patches-6.6/055-15-v6.12-arm64-dts-rockchip-use-correct-fcs-suspend-voltage-selecto.patch -- 2.30.2