From 84f102eab30f9138ec1f039604882daddab00b49 Mon Sep 17 00:00:00 2001 From: Tianling Shen Date: Tue, 23 May 2023 14:32:57 +0800 Subject: [PATCH] rockchip: 6.1: sort patches Signed-off-by: Tianling Shen --- ...-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch} | 0 ...2-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch} | 0 ...4-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch} | 0 ...04-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch} | 0 ....4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch} | 0 ...4-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch} | 0 ...07-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch} | 0 ...4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch} | 0 ... 009-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch} | 0 ... 010-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch} | 0 ...rm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch} | 0 ....5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch} | 0 ...-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch} | 2 +- ...02-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch} | 0 ...s-sd-signalling.patch => 103-nanopi-r4s-sd-signalling.patch} | 2 +- ... 501-mmc-core-set-initial-signal-voltage-on-power-off.patch} | 0 ...r-eth.patch => 603-arm64-rockchip-add-OF-node-for-eth.patch} | 2 +- 17 files changed, 3 insertions(+), 3 deletions(-) rename target/linux/rockchip/patches-6.1/{012-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch => 001-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch} (100%) rename target/linux/rockchip/patches-6.1/{013-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch => 002-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch} (100%) rename target/linux/rockchip/patches-6.1/{014-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch => 003-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch} (100%) rename target/linux/rockchip/patches-6.1/{015-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch => 004-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch} (100%) rename target/linux/rockchip/patches-6.1/{016-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch => 005-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch} (100%) rename target/linux/rockchip/patches-6.1/{017-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch => 006-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch} (100%) rename target/linux/rockchip/patches-6.1/{018-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch => 007-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch} (100%) rename target/linux/rockchip/patches-6.1/{019-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch => 008-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch} (100%) rename target/linux/rockchip/patches-6.1/{020-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch => 009-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch} (100%) rename target/linux/rockchip/patches-6.1/{021-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch => 010-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch} (100%) rename target/linux/rockchip/patches-6.1/{022-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch => 011-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch} (100%) rename target/linux/rockchip/patches-6.1/{023-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch => 012-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch} (100%) rename target/linux/rockchip/patches-6.1/{005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch => 101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch} (97%) rename target/linux/rockchip/patches-6.1/{201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch => 102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch} (100%) rename target/linux/rockchip/patches-6.1/{105-nanopi-r4s-sd-signalling.patch => 103-nanopi-r4s-sd-signalling.patch} (97%) rename target/linux/rockchip/patches-6.1/{107-mmc-core-set-initial-signal-voltage-on-power-off.patch => 501-mmc-core-set-initial-signal-voltage-on-power-off.patch} (100%) rename target/linux/rockchip/patches-6.1/{103-arm64-rockchip-add-OF-node-for-eth.patch => 603-arm64-rockchip-add-OF-node-for-eth.patch} (99%) diff --git a/target/linux/rockchip/patches-6.1/012-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch b/target/linux/rockchip/patches-6.1/001-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/012-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch rename to target/linux/rockchip/patches-6.1/001-v6.3-arm64-dts-rockchip-rk3328-Add-Orange-Pi-R1-Plus.patch diff --git a/target/linux/rockchip/patches-6.1/013-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch b/target/linux/rockchip/patches-6.1/002-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/013-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch rename to target/linux/rockchip/patches-6.1/002-v6.4-arm64-dts-rockchip-Add-FriendlyElec-Nanopi-R5S.patch diff --git a/target/linux/rockchip/patches-6.1/014-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch b/target/linux/rockchip/patches-6.1/003-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/014-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch rename to target/linux/rockchip/patches-6.1/003-v6.4-arm64-dts-rockchip-create-common-dtsi-for-NanoPi-R5-serie.patch diff --git a/target/linux/rockchip/patches-6.1/015-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch b/target/linux/rockchip/patches-6.1/004-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/015-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch rename to target/linux/rockchip/patches-6.1/004-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R5C.patch diff --git a/target/linux/rockchip/patches-6.1/016-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch b/target/linux/rockchip/patches-6.1/005-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/016-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch rename to target/linux/rockchip/patches-6.1/005-v6.4-arm64-dts-rockchip-fix-gmac-support-for-NanoPi-R5S.patch diff --git a/target/linux/rockchip/patches-6.1/017-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch b/target/linux/rockchip/patches-6.1/006-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/017-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch rename to target/linux/rockchip/patches-6.1/006-v6.4-arm64-dts-rockchip-remove-I2S1-TDM-node-for-the-NanoPi-R5.patch diff --git a/target/linux/rockchip/patches-6.1/018-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch b/target/linux/rockchip/patches-6.1/007-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/018-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch rename to target/linux/rockchip/patches-6.1/007-v6.4-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C.patch diff --git a/target/linux/rockchip/patches-6.1/019-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch b/target/linux/rockchip/patches-6.1/008-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/019-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch rename to target/linux/rockchip/patches-6.1/008-v6.4-arm64-dts-rockchip-Add-Xunlong-OrangePi-R1-Plus-LTS.patch diff --git a/target/linux/rockchip/patches-6.1/020-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch b/target/linux/rockchip/patches-6.1/009-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/020-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch rename to target/linux/rockchip/patches-6.1/009-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R66S.patch diff --git a/target/linux/rockchip/patches-6.1/021-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch b/target/linux/rockchip/patches-6.1/010-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/021-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch rename to target/linux/rockchip/patches-6.1/010-v6.5-arm64-dts-rockchip-Add-Lunzn-Fastrhino-R68S.patch diff --git a/target/linux/rockchip/patches-6.1/022-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch b/target/linux/rockchip/patches-6.1/011-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/022-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch rename to target/linux/rockchip/patches-6.1/011-v6.4-arm64-dts-rockchip-fix-button-reset-pin-for-nanopi-r5c.patch diff --git a/target/linux/rockchip/patches-6.1/023-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch b/target/linux/rockchip/patches-6.1/012-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/023-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch rename to target/linux/rockchip/patches-6.1/012-v6.5-arm64-dts-rockchip-Add-FriendlyARM-NanoPi-R2C-Plus.patch diff --git a/target/linux/rockchip/patches-6.1/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch b/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch similarity index 97% rename from target/linux/rockchip/patches-6.1/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch rename to target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch index 6434ef419a..a3e5072a71 100644 --- a/target/linux/rockchip/patches-6.1/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch +++ b/target/linux/rockchip/patches-6.1/101-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch @@ -14,7 +14,7 @@ Signed-off-by: David Bauer --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -156,6 +156,8 @@ +@@ -161,6 +161,8 @@ #size-cells = <0>; rtl8211e: ethernet-phy@1 { diff --git a/target/linux/rockchip/patches-6.1/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch rename to target/linux/rockchip/patches-6.1/102-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch diff --git a/target/linux/rockchip/patches-6.1/105-nanopi-r4s-sd-signalling.patch b/target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch similarity index 97% rename from target/linux/rockchip/patches-6.1/105-nanopi-r4s-sd-signalling.patch rename to target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch index 4ce8cd9fef..2cc00b96a3 100644 --- a/target/linux/rockchip/patches-6.1/105-nanopi-r4s-sd-signalling.patch +++ b/target/linux/rockchip/patches-6.1/103-nanopi-r4s-sd-signalling.patch @@ -22,7 +22,7 @@ Signed-off-by: David Bauer status = "okay"; --- a/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-nanopi-r4s.dts -@@ -132,6 +132,11 @@ +@@ -119,6 +119,11 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-6.1/107-mmc-core-set-initial-signal-voltage-on-power-off.patch b/target/linux/rockchip/patches-6.1/501-mmc-core-set-initial-signal-voltage-on-power-off.patch similarity index 100% rename from target/linux/rockchip/patches-6.1/107-mmc-core-set-initial-signal-voltage-on-power-off.patch rename to target/linux/rockchip/patches-6.1/501-mmc-core-set-initial-signal-voltage-on-power-off.patch diff --git a/target/linux/rockchip/patches-6.1/103-arm64-rockchip-add-OF-node-for-eth.patch b/target/linux/rockchip/patches-6.1/603-arm64-rockchip-add-OF-node-for-eth.patch similarity index 99% rename from target/linux/rockchip/patches-6.1/103-arm64-rockchip-add-OF-node-for-eth.patch rename to target/linux/rockchip/patches-6.1/603-arm64-rockchip-add-OF-node-for-eth.patch index a5995dc45a..03b6a817a2 100644 --- a/target/linux/rockchip/patches-6.1/103-arm64-rockchip-add-OF-node-for-eth.patch +++ b/target/linux/rockchip/patches-6.1/603-arm64-rockchip-add-OF-node-for-eth.patch @@ -24,7 +24,7 @@ Signed-off-by: David Bauer +}; --- a/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts -@@ -401,9 +401,11 @@ +@@ -405,9 +405,11 @@ #size-cells = <0>; /* Second port is for USB 3.0 */