diff --git a/patch/kernel/sunxi-dev/p-board-h6-add-THS.patch b/patch/kernel/sunxi-dev/p-board-h6-add-THS.patch index 1aec82190c..cfa8a78b1a 100644 --- a/patch/kernel/sunxi-dev/p-board-h6-add-THS.patch +++ b/patch/kernel/sunxi-dev/p-board-h6-add-THS.patch @@ -66,58 +66,6 @@ Signed-off-by: Icenowy Zheng drivers/nvmem/sunxi_sid.c | 6 ++++++ 2 files changed, 7 insertions(+) -diff --git a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt -index e319fe5e205a..332de580e321 100644 ---- a/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt -+++ b/Documentation/devicetree/bindings/nvmem/allwinner,sunxi-sid.txt -@@ -7,6 +7,7 @@ Required properties: - "allwinner,sun8i-a83t-sid" - "allwinner,sun8i-h3-sid" - "allwinner,sun50i-a64-sid" -+ "allwinner,sun50i-h6-sid" - - - reg: Should contain registers location and length - -diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c -index d020f89248fd..fa58c3574afa 100644 ---- a/drivers/nvmem/sunxi_sid.c -+++ b/drivers/nvmem/sunxi_sid.c -@@ -232,11 +232,17 @@ static const struct sunxi_sid_cfg sun50i_a64_cfg = { - .size = 0x100, - }; - -+static const struct sunxi_sid_cfg sun50i_h6_cfg = { -+ .value_offset = 0x200, -+ .size = 0x200, -+}; -+ - static const struct of_device_id sunxi_sid_of_match[] = { - { .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg }, - { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg }, - { .compatible = "allwinner,sun8i-h3-sid", .data = &sun8i_h3_cfg }, - { .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg }, -+ { .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg }, - {/* sentinel */}, - }; - MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); --- -2.17.1 - - -From de62065cf1b55e48049c44076500a32eac08fe2f Mon Sep 17 00:00:00 2001 -From: Icenowy Zheng -Date: Fri, 27 Jul 2018 16:24:18 +0800 -Subject: [PATCH 38/45] arm64: allwinner: dts: h6: add H6 SID device tree node - -The Allwinner H6 SoC has a SID like previous Allwinner SoCs. - -Add a device tree node for it. - -Signed-off-by: Icenowy Zheng ---- - arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 5 +++++ - 1 file changed, 5 insertions(+) - diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi index 1a8086476514..8e3c47c7c797 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -608,14 +556,6 @@ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/ index 8e3c47c7c797..cf125ebd1c7b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - - / { - interrupt-parent = <&gic>; @@ -177,6 +178,12 @@ sid: efuse@3006000 { compatible = "allwinner,sun50i-h6-sid";