From 62146879954ccde7ea1c6f39a1d56c2d24628852 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sun, 6 Dec 2020 09:40:12 +0100 Subject: [PATCH 1/5] missing new line break at file end --- .../h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch | 3 ++- .../h616_005_Add-support-for-the-Allwinner-H616-CCU.patch | 2 +- .../h616_006_add-support-for-A100-mmc-controller.patch | 3 ++- .../sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch | 2 +- patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch | 1 - 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch index 3464d0cc52..8d5f29edb8 100644 --- a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch +++ b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch @@ -93,4 +93,5 @@ index 782117dc0b28..128302696ca1 100644 +#define CLK_NUMBER_H6 (CLK_W1 + 1) +#define CLK_NUMBER_H616 (CLK_IR + 1) - #endif /* _CCU_SUN50I_H6_R_H */ \ No newline at end of file + #endif /* _CCU_SUN50I_H6_R_H */ + \ No newline at end of file diff --git a/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch b/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch index 8dc9502988..488d3cee3e 100644 --- a/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch +++ b/patch/kernel/sunxi-dev/h616_005_Add-support-for-the-Allwinner-H616-CCU.patch @@ -1421,4 +1421,4 @@ index 000000000000..1c992cfbbbab +#define RST_BUS_HDCP 55 +#define RST_BUS_KEYADC 56 + -+#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */ \ No newline at end of file ++#endif /* _DT_BINDINGS_RESET_SUN50I_H616_H_ */ diff --git a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch index 2210c3ffb7..d48e8c260f 100644 --- a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch +++ b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch @@ -63,4 +63,5 @@ index fc62773602ec..1518b64112b7 100644 + { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, { /* sentinel */ } - }; \ No newline at end of file + }; + \ No newline at end of file diff --git a/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch b/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch index 19a7d2d8f3..32bf647160 100644 --- a/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch +++ b/patch/kernel/sunxi-dev/h616_007_Add-Allwinner-H616-.dtsi-file.patch @@ -707,4 +707,4 @@ index 000000000000..dcffbfdcd26b + #size-cells = <0>; + }; + }; -+}; \ No newline at end of file ++}; diff --git a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch index c9289c3406..54b2600a96 100644 --- a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch +++ b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch @@ -35,4 +35,3 @@ index a8dbc3e3e..efab65ae9 100644 MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match); -- Created with Armbian build tools https://github.com/armbian/build - From 20cd5c9cbfe9fc011554e18b8d0f37b4852ebae9 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sun, 6 Dec 2020 09:56:24 +0100 Subject: [PATCH 2/5] remove whitespace --- .../h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch | 1 - .../sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch | 1 - 2 files changed, 2 deletions(-) diff --git a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch index 8d5f29edb8..f7bfe45706 100644 --- a/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch +++ b/patch/kernel/sunxi-dev/h616_004_Add-support-for-the-Allwinner-H616-R-CCU.patch @@ -94,4 +94,3 @@ index 782117dc0b28..128302696ca1 100644 +#define CLK_NUMBER_H616 (CLK_IR + 1) #endif /* _CCU_SUN50I_H6_R_H */ - \ No newline at end of file diff --git a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch index d48e8c260f..2235f9bb77 100644 --- a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch +++ b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch @@ -64,4 +64,3 @@ index fc62773602ec..1518b64112b7 100644 + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, { /* sentinel */ } }; - \ No newline at end of file From 23d80b18e43332e05fe68e6e8fb8158e6046db19 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sun, 6 Dec 2020 10:20:46 +0100 Subject: [PATCH 3/5] fix 006 --- .../h616_006_add-support-for-A100-mmc-controller.patch | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch index 2235f9bb77..f6ececb3b9 100644 --- a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch +++ b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch @@ -56,10 +56,11 @@ index fc62773602ec..1518b64112b7 100644 static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible = "allwinner,sun4i-a10-mmc", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun5i-a13-mmc", .data = &sun5i_a13_cfg }, -@@ -1186,6 +1206,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = { +@@ -1186,6 +1207,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = { { .compatible = "allwinner,sun9i-a80-mmc", .data = &sun9i_a80_cfg }, { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, + { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg }, + { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, { /* sentinel */ } From 0b46f9ae2cd024dbe60012bec30dbdf257d55997 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sun, 6 Dec 2020 10:24:01 +0100 Subject: [PATCH 4/5] remove fix for fix --- .../sunxi-dev/h616_999_fix-broken-hunks.patch | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch index 54b2600a96..4d258492bd 100644 --- a/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch +++ b/patch/kernel/sunxi-dev/h616_999_fix-broken-hunks.patch @@ -20,18 +20,5 @@ index d3eab3b57..e71c04a80 100644 +dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h616-orangepi-zero2.dtb subdir-y := $(dts-dirs) overlay -diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c -index a8dbc3e3e..efab65ae9 100644 ---- a/drivers/mmc/host/sunxi-mmc.c -+++ b/drivers/mmc/host/sunxi-mmc.c -@@ -1220,6 +1220,8 @@ static const struct of_device_id sunxi_mmc_of_match[] = { - { .compatible = "allwinner,sun50i-a64-mmc", .data = &sun50i_a64_cfg }, - { .compatible = "allwinner,sun50i-a64-emmc", .data = &sun50i_a64_emmc_cfg }, - { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg }, -+ { .compatible = "allwinner,sun50i-a100-mmc", .data = &sun50i_a100_cfg }, -+ { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, - { /* sentinel */ } - }; - MODULE_DEVICE_TABLE(of, sunxi_mmc_of_match); -- Created with Armbian build tools https://github.com/armbian/build From efba3da8a4bdcf352fbbb4e16e73aa5f149375ed Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Sun, 6 Dec 2020 10:31:29 +0100 Subject: [PATCH 5/5] add modification notice --- .../h616_006_add-support-for-A100-mmc-controller.patch | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch index f6ececb3b9..d64103470c 100644 --- a/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch +++ b/patch/kernel/sunxi-dev/h616_006_add-support-for-A100-mmc-controller.patch @@ -65,3 +65,10 @@ index fc62773602ec..1518b64112b7 100644 + { .compatible = "allwinner,sun50i-a100-emmc", .data = &sun50i_a100_emmc_cfg }, { /* sentinel */ } }; +-- + +# Note +# This patch has been modified to allow proper applying. +# The line +# { .compatible = "allwinner,sun50i-h5-emmc", .data = &sun50i_h5_emmc_cfg }, +# as been added to compensate for another patch applied before this one. \ No newline at end of file