projects / openwrt / staging / dangole.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e1adb1f)
kernel: bump 5.4 to 5.4.117
authorJohn Audia <graysky@archlinux.us>
Fri, 7 May 2021 12:51:44 +0000 (08:51 -0400)
committerPetr Štetiar <ynezz@true.cz>
Sun, 9 May 2021 07:15:44 +0000 (09:15 +0200)
All patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800
Run-tested: ipq806x/R7800

No dmesg regressions, everything functional

Signed-off-by: John Audia <graysky@archlinux.us>
include/kernel-version.mk patch | blob | history
target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch patch | blob | history
target/linux/ipq806x/patches-5.4/100-v5.11-dmaengine-qcom-add_ADM_driver.patch patch | blob | history
target/linux/ipq806x/patches-5.4/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch patch | blob | history

diff --git a/include/kernel-version.mk b/include/kernel-version.mk
index 5b003e31a0fa3cb65fe38fd8b8c9c1af4ca176f3..f343716e010dbf856180e76edd1629a97ff054f8 100644 (file)
--- a/include/kernel-version.mk
+++ b/include/kernel-version.mk
@@ -6,10 +6,10 @@ ifdef CONFIG_TESTING_KERNEL
   KERNEL_PATCHVER:=$(KERNEL_TESTING_PATCHVER)
 endif
 
-LINUX_VERSION-5.4 = .116
+LINUX_VERSION-5.4 = .117
 LINUX_VERSION-5.10 = .33
 
-LINUX_KERNEL_HASH-5.4.116 = fa8bce778c23a2c5be36e5b5b5005bcfd4ac3df8a90999e9e64189634bbbc9aa
+LINUX_KERNEL_HASH-5.4.117 = 4e989b5775830092e5c76b5cca65ebff862ad0c87d0b58c3a20d415c3d4ec770
 LINUX_KERNEL_HASH-5.10.33 = 933fdbc36371c0f830b7a6a957a559fca2dad1cc0eaa852ef42fb168185b4315
 
 remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))
diff --git a/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch b/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch
index eb9978154daed6f086e9aee35c87f6071f9295e3..cfc4341ebc29d48d3669acbddd45211739bf57de 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch
+++ b/target/linux/ipq806x/patches-5.4/098-1-cpufreq-add-Krait-dedicated-scaling-driver.patch
@@ -29,7 +29,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 
 --- a/drivers/cpufreq/Kconfig.arm
 +++ b/drivers/cpufreq/Kconfig.arm
-@@ -150,6 +150,18 @@ config ARM_QCOM_CPUFREQ_HW
+@@ -155,6 +155,18 @@ config ARM_QCOM_CPUFREQ_HW
          The driver implements the cpufreq interface for this HW engine.
          Say Y if you want to support CPUFreq HW.
  
@@ -48,7 +48,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  config ARM_RASPBERRYPI_CPUFREQ
        tristate "Raspberry Pi cpufreq support"
        depends on CLK_RASPBERRYPI || COMPILE_TEST
-@@ -339,4 +351,4 @@ config ARM_PXA2xx_CPUFREQ
+@@ -338,4 +350,4 @@ config ARM_PXA2xx_CPUFREQ
        help
          This add the CPUFreq driver support for Intel PXA2xx SOCs.
  
@@ -57,7 +57,7 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
 \ No newline at end of file
 --- a/drivers/cpufreq/Makefile
 +++ b/drivers/cpufreq/Makefile
-@@ -63,6 +63,7 @@ obj-$(CONFIG_ARM_PXA2xx_CPUFREQ)     += pxa2
+@@ -65,6 +65,7 @@ obj-$(CONFIG_ARM_PXA2xx_CPUFREQ)     += pxa2
  obj-$(CONFIG_PXA3xx)                  += pxa3xx-cpufreq.o
  obj-$(CONFIG_ARM_QCOM_CPUFREQ_HW)     += qcom-cpufreq-hw.o
  obj-$(CONFIG_ARM_QCOM_CPUFREQ_NVMEM)  += qcom-cpufreq-nvmem.o
@@ -65,8 +65,8 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
  obj-$(CONFIG_ARM_RASPBERRYPI_CPUFREQ)         += raspberrypi-cpufreq.o
  obj-$(CONFIG_ARM_S3C2410_CPUFREQ)     += s3c2410-cpufreq.o
  obj-$(CONFIG_ARM_S3C2412_CPUFREQ)     += s3c2412-cpufreq.o
-@@ -86,6 +87,7 @@ obj-$(CONFIG_ARM_TEGRA186_CPUFREQ)   += te
- obj-$(CONFIG_ARM_TEGRA194_CPUFREQ)    += tegra194-cpufreq.o
+@@ -87,6 +88,7 @@ obj-$(CONFIG_ARM_TEGRA124_CPUFREQ)   += te
+ obj-$(CONFIG_ARM_TEGRA186_CPUFREQ)    += tegra186-cpufreq.o
  obj-$(CONFIG_ARM_TI_CPUFREQ)          += ti-cpufreq.o
  obj-$(CONFIG_ARM_VEXPRESS_SPC_CPUFREQ)        += vexpress-spc-cpufreq.o
 +obj-$(CONFIG_ARM_KRAIT_CPUFREQ)               += krait-cpufreq.o
diff --git a/target/linux/ipq806x/patches-5.4/100-v5.11-dmaengine-qcom-add_ADM_driver.patch b/target/linux/ipq806x/patches-5.4/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
index 45062d52fc6f2ab3c3164a27adec7e91ed956e67..2d24da01e44d5e05402a5e35fef805d053cf9882 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
+++ b/target/linux/ipq806x/patches-5.4/100-v5.11-dmaengine-qcom-add_ADM_driver.patch
@@ -31,8 +31,6 @@ Signed-off-by: Vinod Koul <vkoul@kernel.org>
  3 files changed, 915 insertions(+)
  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
 +++ b/drivers/dma/qcom/Kconfig
 @@ -1,4 +1,15 @@
@@ -51,8 +49,6 @@ index 3bcb689162c67..0389d60d2604a 100644
  config QCOM_BAM_DMA
        tristate "QCOM BAM DMA support"
        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
 +++ b/drivers/dma/qcom/Makefile
 @@ -1,4 +1,5 @@
@@ -61,9 +57,6 @@ index 1ae92da88b0c9..346e643fbb6db 100644
  obj-$(CONFIG_QCOM_BAM_DMA) += bam_dma.o
  obj-$(CONFIG_QCOM_HIDMA_MGMT) += hdma_mgmt.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
 +++ b/drivers/dma/qcom/qcom_adm.c
 @@ -0,0 +1,903 @@
@@ -970,6 +963,3 @@ index 0000000000000..9b6f8e050ecce
 +MODULE_AUTHOR("Andy Gross <agross@codeaurora.org>");
 +MODULE_DESCRIPTION("QCOM ADM DMA engine driver");
 +MODULE_LICENSE("GPL v2");
--- 
-cgit 1.2.3-1.el7
-
diff --git a/target/linux/ipq806x/patches-5.4/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch b/target/linux/ipq806x/patches-5.4/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
index 7aec4fcc835920f22175556ee87c431a7dfcdd09..a78dc82a47a74fb2274d5a69d0b7d2175e2913ff 100644 (file)
--- a/target/linux/ipq806x/patches-5.4/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
+++ b/target/linux/ipq806x/patches-5.4/101-5.12-mtd-parsers-Add-Qcom-SMEM-parser.patch
@@ -17,15 +17,12 @@ Link: https://lore.kernel.org/linux-mtd/20210104041137.113075-3-manivannan.sadha
  3 files changed, 179 insertions(+)
  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
 +++ b/drivers/mtd/parsers/Kconfig
-@@ -160,6 +160,14 @@ config MTD_REDBOOT_PARTS_READONLY
-         'FIS directory' images, enable this option.
+@@ -196,6 +196,14 @@ config MTD_REDBOOT_PARTS_READONLY
  
  endif # MTD_REDBOOT_PARTS
-+
+ 
 +config MTD_QCOMSMEM_PARTS
 +      tristate "Qualcomm SMEM NAND flash partition parser"
 +      depends on MTD_NAND_QCOM || COMPILE_TEST
@@ -33,22 +30,18 @@ index e72354322f628..d90c302290522 100644
 +      help
 +        This provides support for parsing partitions from Shared Memory (SMEM)
 +        for NAND flash on Qualcomm platforms.
- 
++
  config MTD_ROUTERBOOT_PARTS
        tristate "RouterBoot flash partition parser"
-diff --git a/drivers/mtd/parsers/Makefile b/drivers/mtd/parsers/Makefile
-index b0c5f62f9e858..50eb0b0a22105 100644
+       depends on MTD && OF
 --- a/drivers/mtd/parsers/Makefile
 +++ b/drivers/mtd/parsers/Makefile
-@@ -9,4 +9,5 @@ obj-$(CONFIG_MTD_AFS_PARTS)            += afs.o
+@@ -13,4 +13,5 @@ obj-$(CONFIG_MTD_AFS_PARTS)          += afs.o
  obj-$(CONFIG_MTD_PARSER_TRX)          += parser_trx.o
  obj-$(CONFIG_MTD_SHARPSL_PARTS)               += sharpslpart.o
  obj-$(CONFIG_MTD_REDBOOT_PARTS)               += redboot.o
 +obj-$(CONFIG_MTD_QCOMSMEM_PARTS)      += qcomsmempart.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
 +++ b/drivers/mtd/parsers/qcomsmempart.c
 @@ -0,0 +1,170 @@
@@ -222,6 +215,3 @@ index 0000000000000..808cb33d71f8e
 +MODULE_LICENSE("GPL v2");
 +MODULE_AUTHOR("Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>");
 +MODULE_DESCRIPTION("Qualcomm SMEM NAND flash partition parser");
--- 
-cgit 1.2.3-1.el7
-
Staging tree of Daniel Golle