mirror/openwrt
1
0
Fork 0
mirror of https://git.openwrt.org/openwrt/openwrt.git synced 2024-10-19 14:08:17 +02:00
Code Issues

ipq806x: refresh 5.10 patches

Browse Source 
make target/linux/kernel refresh

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This commit is contained in:
Ansuel Smith 2021-03-03 23:01:37 +01:00 committed by Petr Štetiar
parent d079c8fa48
commit db2c147cf4
24 changed files with 93 additions and 181 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
target/linux/ipq806x/patches-5.10/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
View File

@ -33,8 +33,8 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -318,7 +318,7 @@ config ARCH_MULTIPLATFORM @@ -321,7 +321,7 @@ config ARCH_MULTIPLATFORM
depends on MMU select ARCH_SELECT_MEMORY_MODEL
select ARM_HAS_SG_CHAIN select ARM_HAS_SG_CHAIN
select ARM_PATCH_PHYS_VIRT select ARM_PATCH_PHYS_VIRT
- select AUTO_ZRELADDR - select AUTO_ZRELADDR
@ -44,7 +44,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS
--- a/arch/arm/Makefile --- a/arch/arm/Makefile
+++ b/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -258,9 +258,11 @@ MACHINE := arch/arm/mach-$(word 1,$(mac @@ -251,9 +251,11 @@ MACHINE := arch/arm/mach-$(word 1,$(mac
else else
MACHINE := MACHINE :=
endif endif

2
target/linux/ipq806x/patches-5.10/0065-arm-override-compiler-flags.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/Makefile --- a/arch/arm/Makefile
+++ b/arch/arm/Makefile +++ b/arch/arm/Makefile
@@ -67,7 +67,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i @@ -61,7 +61,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-i
# macro, but instead defines a whole series of macros which makes # macro, but instead defines a whole series of macros which makes
# testing for a specific architecture or later rather impossible. # testing for a specific architecture or later rather impossible.
arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m

4
target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/arch/arm/boot/dts/Makefile --- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile
@@ -843,6 +843,20 @@ dtb-$(CONFIG_ARCH_QCOM) += \ @@ -909,6 +909,20 @@ dtb-$(CONFIG_ARCH_QCOM) += \
qcom-ipq4019-ap.dk07.1-c2.dtb \ qcom-ipq4019-ap.dk07.1-c2.dtb \
qcom-ipq8064-ap148.dtb \ qcom-ipq8064-ap148.dtb \
qcom-ipq8064-rb3011.dtb \ qcom-ipq8064-rb3011.dtb \
+ qcom-ipq8064-c2600.dtb \ + qcom-ipq8064-c2600.dtb \
+ qcom-ipq8064-d7800.dtb \ + qcom-ipq8064-d7800.dtb \
+ qcom-ipq8064-db149.dtb \ + qcom-ipq8064-db149.dtb \

2
target/linux/ipq806x/patches-5.10/0072-add-ipq806x-with-no-clocks.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/firmware/qcom_scm.c --- a/drivers/firmware/qcom_scm.c
+++ b/drivers/firmware/qcom_scm.c +++ b/drivers/firmware/qcom_scm.c
@@ -598,6 +598,7 @@ static const struct of_device_id qcom_sc @@ -1265,6 +1265,7 @@ static const struct of_device_id qcom_sc
SCM_HAS_BUS_CLK) SCM_HAS_BUS_CLK)
}, },
{ .compatible = "qcom,scm-ipq4019" }, { .compatible = "qcom,scm-ipq4019" },

29
target/linux/ipq806x/patches-5.10/082-ipq8064-dtsi-tweaks.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -20,9 +20,9 @@ @@ -20,7 +20,7 @@
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
@ -9,9 +9,7 @@
compatible = "qcom,krait"; compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1"; enable-method = "qcom,kpss-acc-v1";
device_type = "cpu"; device_type = "cpu";
reg = <1>; @@ -30,7 +30,7 @@
next-level-cache = <&L2>;
@@ -30,9 +30,9 @@
qcom,saw = <&saw0>; qcom,saw = <&saw0>;
}; };
@ -20,8 +18,6 @@
compatible = "qcom,krait"; compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1"; enable-method = "qcom,kpss-acc-v1";
device_type = "cpu"; device_type = "cpu";
reg = <1>;
next-level-cache = <&L2>;
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
no-map; no-map;
}; };
@ -39,7 +35,7 @@
#interrupt-cells = <2>; #interrupt-cells = <2>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>; interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;
@@ -155,6 +155,7 @@ @@ -155,6 +156,7 @@
function = "pcie3_rst"; function = "pcie3_rst";
drive-strength = <12>; drive-strength = <12>;
bias-disable; bias-disable;
@ -47,7 +43,7 @@
}; };
}; };
@@ -190,6 +190,7 @@ @@ -190,6 +192,7 @@
intc: interrupt-controller@2000000 { intc: interrupt-controller@2000000 {
compatible = "qcom,msm-qgic2"; compatible = "qcom,msm-qgic2";
interrupt-controller; interrupt-controller;
@ -55,7 +51,7 @@
#interrupt-cells = <3>; #interrupt-cells = <3>;
reg = <0x02000000 0x1000>, reg = <0x02000000 0x1000>,
<0x02002000 0x1000>; <0x02002000 0x1000>;
@@ -219,21 +220,23 @@ @@ -219,21 +222,23 @@
acc0: clock-controller@2088000 { acc0: clock-controller@2088000 {
compatible = "qcom,kpss-acc-v1"; compatible = "qcom,kpss-acc-v1";
reg = <0x02088000 0x1000>, <0x02008000 0x1000>; reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
@ -81,7 +77,7 @@
reg = <0x02099000 0x1000>, <0x02009000 0x1000>; reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
regulator; regulator;
}; };
@@ -251,7 +254,7 @@ @@ -251,7 +256,7 @@
syscon-tcsr = <&tcsr>; syscon-tcsr = <&tcsr>;
@ -90,7 +86,7 @@
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x12490000 0x1000>, reg = <0x12490000 0x1000>,
<0x12480000 0x1000>; <0x12480000 0x1000>;
@@ -326,7 +329,7 @@ @@ -326,7 +331,7 @@
syscon-tcsr = <&tcsr>; syscon-tcsr = <&tcsr>;
@ -99,7 +95,7 @@
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm"; compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x1a240000 0x1000>, reg = <0x1a240000 0x1000>,
<0x1a200000 0x1000>; <0x1a200000 0x1000>;
@@ -397,7 +400,7 @@ @@ -397,7 +402,7 @@
status = "disabled"; status = "disabled";
}; };
@ -108,7 +104,7 @@
compatible = "qcom,ipq806x-ahci", "generic-ahci"; compatible = "qcom,ipq806x-ahci", "generic-ahci";
reg = <0x29000000 0x180>; reg = <0x29000000 0x180>;
@@ -430,6 +430,16 @@ qfprom: qfprom@700000 { @@ -430,13 +435,35 @@
reg = <0x00700000 0x1000>; reg = <0x00700000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
@ -124,9 +120,6 @@
+ }; + };
}; };
gcc: clock-controller@900000 {
@@ -437,9 +447,21 @@ gcc: clock-controller@900000 {
gcc: clock-controller@900000 { gcc: clock-controller@900000 {
- compatible = "qcom,gcc-ipq8064"; - compatible = "qcom,gcc-ipq8064";
+ compatible = "qcom,gcc-ipq8064", "syscon"; + compatible = "qcom,gcc-ipq8064", "syscon";
@ -148,7 +141,7 @@
}; };
tcsr: syscon@1a400000 { tcsr: syscon@1a400000 {
@@ -625,13 +629,13 @@ @@ -740,13 +767,13 @@
qcom,ee = <0>; qcom,ee = <0>;
}; };
@ -165,7 +158,7 @@
status = "disabled"; status = "disabled";
compatible = "arm,pl18x", "arm,primecell"; compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>; arm,primecell-periphid = <0x00051180>;
@@ -645,13 +649,12 @@ @@ -760,13 +787,12 @@
non-removable; non-removable;
cap-sd-highspeed; cap-sd-highspeed;
cap-mmc-highspeed; cap-mmc-highspeed;

46
target/linux/ipq806x/patches-5.10/083-ipq8064-dtsi-additions.patch
View File

@ -26,16 +26,10 @@
}; };
cpu1: cpu@1 { cpu1: cpu@1 {
@@ -47,17 +47,350 @@ @@ -38,14 +50,347 @@
enable-method = "qcom,kpss-acc-v1"; next-level-cache = <&L2>;
device_type = "cpu"; qcom,acc = <&acc1>;
reg = <1>; qcom,saw = <&saw1>;
- next-level-cache = <&L2>;
- qcom,acc = <&acc1>;
- qcom,saw = <&saw1>;
+ next-level-cache = <&L2>;
+ qcom,acc = <&acc1>;
+ qcom,saw = <&saw1>;
+ clocks = <&kraitcc 1>, <&kraitcc 4>; + clocks = <&kraitcc 1>, <&kraitcc 4>;
+ clock-names = "cpu", "l2"; + clock-names = "cpu", "l2";
+ clock-latency = <100000>; + clock-latency = <100000>;
@ -84,9 +78,9 @@
+ opp-microvolt = <1150000>; + opp-microvolt = <1150000>;
+ clock-latency-ns = <100000>; + clock-latency-ns = <100000>;
+ opp-level = <2>; + opp-level = <2>;
+ }; };
+ }; };
+
+ opp_table0: opp_table0 { + opp_table0: opp_table0 {
+ compatible = "operating-points-v2-kryo-cpu"; + compatible = "operating-points-v2-kryo-cpu";
+ nvmem-cells = <&speedbin_efuse>; + nvmem-cells = <&speedbin_efuse>;
@ -155,9 +149,9 @@
+ opp-supported-hw = <0x1>; + opp-supported-hw = <0x1>;
+ clock-latency-ns = <100000>; + clock-latency-ns = <100000>;
+ opp-level = <2>; + opp-level = <2>;
}; + };
}; + };
+
+ thermal-zones { + thermal-zones {
+ tsens_tz_sensor0 { + tsens_tz_sensor0 {
+ polling-delay-passive = <0>; + polling-delay-passive = <0>;
@ -383,7 +377,7 @@
memory { memory {
device_type = "memory"; device_type = "memory";
reg = <0x0 0x0>; reg = <0x0 0x0>;
@@ -93,6 +552,15 @@ @@ -93,6 +438,15 @@
}; };
}; };
@ -399,7 +393,7 @@
firmware { firmware {
scm { scm {
compatible = "qcom,scm-ipq806x", "qcom,scm"; compatible = "qcom,scm-ipq806x", "qcom,scm";
@@ -120,6 +588,78 @@ @@ -120,6 +474,78 @@
reg-names = "lpass-lpaif"; reg-names = "lpass-lpaif";
}; };
@ -478,7 +472,7 @@
qcom_pinmux: pinmux@800000 { qcom_pinmux: pinmux@800000 {
compatible = "qcom,ipq8064-pinctrl"; compatible = "qcom,ipq8064-pinctrl";
reg = <0x800000 0x4000>; reg = <0x800000 0x4000>;
@@ -159,6 +705,15 @@ @@ -160,6 +586,15 @@
}; };
}; };
@ -494,7 +488,7 @@
spi_pins: spi_pins { spi_pins: spi_pins {
mux { mux {
pins = "gpio18", "gpio19", "gpio21"; pins = "gpio18", "gpio19", "gpio21";
@@ -168,6 +723,53 @@ @@ -169,6 +604,53 @@
}; };
}; };
@ -548,7 +542,7 @@
leds_pins: leds_pins { leds_pins: leds_pins {
mux { mux {
pins = "gpio7", "gpio8", "gpio9", pins = "gpio7", "gpio8", "gpio9",
@@ -229,6 +831,17 @@ @@ -231,6 +713,17 @@
clock-output-names = "acpu1_aux"; clock-output-names = "acpu1_aux";
}; };
@ -566,7 +560,7 @@
saw0: regulator@2089000 { saw0: regulator@2089000 {
compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon"; compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
reg = <0x02089000 0x1000>, <0x02009000 0x1000>; reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
@@ -241,6 +854,17 @@ @@ -243,6 +736,17 @@
regulator; regulator;
}; };
@ -584,7 +578,7 @@
gsbi2: gsbi@12480000 { gsbi2: gsbi@12480000 {
compatible = "qcom,gsbi-v1.0.0"; compatible = "qcom,gsbi-v1.0.0";
cell-index = <2>; cell-index = <2>;
@@ -448,6 +1081,95 @@ @@ -478,6 +982,95 @@
#reset-cells = <1>; #reset-cells = <1>;
}; };
@ -680,8 +674,8 @@
pcie0: pci@1b500000 { pcie0: pci@1b500000 {
compatible = "qcom,pcie-ipq8064"; compatible = "qcom,pcie-ipq8064";
reg = <0x1b500000 0x1000 reg = <0x1b500000 0x1000
@@ -601,6 +1323,59 @@ @@ -739,6 +1332,59 @@
perst-gpio = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>; status = "disabled";
}; };
+ adm_dma: dma@18300000 { + adm_dma: dma@18300000 {
@ -740,7 +734,7 @@
vsdcc_fixed: vsdcc-regulator { vsdcc_fixed: vsdcc-regulator {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
regulator-name = "SDCC Power"; regulator-name = "SDCC Power";
@@ -676,4 +1559,17 @@ @@ -814,4 +1460,17 @@
}; };
}; };
}; };

6
target/linux/ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch
View File

@ -1,8 +1,6 @@
diff --git a/qcom-ipq8064-rb3011.dts.orig b/qcom-ipq8064-rb3011.dts
index 282b89ce3d..4faaa95b33 100644
--- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts --- a/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
+++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts +++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
@@ -24,73 +24,6 @@ memory@0 { @@ -24,73 +24,6 @@
device_type = "memory"; device_type = "memory";
}; };
@ -76,7 +74,7 @@ index 282b89ce3d..4faaa95b33 100644
mdio1: mdio@1 { mdio1: mdio@1 {
status = "okay"; status = "okay";
compatible = "virtual,mdio-gpio"; compatible = "virtual,mdio-gpio";
@@ -216,6 +149,68 @@ led@7 { @@ -216,6 +149,68 @@
}; };
}; };

9
target/linux/ipq806x/patches-5.10/093-drivers-cpufreq-qcom-cpufreq-nvmem-support-specific-.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++++++++++++ drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++++++++++++
1 file changed, 15 insertions(+) 1 file changed, 15 insertions(+)
diff --git a/drivers/cpufreq/qcom-cpufreq-nvmem.c b/drivers/cpufreq/qcom-cpufreq-nvmem.c
index d1744b5d9619..4866c74ead0f 100644
--- a/drivers/cpufreq/qcom-cpufreq-nvmem.c --- a/drivers/cpufreq/qcom-cpufreq-nvmem.c
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c +++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
@@ -52,6 +52,7 @@ struct qcom_cpufreq_match_data { @@ -52,6 +52,7 @@ struct qcom_cpufreq_match_data {
@ -23,7 +21,7 @@ index d1744b5d9619..4866c74ead0f 100644
}; };
struct qcom_cpufreq_drv { struct qcom_cpufreq_drv {
@@ -250,6 +251,7 @@ static const struct qcom_cpufreq_match_data match_data_kryo = { @@ -250,6 +251,7 @@ static const struct qcom_cpufreq_match_d
static const struct qcom_cpufreq_match_data match_data_krait = { static const struct qcom_cpufreq_match_data match_data_krait = {
.get_version = qcom_cpufreq_krait_name_version, .get_version = qcom_cpufreq_krait_name_version,
@ -31,7 +29,7 @@ index d1744b5d9619..4866c74ead0f 100644
}; };
static const char *qcs404_genpd_names[] = { "cpr", NULL }; static const char *qcs404_genpd_names[] = { "cpr", NULL };
@@ -385,6 +387,19 @@ static int qcom_cpufreq_probe(struct platform_device *pdev) @@ -385,6 +387,19 @@ static int qcom_cpufreq_probe(struct pla
} }
} }
@ -51,6 +49,3 @@ index d1744b5d9619..4866c74ead0f 100644
cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1, cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1,
NULL, 0); NULL, 0);
if (!IS_ERR(cpufreq_dt_pdev)) { if (!IS_ERR(cpufreq_dt_pdev)) {
--
2.29.2

13
target/linux/ipq806x/patches-5.10/097-1-ipq806x-gcc-add-missing-clk-flag.patch
View File

@ -15,8 +15,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
drivers/clk/qcom/gcc-ipq806x.c | 19 +++++++++++++------ drivers/clk/qcom/gcc-ipq806x.c | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-) 1 file changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
index d6b7adb4be38..fbb8644c4a43 100644
--- a/drivers/clk/qcom/gcc-ipq806x.c --- a/drivers/clk/qcom/gcc-ipq806x.c
+++ b/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c
@@ -65,6 +65,7 @@ static struct clk_pll pll3 = { @@ -65,6 +65,7 @@ static struct clk_pll pll3 = {
@ -36,7 +34,7 @@ index d6b7adb4be38..fbb8644c4a43 100644
}, },
}, },
}; };
@@ -798,7 +799,7 @@ static struct clk_branch gsbi4_qup_clk = { @@ -798,7 +799,7 @@ static struct clk_branch gsbi4_qup_clk =
.parent_names = (const char *[]){ "gsbi4_qup_src" }, .parent_names = (const char *[]){ "gsbi4_qup_src" },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
@ -54,7 +52,7 @@ index d6b7adb4be38..fbb8644c4a43 100644
}, },
}, },
}; };
@@ -945,7 +946,7 @@ static struct clk_branch gsbi7_qup_clk = { @@ -945,7 +946,7 @@ static struct clk_branch gsbi7_qup_clk =
.parent_names = (const char *[]){ "gsbi7_qup_src" }, .parent_names = (const char *[]){ "gsbi7_qup_src" },
.num_parents = 1, .num_parents = 1,
.ops = &clk_branch_ops, .ops = &clk_branch_ops,
@ -95,7 +93,7 @@ index d6b7adb4be38..fbb8644c4a43 100644
}, },
} }
}; };
@@ -2694,7 +2699,8 @@ static struct clk_dyn_rcg ubi32_core1_src_clk = { @@ -2694,7 +2699,8 @@ static struct clk_dyn_rcg ubi32_core1_sr
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_names = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
@ -105,7 +103,7 @@ index d6b7adb4be38..fbb8644c4a43 100644
}, },
}, },
}; };
@@ -2747,7 +2753,8 @@ static struct clk_dyn_rcg ubi32_core2_src_clk = { @@ -2747,7 +2753,8 @@ static struct clk_dyn_rcg ubi32_core2_sr
.parent_names = gcc_pxo_pll8_pll14_pll18_pll0, .parent_names = gcc_pxo_pll8_pll14_pll18_pll0,
.num_parents = 5, .num_parents = 5,
.ops = &clk_dyn_rcg_ops, .ops = &clk_dyn_rcg_ops,
@ -115,6 +113,3 @@ index d6b7adb4be38..fbb8644c4a43 100644
}, },
}, },
}; };
--
2.29.2

9
target/linux/ipq806x/patches-5.10/097-2-ipq806x-lcc-add-missing-reset.patch
View File

@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
include/dt-bindings/clock/qcom,lcc-ipq806x.h | 1 + include/dt-bindings/clock/qcom,lcc-ipq806x.h | 1 +
2 files changed, 9 insertions(+) 2 files changed, 9 insertions(+)
diff --git a/drivers/clk/qcom/lcc-ipq806x.c b/drivers/clk/qcom/lcc-ipq806x.c
index 1a2be4aeb31d..ee48642bb872 100644
--- a/drivers/clk/qcom/lcc-ipq806x.c --- a/drivers/clk/qcom/lcc-ipq806x.c
+++ b/drivers/clk/qcom/lcc-ipq806x.c +++ b/drivers/clk/qcom/lcc-ipq806x.c
@@ -12,6 +12,7 @@ @@ -12,6 +12,7 @@
@ -42,7 +40,7 @@ index 1a2be4aeb31d..ee48642bb872 100644
static const struct pll_config pll4_config = { static const struct pll_config pll4_config = {
.l = 0xf, .l = 0xf,
.m = 0x91, .m = 0x91,
@@ -417,6 +423,8 @@ static const struct qcom_cc_desc lcc_ipq806x_desc = { @@ -417,6 +423,8 @@ static const struct qcom_cc_desc lcc_ipq
.config = &lcc_ipq806x_regmap_config, .config = &lcc_ipq806x_regmap_config,
.clks = lcc_ipq806x_clks, .clks = lcc_ipq806x_clks,
.num_clks = ARRAY_SIZE(lcc_ipq806x_clks), .num_clks = ARRAY_SIZE(lcc_ipq806x_clks),
@ -51,8 +49,6 @@ index 1a2be4aeb31d..ee48642bb872 100644
}; };
static const struct of_device_id lcc_ipq806x_match_table[] = { static const struct of_device_id lcc_ipq806x_match_table[] = {
diff --git a/include/dt-bindings/clock/qcom,lcc-ipq806x.h b/include/dt-bindings/clock/qcom,lcc-ipq806x.h
index 25b92bbf0ab4..73318b1ce29e 100644
--- a/include/dt-bindings/clock/qcom,lcc-ipq806x.h --- a/include/dt-bindings/clock/qcom,lcc-ipq806x.h
+++ b/include/dt-bindings/clock/qcom,lcc-ipq806x.h +++ b/include/dt-bindings/clock/qcom,lcc-ipq806x.h
@@ -19,4 +19,5 @@ @@ -19,4 +19,5 @@
@ -61,6 +57,3 @@ index 25b92bbf0ab4..73318b1ce29e 100644
+#define LCC_PCM_RESET 0 +#define LCC_PCM_RESET 0
#endif #endif
--
2.29.2

7
target/linux/ipq806x/patches-5.10/097-3-clk-qcom-krait-add-missing-enable-disable.patch
View File

@ -11,11 +11,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
drivers/clk/qcom/clk-krait.c | 27 +++++++++++++++++++++++++-- drivers/clk/qcom/clk-krait.c | 27 +++++++++++++++++++++++++--
1 file changed, 25 insertions(+), 2 deletions(-) 1 file changed, 25 insertions(+), 2 deletions(-)
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c
index 59f1af415b58..ba796b621669 100644
--- a/drivers/clk/qcom/clk-krait.c --- a/drivers/clk/qcom/clk-krait.c
+++ b/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c
@@ -68,7 +68,25 @@ static u8 krait_mux_get_parent(struct clk_hw *hw) @@ -68,7 +68,25 @@ static u8 krait_mux_get_parent(struct cl
return clk_mux_val_to_index(hw, mux->parent_map, 0, sel); return clk_mux_val_to_index(hw, mux->parent_map, 0, sel);
} }
@ -57,6 +55,3 @@ index 59f1af415b58..ba796b621669 100644
} }
static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate, static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate,
--
2.29.2

23
target/linux/ipq806x/patches-5.10/097-4-ipq806x-gcc-add-missing-clk-and-reset-for-crypto-eng.patch
View File

@ -13,8 +13,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
include/dt-bindings/reset/qcom,gcc-ipq806x.h | 5 + include/dt-bindings/reset/qcom,gcc-ipq806x.h | 5 +
3 files changed, 259 insertions(+), 1 deletion(-) 3 files changed, 259 insertions(+), 1 deletion(-)
diff --git a/drivers/clk/qcom/gcc-ipq806x.c b/drivers/clk/qcom/gcc-ipq806x.c
index fbb8644c4a43..c36bcdf013d0 100644
--- a/drivers/clk/qcom/gcc-ipq806x.c --- a/drivers/clk/qcom/gcc-ipq806x.c
+++ b/drivers/clk/qcom/gcc-ipq806x.c +++ b/drivers/clk/qcom/gcc-ipq806x.c
@@ -223,7 +223,9 @@ static struct clk_regmap pll14_vote = { @@ -223,7 +223,9 @@ static struct clk_regmap pll14_vote = {
@ -58,7 +56,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
}; };
static const struct parent_map gcc_pxo_pll8_map[] = { static const struct parent_map gcc_pxo_pll8_map[] = {
@@ -320,6 +339,42 @@ static const char * const gcc_pxo_pll8_pll14_pll18_pll0[] = { @@ -320,6 +339,42 @@ static const char * const gcc_pxo_pll8_p
"pll18", "pll18",
}; };
@ -101,7 +99,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
static struct freq_tbl clk_tbl_gsbi_uart[] = { static struct freq_tbl clk_tbl_gsbi_uart[] = {
{ 1843200, P_PLL8, 2, 6, 625 }, { 1843200, P_PLL8, 2, 6, 625 },
{ 3686400, P_PLL8, 2, 12, 625 }, { 3686400, P_PLL8, 2, 12, 625 },
@@ -1261,6 +1316,7 @@ static const struct freq_tbl clk_tbl_sdc[] = { @@ -1261,6 +1316,7 @@ static const struct freq_tbl clk_tbl_sdc
{ 20210000, P_PLL8, 1, 1, 19 }, { 20210000, P_PLL8, 1, 1, 19 },
{ 24000000, P_PLL8, 4, 1, 4 }, { 24000000, P_PLL8, 4, 1, 4 },
{ 48000000, P_PLL8, 4, 1, 2 }, { 48000000, P_PLL8, 4, 1, 2 },
@ -109,7 +107,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
{ 64000000, P_PLL8, 3, 1, 2 }, { 64000000, P_PLL8, 3, 1, 2 },
{ 96000000, P_PLL8, 4, 0, 0 }, { 96000000, P_PLL8, 4, 0, 0 },
{ 192000000, P_PLL8, 2, 0, 0 }, { 192000000, P_PLL8, 2, 0, 0 },
@@ -2647,7 +2703,9 @@ static const struct freq_tbl clk_tbl_nss[] = { @@ -2647,7 +2703,9 @@ static const struct freq_tbl clk_tbl_nss
{ 110000000, P_PLL18, 1, 1, 5 }, { 110000000, P_PLL18, 1, 1, 5 },
{ 275000000, P_PLL18, 2, 0, 0 }, { 275000000, P_PLL18, 2, 0, 0 },
{ 550000000, P_PLL18, 1, 0, 0 }, { 550000000, P_PLL18, 1, 0, 0 },
@ -119,7 +117,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
{ } { }
}; };
@@ -2759,6 +2817,186 @@ static struct clk_dyn_rcg ubi32_core2_src_clk = { @@ -2759,6 +2817,186 @@ static struct clk_dyn_rcg ubi32_core2_sr
}, },
}; };
@ -306,7 +304,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
static struct clk_regmap *gcc_ipq806x_clks[] = { static struct clk_regmap *gcc_ipq806x_clks[] = {
[PLL0] = &pll0.clkr, [PLL0] = &pll0.clkr,
[PLL0_VOTE] = &pll0_vote, [PLL0_VOTE] = &pll0_vote,
@@ -2766,6 +3004,7 @@ static struct clk_regmap *gcc_ipq806x_clks[] = { @@ -2766,6 +3004,7 @@ static struct clk_regmap *gcc_ipq806x_cl
[PLL4_VOTE] = &pll4_vote, [PLL4_VOTE] = &pll4_vote,
[PLL8] = &pll8.clkr, [PLL8] = &pll8.clkr,
[PLL8_VOTE] = &pll8_vote, [PLL8_VOTE] = &pll8_vote,
@ -314,7 +312,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
[PLL14] = &pll14.clkr, [PLL14] = &pll14.clkr,
[PLL14_VOTE] = &pll14_vote, [PLL14_VOTE] = &pll14_vote,
[PLL18] = &pll18.clkr, [PLL18] = &pll18.clkr,
@@ -2880,6 +3119,12 @@ static struct clk_regmap *gcc_ipq806x_clks[] = { @@ -2880,6 +3119,12 @@ static struct clk_regmap *gcc_ipq806x_cl
[PLL9] = &hfpll0.clkr, [PLL9] = &hfpll0.clkr,
[PLL10] = &hfpll1.clkr, [PLL10] = &hfpll1.clkr,
[PLL12] = &hfpll_l2.clkr, [PLL12] = &hfpll_l2.clkr,
@ -327,7 +325,7 @@ index fbb8644c4a43..c36bcdf013d0 100644
}; };
static const struct qcom_reset_map gcc_ipq806x_resets[] = { static const struct qcom_reset_map gcc_ipq806x_resets[] = {
@@ -3011,6 +3256,11 @@ static const struct qcom_reset_map gcc_ipq806x_resets[] = { @@ -3011,6 +3256,11 @@ static const struct qcom_reset_map gcc_i
[GMAC_CORE3_RESET] = { 0x3cfc, 0 }, [GMAC_CORE3_RESET] = { 0x3cfc, 0 },
[GMAC_CORE4_RESET] = { 0x3d1c, 0 }, [GMAC_CORE4_RESET] = { 0x3d1c, 0 },
[GMAC_AHB_RESET] = { 0x3e24, 0 }, [GMAC_AHB_RESET] = { 0x3e24, 0 },
@ -339,8 +337,6 @@ index fbb8644c4a43..c36bcdf013d0 100644
[NSS_CH0_RST_RX_CLK_N_RESET] = { 0x3b60, 0 }, [NSS_CH0_RST_RX_CLK_N_RESET] = { 0x3b60, 0 },
[NSS_CH0_RST_TX_CLK_N_RESET] = { 0x3b60, 1 }, [NSS_CH0_RST_TX_CLK_N_RESET] = { 0x3b60, 1 },
[NSS_CH0_RST_RX_125M_N_RESET] = { 0x3b60, 2 }, [NSS_CH0_RST_RX_125M_N_RESET] = { 0x3b60, 2 },
diff --git a/include/dt-bindings/clock/qcom,gcc-ipq806x.h b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
index 7deec14a6dee..02262d2ac899 100644
--- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h --- a/include/dt-bindings/clock/qcom,gcc-ipq806x.h
+++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h +++ b/include/dt-bindings/clock/qcom,gcc-ipq806x.h
@@ -240,7 +240,7 @@ @@ -240,7 +240,7 @@
@ -361,8 +357,6 @@ index 7deec14a6dee..02262d2ac899 100644
+#define CE5_CORE_CLK_SRC 287 +#define CE5_CORE_CLK_SRC 287
#endif #endif
diff --git a/include/dt-bindings/reset/qcom,gcc-ipq806x.h b/include/dt-bindings/reset/qcom,gcc-ipq806x.h
index 26b6f9200620..020c9cf18751 100644
--- a/include/dt-bindings/reset/qcom,gcc-ipq806x.h --- a/include/dt-bindings/reset/qcom,gcc-ipq806x.h
+++ b/include/dt-bindings/reset/qcom,gcc-ipq806x.h +++ b/include/dt-bindings/reset/qcom,gcc-ipq806x.h
@@ -163,5 +163,10 @@ @@ -163,5 +163,10 @@
@ -376,6 +370,3 @@ index 26b6f9200620..020c9cf18751 100644
+#define CRYPTO_AHB_RESET 161 +#define CRYPTO_AHB_RESET 161
#endif #endif
--
2.29.2

6
target/linux/ipq806x/patches-5.10/098-2-Documentation-cpufreq-add-qcom-krait-cpufreq-binding.patch
View File

@ -11,9 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
1 file changed, 221 insertions(+) 1 file changed, 221 insertions(+)
create mode 100644 Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml create mode 100644 Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml
diff --git a/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml
new file mode 100644
index 000000000000..f6bcca863d9a
--- /dev/null --- /dev/null
+++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml +++ b/Documentation/devicetree/bindings/cpufreq/qcom-cpufreq-krait.yaml
@@ -0,0 +1,221 @@ @@ -0,0 +1,221 @@
@ -238,6 +235,3 @@ index 000000000000..f6bcca863d9a
+ }; + };
+ +
+... +...
--
2.29.2

2
target/linux/ipq806x/patches-5.10/098-3-add-fab-scaling-support-with-cpufreq.patch
View File

@ -227,7 +227,7 @@
#include "cpufreq-dt.h" #include "cpufreq-dt.h"
@@ -58,6 +59,13 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index) @@ -54,6 +55,13 @@ static int set_target(struct cpufreq_pol
level = dev_pm_opp_get_level(opp); level = dev_pm_opp_get_level(opp);
dev_pm_opp_put(opp); dev_pm_opp_put(opp);

46
target/linux/ipq806x/patches-5.10/099-1-mtd-nand-raw-qcom_nandc-add-boot_layout_mode-support.patch
View File

@ -14,11 +14,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
drivers/mtd/nand/raw/qcom_nandc.c | 82 +++++++++++++++++++++++++++++-- drivers/mtd/nand/raw/qcom_nandc.c | 82 +++++++++++++++++++++++++++++--
1 file changed, 77 insertions(+), 5 deletions(-) 1 file changed, 77 insertions(+), 5 deletions(-)
diff --git a/drivers/mtd/nand/raw/qcom_nandc.c b/drivers/mtd/nand/raw/qcom_nandc.c
index 667e4bfe369f..69be86898d7a 100644
--- a/drivers/mtd/nand/raw/qcom_nandc.c --- a/drivers/mtd/nand/raw/qcom_nandc.c
+++ b/drivers/mtd/nand/raw/qcom_nandc.c +++ b/drivers/mtd/nand/raw/qcom_nandc.c
@@ -160,6 +160,11 @@ @@ -159,6 +159,11 @@
/* NAND_CTRL bits */ /* NAND_CTRL bits */
#define BAM_MODE_EN BIT(0) #define BAM_MODE_EN BIT(0)
@ -30,7 +28,7 @@ index 667e4bfe369f..69be86898d7a 100644
/* /*
* the NAND controller performs reads/writes with ECC in 516 byte chunks. * the NAND controller performs reads/writes with ECC in 516 byte chunks.
* the driver calls the chunks 'step' or 'codeword' interchangeably * the driver calls the chunks 'step' or 'codeword' interchangeably
@@ -431,6 +436,13 @@ struct qcom_nand_controller { @@ -430,6 +435,13 @@ struct qcom_nand_controller {
* @cfg0, cfg1, cfg0_raw..: NANDc register configurations needed for * @cfg0, cfg1, cfg0_raw..: NANDc register configurations needed for
* ecc/non-ecc mode for the current nand flash * ecc/non-ecc mode for the current nand flash
* device * device
@ -44,7 +42,7 @@ index 667e4bfe369f..69be86898d7a 100644
*/ */
struct qcom_nand_host { struct qcom_nand_host {
struct nand_chip chip; struct nand_chip chip;
@@ -453,6 +465,9 @@ struct qcom_nand_host { @@ -452,6 +464,9 @@ struct qcom_nand_host {
u32 ecc_bch_cfg; u32 ecc_bch_cfg;
u32 clrflashstatus; u32 clrflashstatus;
u32 clrreadstatus; u32 clrreadstatus;
@ -54,7 +52,7 @@ index 667e4bfe369f..69be86898d7a 100644
}; };
/* /*
@@ -462,6 +477,7 @@ struct qcom_nand_host { @@ -460,12 +475,14 @@ struct qcom_nand_host {
* @ecc_modes - ecc mode for NAND * @ecc_modes - ecc mode for NAND
* @is_bam - whether NAND controller is using BAM * @is_bam - whether NAND controller is using BAM
* @is_qpic - whether NAND CTRL is part of qpic IP * @is_qpic - whether NAND CTRL is part of qpic IP
@ -62,15 +60,14 @@ index 667e4bfe369f..69be86898d7a 100644
* @dev_cmd_reg_start - NAND_DEV_CMD_* registers starting offset * @dev_cmd_reg_start - NAND_DEV_CMD_* registers starting offset
*/ */
struct qcom_nandc_props { struct qcom_nandc_props {
@@ -469,6 +485,7 @@ struct qcom_nandc_props { u32 ecc_modes;
bool is_bam; bool is_bam;
bool is_qpic; bool is_qpic;
+ bool has_boot_pages; + bool has_boot_pages;
u32 dev_cmd_reg_start; u32 dev_cmd_reg_start;
}; };
/* Frees the BAM transaction memory */ @@ -1604,7 +1621,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *
@@ -1622,7 +1639,7 @@ qcom_nandc_read_cw_raw(struct mtd_info *mtd, struct nand_chip *chip,
data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1); data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1);
oob_size1 = host->bbm_size; oob_size1 = host->bbm_size;
@ -79,7 +76,7 @@ index 667e4bfe369f..69be86898d7a 100644
data_size2 = ecc->size - data_size1 - data_size2 = ecc->size - data_size1 -
((ecc->steps - 1) * 4); ((ecc->steps - 1) * 4);
oob_size2 = (ecc->steps * 4) + host->ecc_bytes_hw + oob_size2 = (ecc->steps * 4) + host->ecc_bytes_hw +
@@ -1703,7 +1720,7 @@ check_for_erased_page(struct qcom_nand_host *host, u8 *data_buf, @@ -1685,7 +1702,7 @@ check_for_erased_page(struct qcom_nand_h
} }
for_each_set_bit(cw, &uncorrectable_cws, ecc->steps) { for_each_set_bit(cw, &uncorrectable_cws, ecc->steps) {
@ -88,7 +85,7 @@ index 667e4bfe369f..69be86898d7a 100644
data_size = ecc->size - ((ecc->steps - 1) * 4); data_size = ecc->size - ((ecc->steps - 1) * 4);
oob_size = (ecc->steps * 4) + host->ecc_bytes_hw; oob_size = (ecc->steps * 4) + host->ecc_bytes_hw;
} else { } else {
@@ -1862,7 +1879,7 @@ static int read_page_ecc(struct qcom_nand_host *host, u8 *data_buf, @@ -1844,7 +1861,7 @@ static int read_page_ecc(struct qcom_nan
for (i = 0; i < ecc->steps; i++) { for (i = 0; i < ecc->steps; i++) {
int data_size, oob_size; int data_size, oob_size;
@ -97,7 +94,7 @@ index 667e4bfe369f..69be86898d7a 100644
data_size = ecc->size - ((ecc->steps - 1) << 2); data_size = ecc->size - ((ecc->steps - 1) << 2);
oob_size = (ecc->steps << 2) + host->ecc_bytes_hw + oob_size = (ecc->steps << 2) + host->ecc_bytes_hw +
host->spare_bytes; host->spare_bytes;
@@ -1959,6 +1976,30 @@ static int copy_last_cw(struct qcom_nand_host *host, int page) @@ -1941,6 +1958,30 @@ static int copy_last_cw(struct qcom_nand
return ret; return ret;
} }
@ -128,7 +125,7 @@ index 667e4bfe369f..69be86898d7a 100644
/* implements ecc->read_page() */ /* implements ecc->read_page() */
static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf, static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf,
int oob_required, int page) int oob_required, int page)
@@ -1967,6 +2008,9 @@ static int qcom_nandc_read_page(struct nand_chip *chip, uint8_t *buf, @@ -1949,6 +1990,9 @@ static int qcom_nandc_read_page(struct n
struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
u8 *data_buf, *oob_buf = NULL; u8 *data_buf, *oob_buf = NULL;
@ -138,7 +135,7 @@ index 667e4bfe369f..69be86898d7a 100644
nand_read_page_op(chip, page, 0, NULL, 0); nand_read_page_op(chip, page, 0, NULL, 0);
data_buf = buf; data_buf = buf;
oob_buf = oob_required ? chip->oob_poi : NULL; oob_buf = oob_required ? chip->oob_poi : NULL;
@@ -1986,6 +2030,9 @@ static int qcom_nandc_read_page_raw(struct nand_chip *chip, uint8_t *buf, @@ -1968,6 +2012,9 @@ static int qcom_nandc_read_page_raw(stru
int cw, ret; int cw, ret;
u8 *data_buf = buf, *oob_buf = chip->oob_poi; u8 *data_buf = buf, *oob_buf = chip->oob_poi;
@ -148,7 +145,7 @@ index 667e4bfe369f..69be86898d7a 100644
for (cw = 0; cw < ecc->steps; cw++) { for (cw = 0; cw < ecc->steps; cw++) {
ret = qcom_nandc_read_cw_raw(mtd, chip, data_buf, oob_buf, ret = qcom_nandc_read_cw_raw(mtd, chip, data_buf, oob_buf,
page, cw); page, cw);
@@ -2006,6 +2053,9 @@ static int qcom_nandc_read_oob(struct nand_chip *chip, int page) @@ -1988,6 +2035,9 @@ static int qcom_nandc_read_oob(struct na
struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip); struct qcom_nand_controller *nandc = get_qcom_nand_controller(chip);
struct nand_ecc_ctrl *ecc = &chip->ecc; struct nand_ecc_ctrl *ecc = &chip->ecc;
@ -158,7 +155,7 @@ index 667e4bfe369f..69be86898d7a 100644
clear_read_regs(nandc); clear_read_regs(nandc);
clear_bam_transaction(nandc); clear_bam_transaction(nandc);
@@ -2026,6 +2076,9 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf, @@ -2008,6 +2058,9 @@ static int qcom_nandc_write_page(struct
u8 *data_buf, *oob_buf; u8 *data_buf, *oob_buf;
int i, ret; int i, ret;
@ -168,7 +165,7 @@ index 667e4bfe369f..69be86898d7a 100644
nand_prog_page_begin_op(chip, page, 0, NULL, 0); nand_prog_page_begin_op(chip, page, 0, NULL, 0);
clear_read_regs(nandc); clear_read_regs(nandc);
@@ -2041,7 +2094,7 @@ static int qcom_nandc_write_page(struct nand_chip *chip, const uint8_t *buf, @@ -2023,7 +2076,7 @@ static int qcom_nandc_write_page(struct
for (i = 0; i < ecc->steps; i++) { for (i = 0; i < ecc->steps; i++) {
int data_size, oob_size; int data_size, oob_size;
@ -177,7 +174,7 @@ index 667e4bfe369f..69be86898d7a 100644
data_size = ecc->size - ((ecc->steps - 1) << 2); data_size = ecc->size - ((ecc->steps - 1) << 2);
oob_size = (ecc->steps << 2) + host->ecc_bytes_hw + oob_size = (ecc->steps << 2) + host->ecc_bytes_hw +
host->spare_bytes; host->spare_bytes;
@@ -2098,6 +2151,9 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip, @@ -2080,6 +2133,9 @@ static int qcom_nandc_write_page_raw(str
u8 *data_buf, *oob_buf; u8 *data_buf, *oob_buf;
int i, ret; int i, ret;
@ -187,7 +184,7 @@ index 667e4bfe369f..69be86898d7a 100644
nand_prog_page_begin_op(chip, page, 0, NULL, 0); nand_prog_page_begin_op(chip, page, 0, NULL, 0);
clear_read_regs(nandc); clear_read_regs(nandc);
clear_bam_transaction(nandc); clear_bam_transaction(nandc);
@@ -2116,7 +2172,7 @@ static int qcom_nandc_write_page_raw(struct nand_chip *chip, @@ -2098,7 +2154,7 @@ static int qcom_nandc_write_page_raw(str
data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1); data_size1 = mtd->writesize - host->cw_size * (ecc->steps - 1);
oob_size1 = host->bbm_size; oob_size1 = host->bbm_size;
@ -196,7 +193,7 @@ index 667e4bfe369f..69be86898d7a 100644
data_size2 = ecc->size - data_size1 - data_size2 = ecc->size - data_size1 -
((ecc->steps - 1) << 2); ((ecc->steps - 1) << 2);
oob_size2 = (ecc->steps << 2) + host->ecc_bytes_hw + oob_size2 = (ecc->steps << 2) + host->ecc_bytes_hw +
@@ -2176,6 +2232,9 @@ static int qcom_nandc_write_oob(struct nand_chip *chip, int page) @@ -2158,6 +2214,9 @@ static int qcom_nandc_write_oob(struct n
int data_size, oob_size; int data_size, oob_size;
int ret; int ret;
@ -206,7 +203,7 @@ index 667e4bfe369f..69be86898d7a 100644
host->use_ecc = true; host->use_ecc = true;
clear_bam_transaction(nandc); clear_bam_transaction(nandc);
@@ -2828,6 +2887,7 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, @@ -2806,6 +2865,7 @@ static int qcom_nand_host_init_and_regis
struct nand_chip *chip = &host->chip; struct nand_chip *chip = &host->chip;
struct mtd_info *mtd = nand_to_mtd(chip); struct mtd_info *mtd = nand_to_mtd(chip);
struct device *dev = nandc->dev; struct device *dev = nandc->dev;
@ -214,7 +211,7 @@ index 667e4bfe369f..69be86898d7a 100644
int ret; int ret;
ret = of_property_read_u32(dn, "reg", &host->cs); ret = of_property_read_u32(dn, "reg", &host->cs);
@@ -2888,6 +2948,17 @@ static int qcom_nand_host_init_and_register(struct qcom_nand_controller *nandc, @@ -2866,6 +2926,17 @@ static int qcom_nand_host_init_and_regis
if (ret) if (ret)
nand_cleanup(chip); nand_cleanup(chip);
@ -232,7 +229,7 @@ index 667e4bfe369f..69be86898d7a 100644
return ret; return ret;
} }
@@ -3057,6 +3128,7 @@ static int qcom_nandc_remove(struct platform_device *pdev) @@ -3035,6 +3106,7 @@ static int qcom_nandc_remove(struct plat
static const struct qcom_nandc_props ipq806x_nandc_props = { static const struct qcom_nandc_props ipq806x_nandc_props = {
.ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT), .ecc_modes = (ECC_RS_4BIT | ECC_BCH_8BIT),
.is_bam = false, .is_bam = false,
@ -240,6 +237,3 @@ index 667e4bfe369f..69be86898d7a 100644
.dev_cmd_reg_start = 0x0, .dev_cmd_reg_start = 0x0,
}; };
--
2.29.2

9
target/linux/ipq806x/patches-5.10/099-2-Documentation-devicetree-mtd-qcom_nandc-document-qco.patch
View File

@ -12,11 +12,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
Documentation/devicetree/bindings/mtd/qcom_nandc.txt | 11 +++++++++++ Documentation/devicetree/bindings/mtd/qcom_nandc.txt | 11 +++++++++++
1 file changed, 11 insertions(+) 1 file changed, 11 insertions(+)
diff --git a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
index 5647913d8837..3cf1dd5ebad2 100644
--- a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt --- a/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
+++ b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt +++ b/Documentation/devicetree/bindings/mtd/qcom_nandc.txt
@@ -56,6 +56,15 @@ Optional properties: @@ -52,6 +52,15 @@ Optional properties:
be used according to chip requirement and available be used according to chip requirement and available
OOB size. OOB size.
@ -32,7 +30,7 @@ index 5647913d8837..3cf1dd5ebad2 100644
Each nandcs device node may optionally contain a 'partitions' sub-node, which Each nandcs device node may optionally contain a 'partitions' sub-node, which
further contains sub-nodes describing the flash partition mapping. See further contains sub-nodes describing the flash partition mapping. See
partition.txt for more detail. partition.txt for more detail.
@@ -84,6 +93,9 @@ nand-controller@1ac00000 { @@ -80,6 +89,9 @@ nand-controller@1ac00000 {
nand-ecc-strength = <4>; nand-ecc-strength = <4>;
nand-bus-width = <8>; nand-bus-width = <8>;
@ -42,6 +40,3 @@ index 5647913d8837..3cf1dd5ebad2 100644
partitions { partitions {
compatible = "fixed-partitions"; compatible = "fixed-partitions";
#address-cells = <1>; #address-cells = <1>;
--
2.29.2

10
target/linux/ipq806x/patches-5.10/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
View File

@ -31,8 +31,6 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
3 files changed, 915 insertions(+) 3 files changed, 915 insertions(+)
create mode 100644 drivers/dma/qcom/qcom_adm.c create mode 100644 drivers/dma/qcom/qcom_adm.c
diff --git a/drivers/dma/qcom/Kconfig b/drivers/dma/qcom/Kconfig
index 3bcb689162c67..0389d60d2604a 100644
--- a/drivers/dma/qcom/Kconfig --- a/drivers/dma/qcom/Kconfig
+++ b/drivers/dma/qcom/Kconfig +++ b/drivers/dma/qcom/Kconfig
@@ -1,4 +1,15 @@ @@ -1,4 +1,15 @@
@ -51,8 +49,6 @@ index 3bcb689162c67..0389d60d2604a 100644
config QCOM_BAM_DMA config QCOM_BAM_DMA
tristate "QCOM BAM DMA support" tristate "QCOM BAM DMA support"
depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM) depends on ARCH_QCOM || (COMPILE_TEST && OF && ARM)
diff --git a/drivers/dma/qcom/Makefile b/drivers/dma/qcom/Makefile
index 1ae92da88b0c9..346e643fbb6db 100644
--- a/drivers/dma/qcom/Makefile --- a/drivers/dma/qcom/Makefile
+++ b/drivers/dma/qcom/Makefile +++ b/drivers/dma/qcom/Makefile
@@ -1,4 +1,5 @@ @@ -1,4 +1,5 @@
@ -61,9 +57,6 @@ index 1ae92da88b0c9..346e643fbb6db 100644
obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o
obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.o obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.o
hdma_mgmt-objs := hidma_mgmt.o hidma_mgmt_sys.o hdma_mgmt-objs := hidma_mgmt.o hidma_mgmt_sys.o
diff --git a/drivers/dma/qcom/qcom_adm.c b/drivers/dma/qcom/qcom_adm.c
new file mode 100644
index 0000000000000..9b6f8e050ecce
--- /dev/null --- /dev/null
+++ b/drivers/dma/qcom/qcom_adm.c +++ b/drivers/dma/qcom/qcom_adm.c
@@ -0,0 +1,903 @@ @@ -0,0 +1,903 @@
@ -970,6 +963,3 @@ index 0000000000000..9b6f8e050ecce
+MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>"); +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
+MODULE_DESCRIPTION("QCOM ADM DMA engine driver"); +MODULE_DESCRIPTION("QCOM ADM DMA engine driver");
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
--
cgit 1.2.3-1.el7

20
target/linux/ipq806x/patches-5.10/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
View File

@ -17,15 +17,12 @@ Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-3-manivannan.sadha
3 files changed, 179 insertions(+) 3 files changed, 179 insertions(+)
create mode 100644 drivers/mtd/parsers/qcomsmempart.c create mode 100644 drivers/mtd/parsers/qcomsmempart.c
diff --git a/drivers/mtd/parsers/Kconfig b/drivers/mtd/parsers/Kconfig
index e72354322f628..d90c302290522 100644
--- a/drivers/mtd/parsers/Kconfig --- a/drivers/mtd/parsers/Kconfig
+++ b/drivers/mtd/parsers/Kconfig +++ b/drivers/mtd/parsers/Kconfig
@@ -160,6 +160,14 @@ config MTD_REDBOOT_PARTS_READONLY @@ -186,6 +186,14 @@ config MTD_REDBOOT_PARTS_READONLY
'FIS directory' images, enable this option.
endif # MTD_REDBOOT_PARTS endif # MTD_REDBOOT_PARTS
+
+config MTD_QCOMSMEM_PARTS +config MTD_QCOMSMEM_PARTS
+ tristate "Qualcomm SMEM NAND flash partition parser" + tristate "Qualcomm SMEM NAND flash partition parser"
+ depends on MTD_NAND_QCOM || COMPILE_TEST + depends on MTD_NAND_QCOM || COMPILE_TEST
@ -33,22 +30,18 @@ index e72354322f628..d90c302290522 100644
+ help + help
+ This provides support for parsing partitions from Shared Memory (SMEM) + This provides support for parsing partitions from Shared Memory (SMEM)
+ for NAND flash on Qualcomm platforms. + for NAND flash on Qualcomm platforms.
+
config MTD_ROUTERBOOT_PARTS config MTD_ROUTERBOOT_PARTS
tristate "RouterBoot flash partition parser" tristate "RouterBoot flash partition parser"
diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile depends on MTD && OF
index b0c5f62f9e858..50eb0b0a22105 100644
--- a/drivers/mtd/parsers/Makefile --- a/drivers/mtd/parsers/Makefile
+++ b/drivers/mtd/parsers/Makefile +++ b/drivers/mtd/parsers/Makefile
@@ -9,4 +9,5 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o @@ -12,4 +12,5 @@ obj-$(CONFIG_MTD_AFS_PARTS) += afs.o
obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o obj-$(CONFIG_MTD_PARSER_TRX) += parser_trx.o
obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o obj-$(CONFIG_MTD_SHARPSL_PARTS) += sharpslpart.o
obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
+obj-$(CONFIG_MTD_QCOMSMEM_PARTS) += qcomsmempart.o +obj-$(CONFIG_MTD_QCOMSMEM_PARTS) += qcomsmempart.o
obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o obj-$(CONFIG_MTD_ROUTERBOOT_PARTS) += routerbootpart.o
diff --git a/drivers/mtd/parsers/qcomsmempart.c b/drivers/mtd/parsers/qcomsmempart.c
new file mode 100644
index 0000000000000..808cb33d71f8e
--- /dev/null --- /dev/null
+++ b/drivers/mtd/parsers/qcomsmempart.c +++ b/drivers/mtd/parsers/qcomsmempart.c
@@ -0,0 +1,170 @@ @@ -0,0 +1,170 @@
@ -222,6 +215,3 @@ index 0000000000000..808cb33d71f8e
+MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>"); +MODULE_AUTHOR("Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>");
+MODULE_DESCRIPTION("Qualcomm SMEM NAND flash partition parser"); +MODULE_DESCRIPTION("Qualcomm SMEM NAND flash partition parser");
--
cgit 1.2.3-1.el7

2
target/linux/ipq806x/patches-5.10/102-mtd-rootfs-conflicts-with-OpenWrt-auto-mounting.patch
View File

@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>
--- a/drivers/mtd/parsers/qcomsmempart.c --- a/drivers/mtd/parsers/qcomsmempart.c
+++ b/drivers/mtd/parsers/qcomsmempart.c +++ b/drivers/mtd/parsers/qcomsmempart.c
@@ -189,6 +189,11 @@ static int parse_qcomsmem_part(st @@ -132,6 +132,11 @@ static int parse_qcomsmem_part(struct mt
parts[i].offset = le32_to_cpu(pentry->offset) * mtd->erasesize; parts[i].offset = le32_to_cpu(pentry->offset) * mtd->erasesize;
parts[i].mask_flags = pentry->attr; parts[i].mask_flags = pentry->attr;
parts[i].size = le32_to_cpu(pentry->length) * mtd->erasesize; parts[i].size = le32_to_cpu(pentry->length) * mtd->erasesize;

7
target/linux/ipq806x/patches-5.10/103-arm-Enlarge-IO_SPACE_LIMIT-needed-for-some-SoC.patch
View File

@ -12,11 +12,9 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
arch/arm/include/asm/io.h | 2 +- arch/arm/include/asm/io.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/include/asm/io.h b/arch/arm/include/asm/io.h
index fc748122f1e0..6f3e89f08bd8 100644
--- a/arch/arm/include/asm/io.h --- a/arch/arm/include/asm/io.h
+++ b/arch/arm/include/asm/io.h +++ b/arch/arm/include/asm/io.h
@@ -197,7 +197,7 @@ void __iomem *pci_remap_cfgspace(resource_size_t res_cookie, size_t size); @@ -197,7 +197,7 @@ void __iomem *pci_remap_cfgspace(resourc
#ifdef CONFIG_NEED_MACH_IO_H #ifdef CONFIG_NEED_MACH_IO_H
#include <mach/io.h> #include <mach/io.h>
#elif defined(CONFIG_PCI) #elif defined(CONFIG_PCI)
@ -25,6 +23,3 @@ index fc748122f1e0..6f3e89f08bd8 100644
#define __io(a) __typesafe_io(PCI_IO_VIRT_BASE + ((a) & IO_SPACE_LIMIT)) #define __io(a) __typesafe_io(PCI_IO_VIRT_BASE + ((a) & IO_SPACE_LIMIT))
#else #else
#define __io(a) __typesafe_io((a) & IO_SPACE_LIMIT) #define __io(a) __typesafe_io((a) & IO_SPACE_LIMIT)
--
2.30.0

8
target/linux/ipq806x/patches-5.10/850-soc-add-qualcomm-syscon.patch
View File

@ -2,17 +2,17 @@ From: Christian Lamparter <chunkeey@googlemail.com>
Subject: SoC: add qualcomm syscon Subject: SoC: add qualcomm syscon
--- a/drivers/soc/qcom/Makefile --- a/drivers/soc/qcom/Makefile
+++ b/drivers/soc/qcom/Makefile +++ b/drivers/soc/qcom/Makefile
@@ -20,6 +20,7 @@ obj-$(CONFIG_QCOM_SMP2P) += smp2p.o @@ -21,6 +21,7 @@ obj-$(CONFIG_QCOM_SMP2P) += smp2p.o
obj-$(CONFIG_QCOM_SMSM) += smsm.o obj-$(CONFIG_QCOM_SMSM) += smsm.o
obj-$(CONFIG_QCOM_SOCINFO) += socinfo.o obj-$(CONFIG_QCOM_SOCINFO) += socinfo.o
obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o obj-$(CONFIG_QCOM_WCNSS_CTRL) += wcnss_ctrl.o
+obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o +obj-$(CONFIG_QCOM_TCSR) += qcom_tcsr.o
obj-$(CONFIG_QCOM_APR) += apr.o obj-$(CONFIG_QCOM_APR) += apr.o
obj-$(CONFIG_QCOM_LLCC) += llcc-slice.o obj-$(CONFIG_QCOM_LLCC) += llcc-qcom.o
obj-$(CONFIG_QCOM_SDM845_LLCC) += llcc-sdm845.o obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o
--- a/drivers/soc/qcom/Kconfig --- a/drivers/soc/qcom/Kconfig
+++ b/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig
@@ -183,6 +183,13 @@ config QCOM_SOCINFO @@ -189,6 +189,13 @@ config QCOM_SOCINFO
Say yes here to support the Qualcomm socinfo driver, providing Say yes here to support the Qualcomm socinfo driver, providing
information about the SoC to user space. information about the SoC to user space.

2
target/linux/ipq806x/patches-5.10/851-add-gsbi1-dts.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/boot/dts/qcom-ipq8064.dtsi --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi
+++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi
@@ -865,6 +865,41 @@ @@ -747,6 +747,41 @@
reg = <0x12100000 0x10000>; reg = <0x12100000 0x10000>;
}; };

4
target/linux/ipq806x/patches-5.10/900-arm-add-cmdline-override.patch
View File

@ -1,6 +1,6 @@
--- a/arch/arm/Kconfig --- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1840,6 +1840,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL @@ -1793,6 +1793,14 @@ config ARM_ATAG_DTB_COMPAT_CMDLINE_MANGL
endchoice endchoice
@ -17,7 +17,7 @@
default "" default ""
--- a/drivers/of/fdt.c --- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c +++ b/drivers/of/fdt.c
@@ -1060,6 +1060,17 @@ int __init early_init_dt_scan_chosen(uns @@ -1056,6 +1056,17 @@ int __init early_init_dt_scan_chosen(uns
if (p != NULL && l > 0) if (p != NULL && l > 0)
strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); strlcpy(data, p, min(l, COMMAND_LINE_SIZE));

2
target/linux/ipq806x/patches-5.10/997-device_tree_cmdline.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/of/fdt.c --- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c +++ b/drivers/of/fdt.c
@@ -1059,6 +1059,9 @@ int __init early_init_dt_scan_chosen(uns @@ -1055,6 +1055,9 @@ int __init early_init_dt_scan_chosen(uns
p = of_get_flat_dt_prop(node, "bootargs", &l); p = of_get_flat_dt_prop(node, "bootargs", &l);
if (p != NULL && l > 0) if (p != NULL && l > 0)
strlcpy(data, p, min(l, COMMAND_LINE_SIZE)); strlcpy(data, p, min(l, COMMAND_LINE_SIZE));