Skip to content

Commit

Permalink
ipq806x: refresh 5.10 patches
Browse files Browse the repository at this point in the history 
make target/linux/kernel refresh

Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  • Loading branch information
@Ansuel @ynezz
Ansuel authored and ynezz committed May 7, 2021
1 parent d079c8f commit db2c147
Show file tree
Hide file tree
Showing 24 changed files with 93 additions and 181 deletions.
6 changes: 3 additions & 3 deletions target/linux/ipq806x/patches-5.10/0060-HACK-arch-arm-force-ZRELADDR-on-arch-qcom.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>

--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -318,7 +318,7 @@ config ARCH_MULTIPLATFORM
depends on MMU
@@ -321,7 +321,7 @@ config ARCH_MULTIPLATFORM
select ARCH_SELECT_MEMORY_MODEL
select ARM_HAS_SG_CHAIN
select ARM_PATCH_PHYS_VIRT
- select AUTO_ZRELADDR
Expand All @@ -44,7 +44,7 @@ Signed-off-by: Mathieu Olivari <mathieu@codeaurora.org>
select GENERIC_CLOCKEVENTS
--- a/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
MACHINE :=
endif
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ipq806x/patches-5.10/0065-arm-override-compiler-flags.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Signed-off-by: John Crispin <john@phrozen.org>

--- a/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
# 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
Expand Down
4 changes: 2 additions & 2 deletions target/linux/ipq806x/patches-5.10/0069-arm-boot-add-dts-files.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ Signed-off-by: John Crispin <john@phrozen.org>

--- a/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-ipq8064-ap148.dtb \
qcom-ipq8064-rb3011.dtb \
qcom-ipq8064-rb3011.dtb \
+ qcom-ipq8064-c2600.dtb \
+ qcom-ipq8064-d7800.dtb \
+ qcom-ipq8064-db149.dtb \
Expand Down
2 changes: 1 addition & 1 deletion target/linux/ipq806x/patches-5.10/0072-add-ipq806x-with-no-clocks.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/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)
},
{ .compatible = "qcom,scm-ipq4019" },
Expand Down
29 changes: 11 additions & 18 deletions target/linux/ipq806x/patches-5.10/082-ipq8064-dtsi-tweaks.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/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>;
#size-cells = <0>;

Expand All @@ -9,9 +9,7 @@
compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1";
device_type = "cpu";
reg = <1>;
next-level-cache = <&L2>;
@@ -30,9 +30,9 @@
@@ -30,7 +30,7 @@
qcom,saw = <&saw0>;
};

Expand All @@ -20,8 +18,6 @@
compatible = "qcom,krait";
enable-method = "qcom,kpss-acc-v1";
device_type = "cpu";
reg = <1>;
next-level-cache = <&L2>;
@@ -67,7 +67,7 @@
no-map;
};
Expand All @@ -39,23 +35,23 @@
#interrupt-cells = <2>;
interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>;

@@ -155,6 +155,7 @@
@@ -155,6 +156,7 @@
function = "pcie3_rst";
drive-strength = <12>;
bias-disable;
+ output-low;
};
};

@@ -190,6 +190,7 @@
@@ -190,6 +192,7 @@
intc: interrupt-controller@2000000 {
compatible = "qcom,msm-qgic2";
interrupt-controller;
+ #address-cells = <0>;
#interrupt-cells = <3>;
reg = <0x02000000 0x1000>,
<0x02002000 0x1000>;
@@ -219,21 +220,23 @@
@@ -219,21 +222,23 @@
acc0: clock-controller@2088000 {
compatible = "qcom,kpss-acc-v1";
reg = <0x02088000 0x1000>, <0x02008000 0x1000>;
Expand All @@ -81,7 +77,7 @@
reg = <0x02099000 0x1000>, <0x02009000 0x1000>;
regulator;
};
@@ -251,7 +254,7 @@
@@ -251,7 +256,7 @@

syscon-tcsr = <&tcsr>;

Expand All @@ -90,7 +86,7 @@
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x12490000 0x1000>,
<0x12480000 0x1000>;
@@ -326,7 +329,7 @@
@@ -326,7 +331,7 @@

syscon-tcsr = <&tcsr>;

Expand All @@ -99,7 +95,7 @@
compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
reg = <0x1a240000 0x1000>,
<0x1a200000 0x1000>;
@@ -397,7 +400,7 @@
@@ -397,7 +402,7 @@
status = "disabled";
};

Expand All @@ -108,7 +104,7 @@
compatible = "qcom,ipq806x-ahci", "generic-ahci";
reg = <0x29000000 0x180>;

@@ -430,6 +430,16 @@ qfprom: qfprom@700000 {
@@ -430,13 +435,35 @@
reg = <0x00700000 0x1000>;
#address-cells = <1>;
#size-cells = <1>;
Expand All @@ -124,9 +120,6 @@
+ };
};

gcc: clock-controller@900000 {
@@ -437,9 +447,21 @@ gcc: clock-controller@900000 {

gcc: clock-controller@900000 {
- compatible = "qcom,gcc-ipq8064";
+ compatible = "qcom,gcc-ipq8064", "syscon";
Expand All @@ -148,7 +141,7 @@
};

tcsr: syscon@1a400000 {
@@ -625,13 +629,13 @@
@@ -740,13 +767,13 @@
qcom,ee = <0>;
};

Expand All @@ -165,7 +158,7 @@
status = "disabled";
compatible = "arm,pl18x", "arm,primecell";
arm,primecell-periphid = <0x00051180>;
@@ -645,13 +649,12 @@
@@ -760,13 +787,12 @@
non-removable;
cap-sd-highspeed;
cap-mmc-highspeed;
Expand Down
46 changes: 20 additions & 26 deletions target/linux/ipq806x/patches-5.10/083-ipq8064-dtsi-additions.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,10 @@
};

cpu1: cpu@1 {
@@ -47,17 +47,350 @@
enable-method = "qcom,kpss-acc-v1";
device_type = "cpu";
reg = <1>;
- next-level-cache = <&L2>;
- qcom,acc = <&acc1>;
- qcom,saw = <&saw1>;
+ next-level-cache = <&L2>;
+ qcom,acc = <&acc1>;
+ qcom,saw = <&saw1>;
@@ -38,14 +50,347 @@
next-level-cache = <&L2>;
qcom,acc = <&acc1>;
qcom,saw = <&saw1>;
+ clocks = <&kraitcc 1>, <&kraitcc 4>;
+ clock-names = "cpu", "l2";
+ clock-latency = <100000>;
Expand Down Expand Up @@ -84,9 +78,9 @@
+ opp-microvolt = <1150000>;
+ clock-latency-ns = <100000>;
+ opp-level = <2>;
+ };
+ };
+
};
};
+ opp_table0: opp_table0 {
+ compatible = "operating-points-v2-kryo-cpu";
+ nvmem-cells = <&speedbin_efuse>;
Expand Down Expand Up @@ -155,9 +149,9 @@
+ opp-supported-hw = <0x1>;
+ clock-latency-ns = <100000>;
+ opp-level = <2>;
};
};
+ };
+ };
+
+ thermal-zones {
+ tsens_tz_sensor0 {
+ polling-delay-passive = <0>;
Expand Down Expand Up @@ -383,7 +377,7 @@
memory {
device_type = "memory";
reg = <0x0 0x0>;
@@ -93,6 +552,15 @@
@@ -93,6 +438,15 @@
};
};

Expand All @@ -399,7 +393,7 @@
firmware {
scm {
compatible = "qcom,scm-ipq806x", "qcom,scm";
@@ -120,6 +588,78 @@
@@ -120,6 +474,78 @@
reg-names = "lpass-lpaif";
};

Expand Down Expand Up @@ -478,7 +472,7 @@
qcom_pinmux: pinmux@800000 {
compatible = "qcom,ipq8064-pinctrl";
reg = <0x800000 0x4000>;
@@ -159,6 +705,15 @@
@@ -160,6 +586,15 @@
};
};

Expand All @@ -494,7 +488,7 @@
spi_pins: spi_pins {
mux {
pins = "gpio18", "gpio19", "gpio21";
@@ -168,6 +723,53 @@
@@ -169,6 +604,53 @@
};
};

Expand Down Expand Up @@ -548,7 +542,7 @@
leds_pins: leds_pins {
mux {
pins = "gpio7", "gpio8", "gpio9",
@@ -229,6 +831,17 @@
@@ -231,6 +713,17 @@
clock-output-names = "acpu1_aux";
};

Expand All @@ -566,7 +560,7 @@
saw0: regulator@2089000 {
compatible = "qcom,saw2", "qcom,apq8064-saw2-v1.1-cpu", "syscon";
reg = <0x02089000 0x1000>, <0x02009000 0x1000>;
@@ -241,6 +854,17 @@
@@ -243,6 +736,17 @@
regulator;
};

Expand All @@ -584,7 +578,7 @@
gsbi2: gsbi@12480000 {
compatible = "qcom,gsbi-v1.0.0";
cell-index = <2>;
@@ -448,6 +1081,95 @@
@@ -478,6 +982,95 @@
#reset-cells = <1>;
};

Expand Down Expand Up @@ -680,8 +674,8 @@
pcie0: pci@1b500000 {
compatible = "qcom,pcie-ipq8064";
reg = <0x1b500000 0x1000
@@ -601,6 +1323,59 @@
perst-gpio = <&qcom_pinmux 63 GPIO_ACTIVE_LOW>;
@@ -739,6 +1332,59 @@
status = "disabled";
};

+ adm_dma: dma@18300000 {
Expand Down Expand Up @@ -740,7 +734,7 @@
vsdcc_fixed: vsdcc-regulator {
compatible = "regulator-fixed";
regulator-name = "SDCC Power";
@@ -676,4 +1559,17 @@
@@ -814,4 +1460,17 @@
};
};
};
Expand Down
6 changes: 2 additions & 4 deletions target/linux/ipq806x/patches-5.10/086-ipq8064-fix-duplicate-node.patch
View file
Original file line number Diff line number Diff line change
@@ -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
+++ b/arch/arm/boot/dts/qcom-ipq8064-rb3011.dts
@@ -24,73 +24,6 @@ memory@0 {
@@ -24,73 +24,6 @@
device_type = "memory";
};

Expand Down Expand Up @@ -76,7 +74,7 @@ index 282b89ce3d..4faaa95b33 100644
mdio1: mdio@1 {
status = "okay";
compatible = "virtual,mdio-gpio";
@@ -216,6 +149,68 @@ led@7 {
@@ -216,6 +149,68 @@
};
};

Expand Down
9 changes: 2 additions & 7 deletions ...linux/ipq806x/patches-5.10/093-drivers-cpufreq-qcom-cpufreq-nvmem-support-specific-.patch
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
drivers/cpufreq/qcom-cpufreq-nvmem.c | 15 +++++++++++++++
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
+++ b/drivers/cpufreq/qcom-cpufreq-nvmem.c
@@ -52,6 +52,7 @@ struct qcom_cpufreq_match_data {
Expand All @@ -23,15 +21,15 @@ index d1744b5d9619..4866c74ead0f 100644
};

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 = {
.get_version = qcom_cpufreq_krait_name_version,
+ .cpufreq_driver = "krait-cpufreq",
};

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
}
}

Expand All @@ -51,6 +49,3 @@ index d1744b5d9619..4866c74ead0f 100644
cpufreq_dt_pdev = platform_device_register_simple("cpufreq-dt", -1,
NULL, 0);
if (!IS_ERR(cpufreq_dt_pdev)) {
--
2.29.2

Loading

0 comments on commit db2c147

Please sign in to comment.