From 03489fc1a4ac3312ba48fa44dcd217c1d485567e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 24 Jan 2021 00:14:42 +0800 Subject: [PATCH] rockchip: re-order patches Signed-off-by: CN_SZTL --- ...02-net-usb-r8152-add-LED-configuration-from-OF.patch} | 0 ...bindings-net-add-RTL8152-binding-documentation.patch} | 0 ...4-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch | 4 ++-- ...ip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch} | 0 ...rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch} | 0 ...> 007-arm64-dts-rockchip-Add-RK3328-idle-state.patch} | 5 ----- ...8-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch} | 9 ++------- ...ckchip-add-usb3-controller-node-for-RK3328-SoCs.patch | 2 +- ...c-core-set-initial-signal-voltage-on-power-off.patch} | 2 +- ...hip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch | 2 +- ...chip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch} | 0 ...dd-support-for-rockchip-hardware-random-number.patch} | 0 ...dts-rockchip-add-hardware-random-number-genera.patch} | 2 +- ...kernel-dma-adjust-default-coherent_pool-to-2MiB.patch | 2 +- ...dts-rockchip-add-more-cpu-operating-points-for.patch} | 2 +- ...ip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch} | 1 - 16 files changed, 10 insertions(+), 21 deletions(-) rename target/linux/rockchip/patches-5.4/{008-net-usb-r8152-add-LED-configuration-from-OF.patch => 002-net-usb-r8152-add-LED-configuration-from-OF.patch} (100%) rename target/linux/rockchip/patches-5.4/{009-dt-bindings-net-add-RTL8152-binding-documentation.patch => 003-dt-bindings-net-add-RTL8152-binding-documentation.patch} (100%) rename target/linux/rockchip/patches-5.4/{006-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch => 005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch} (100%) rename target/linux/rockchip/patches-5.4/{007-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch => 006-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch} (100%) rename target/linux/rockchip/patches-5.4/{005-arm64-dts-rockchip-Add-RK3328-idle-state.patch => 007-arm64-dts-rockchip-Add-RK3328-idle-state.patch} (92%) rename target/linux/rockchip/patches-5.4/{002-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch => 008-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch} (83%) rename target/linux/rockchip/patches-5.4/{108-mmc-core-set-initial-signal-voltage-on-power-off.patch => 105-mmc-core-set-initial-signal-voltage-on-power-off.patch} (95%) rename target/linux/rockchip/patches-5.4/{105-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch => 201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch} (100%) rename target/linux/rockchip/patches-5.4/{106-char-add-support-for-rockchip-hardware-random-number.patch => 801-char-add-support-for-rockchip-hardware-random-number.patch} (100%) rename target/linux/rockchip/patches-5.4/{107-arm64-dts-rockchip-add-hardware-random-number-genera.patch => 802-arm64-dts-rockchip-add-hardware-random-number-genera.patch} (98%) rename target/linux/rockchip/patches-5.4/{003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch => 991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch} (98%) rename target/linux/rockchip/patches-5.4/{991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch => 992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch} (99%) diff --git a/target/linux/rockchip/patches-5.4/008-net-usb-r8152-add-LED-configuration-from-OF.patch b/target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/008-net-usb-r8152-add-LED-configuration-from-OF.patch rename to target/linux/rockchip/patches-5.4/002-net-usb-r8152-add-LED-configuration-from-OF.patch diff --git a/target/linux/rockchip/patches-5.4/009-dt-bindings-net-add-RTL8152-binding-documentation.patch b/target/linux/rockchip/patches-5.4/003-dt-bindings-net-add-RTL8152-binding-documentation.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/009-dt-bindings-net-add-RTL8152-binding-documentation.patch rename to target/linux/rockchip/patches-5.4/003-dt-bindings-net-add-RTL8152-binding-documentation.patch diff --git a/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch b/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch index 8a33b4bc14..83ce8f1efb 100644 --- a/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch +++ b/target/linux/rockchip/patches-5.4/004-arm64-dts-rockchip-Add-txpbl-node-for-RK3399-RK3328.patch @@ -26,7 +26,7 @@ Signed-off-by: Heiko Stuebner --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -872,6 +872,7 @@ +@@ -857,6 +857,7 @@ resets = <&cru SRST_GMAC2IO_A>; reset-names = "stmmaceth"; rockchip,grf = <&grf>; @@ -34,7 +34,7 @@ Signed-off-by: Heiko Stuebner status = "disabled"; }; -@@ -893,6 +894,7 @@ +@@ -878,6 +879,7 @@ reset-names = "stmmaceth", "mac-phy"; phy-mode = "rmii"; phy-handle = <&phy>; diff --git a/target/linux/rockchip/patches-5.4/006-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch b/target/linux/rockchip/patches-5.4/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/006-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch rename to target/linux/rockchip/patches-5.4/005-rockchip-rk3328-add-compatible-to-NanoPi-R2S-etherne.patch diff --git a/target/linux/rockchip/patches-5.4/007-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch b/target/linux/rockchip/patches-5.4/006-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/007-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch rename to target/linux/rockchip/patches-5.4/006-rockchip-rk3328-fix-NanoPi-R2S-GMAC-clock-name.patch diff --git a/target/linux/rockchip/patches-5.4/005-arm64-dts-rockchip-Add-RK3328-idle-state.patch b/target/linux/rockchip/patches-5.4/007-arm64-dts-rockchip-Add-RK3328-idle-state.patch similarity index 92% rename from target/linux/rockchip/patches-5.4/005-arm64-dts-rockchip-Add-RK3328-idle-state.patch rename to target/linux/rockchip/patches-5.4/007-arm64-dts-rockchip-Add-RK3328-idle-state.patch index a65f04011c..874d4ddd44 100644 --- a/target/linux/rockchip/patches-5.4/005-arm64-dts-rockchip-Add-RK3328-idle-state.patch +++ b/target/linux/rockchip/patches-5.4/007-arm64-dts-rockchip-Add-RK3328-idle-state.patch @@ -14,8 +14,6 @@ Signed-off-by: Heiko Stuebner arch/arm64/boot/dts/rockchip/rk3328.dtsi | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) -diff --git a/arch/arm64/boot/dts/rockchip/rk3328.dtsi b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -index 91306ebed4da2..c9ff1188bd7b1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi @@ -41,6 +41,7 @@ @@ -69,6 +67,3 @@ index 91306ebed4da2..c9ff1188bd7b1 100644 l2: l2-cache0 { compatible = "cache"; }; --- -cgit 1.2.3-1.el7 - diff --git a/target/linux/rockchip/patches-5.4/002-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch b/target/linux/rockchip/patches-5.4/008-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch similarity index 83% rename from target/linux/rockchip/patches-5.4/002-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch rename to target/linux/rockchip/patches-5.4/008-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch index 5d0d6b3a37..7ea18e41ac 100644 --- a/target/linux/rockchip/patches-5.4/002-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch +++ b/target/linux/rockchip/patches-5.4/008-rockchip-add-hwmon-support-for-SoCs-and-GPUs.patch @@ -15,8 +15,6 @@ Link: https://lore.kernel.org/r/20191212061702.BFE2D6E85603@corona.crabdance.com drivers/thermal/rockchip_thermal.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) -diff --git a/drivers/thermal/rockchip_thermal.c b/drivers/thermal/rockchip_thermal.c -index 9ed8085bb7924..7c1a8bccdcba6 100644 --- a/drivers/thermal/rockchip_thermal.c +++ b/drivers/thermal/rockchip_thermal.c @@ -58,6 +58,8 @@ enum adc_sort_mode { @@ -28,7 +26,7 @@ index 9ed8085bb7924..7c1a8bccdcba6 100644 /** * The max sensors is two in rockchip SoCs. * Two sensors: CPU and GPU sensor. -@@ -1331,8 +1333,15 @@ static int rockchip_thermal_probe(struct platform_device *pdev) +@@ -1321,8 +1323,15 @@ static int rockchip_thermal_probe(struct thermal->chip->control(thermal->regs, true); @@ -45,7 +43,7 @@ index 9ed8085bb7924..7c1a8bccdcba6 100644 platform_set_drvdata(pdev, thermal); -@@ -1354,6 +1363,7 @@ static int rockchip_thermal_remove(struct platform_device *pdev) +@@ -1344,6 +1353,7 @@ static int rockchip_thermal_remove(struc for (i = 0; i < thermal->chip->chn_num; i++) { struct rockchip_thermal_sensor *sensor = &thermal->sensors[i]; @@ -53,6 +51,3 @@ index 9ed8085bb7924..7c1a8bccdcba6 100644 rockchip_thermal_toggle_sensor(sensor, false); } --- -cgit 1.2.3-1.el7 - diff --git a/target/linux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch b/target/linux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch index f6d5f518ec..621b25abca 100644 --- a/target/linux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch +++ b/target/linux/rockchip/patches-5.4/101-dts-rockchip-add-usb3-controller-node-for-RK3328-SoCs.patch @@ -26,7 +26,7 @@ use-case. You've been warned. --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -970,6 +970,33 @@ +@@ -955,6 +955,33 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.4/108-mmc-core-set-initial-signal-voltage-on-power-off.patch b/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch similarity index 95% rename from target/linux/rockchip/patches-5.4/108-mmc-core-set-initial-signal-voltage-on-power-off.patch rename to target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch index 6435cb4b01..6597ee4776 100644 --- a/target/linux/rockchip/patches-5.4/108-mmc-core-set-initial-signal-voltage-on-power-off.patch +++ b/target/linux/rockchip/patches-5.4/105-mmc-core-set-initial-signal-voltage-on-power-off.patch @@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c -@@ -1686,6 +1686,8 @@ void mmc_power_off(struct mmc_host *host) +@@ -1368,6 +1368,8 @@ void mmc_power_off(struct mmc_host *host mmc_pwrseq_power_off(host); diff --git a/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch b/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch index 9fb0b0eebe..70bc881c32 100644 --- a/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch +++ b/target/linux/rockchip/patches-5.4/200-rockchip-rk3399-Add-support-for-FriendlyARM-NanoPi-R.patch @@ -27,7 +27,7 @@ Signed-off-by: Marty Jones --- a/arch/arm64/boot/dts/rockchip/Makefile +++ b/arch/arm64/boot/dts/rockchip/Makefile -@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb +@@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-le dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb diff --git a/target/linux/rockchip/patches-5.4/105-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch b/target/linux/rockchip/patches-5.4/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/105-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch rename to target/linux/rockchip/patches-5.4/201-rockchip-rk3328-add-i2c0-controller-for-nanopi-r2s.patch diff --git a/target/linux/rockchip/patches-5.4/106-char-add-support-for-rockchip-hardware-random-number.patch b/target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch similarity index 100% rename from target/linux/rockchip/patches-5.4/106-char-add-support-for-rockchip-hardware-random-number.patch rename to target/linux/rockchip/patches-5.4/801-char-add-support-for-rockchip-hardware-random-number.patch diff --git a/target/linux/rockchip/patches-5.4/107-arm64-dts-rockchip-add-hardware-random-number-genera.patch b/target/linux/rockchip/patches-5.4/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch similarity index 98% rename from target/linux/rockchip/patches-5.4/107-arm64-dts-rockchip-add-hardware-random-number-genera.patch rename to target/linux/rockchip/patches-5.4/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch index 3e21ee2e74..970e798f5b 100644 --- a/target/linux/rockchip/patches-5.4/107-arm64-dts-rockchip-add-hardware-random-number-genera.patch +++ b/target/linux/rockchip/patches-5.4/802-arm64-dts-rockchip-add-hardware-random-number-genera.patch @@ -11,7 +11,7 @@ Signed-off-by: wevsty --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -279,6 +279,17 @@ +@@ -264,6 +264,17 @@ status = "disabled"; }; diff --git a/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch b/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch index d39618c0b2..c870a4f74c 100644 --- a/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch +++ b/target/linux/rockchip/patches-5.4/911-kernel-dma-adjust-default-coherent_pool-to-2MiB.patch @@ -9,7 +9,7 @@ Subject: [PATCH] kernel: dma: adjust default coherent_pool to 2MiB --- a/kernel/dma/remap.c +++ b/kernel/dma/remap.c -@@ -101,7 +101,7 @@ void dma_common_free_remap(void *cpu_addr, size_t size) +@@ -101,7 +101,7 @@ void dma_common_free_remap(void *cpu_add #ifdef CONFIG_DMA_DIRECT_REMAP static struct gen_pool *atomic_pool __ro_after_init; diff --git a/target/linux/rockchip/patches-5.4/003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch b/target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch similarity index 98% rename from target/linux/rockchip/patches-5.4/003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch rename to target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch index ead32d360e..818ee4ce1d 100644 --- a/target/linux/rockchip/patches-5.4/003-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch +++ b/target/linux/rockchip/patches-5.4/991-arm64-dts-rockchip-add-more-cpu-operating-points-for.patch @@ -20,7 +20,7 @@ Signed-off-by: Leonidas P. Papadakos --- a/arch/arm64/boot/dts/rockchip/rk3328.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3328.dtsi -@@ -123,6 +123,21 @@ +@@ -140,6 +140,21 @@ opp-microvolt = <1300000>; clock-latency-ns = <40000>; }; diff --git a/target/linux/rockchip/patches-5.4/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch b/target/linux/rockchip/patches-5.4/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch similarity index 99% rename from target/linux/rockchip/patches-5.4/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch rename to target/linux/rockchip/patches-5.4/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch index 25cb7a5537..9d393c5771 100644 --- a/target/linux/rockchip/patches-5.4/991-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch +++ b/target/linux/rockchip/patches-5.4/992-rockchip-rk3399-overclock-to-2.2-1.8-GHz-for-NanoPi4.patch @@ -184,4 +184,3 @@ Co-authored-by: gzelvis / { chosen { -