diff --git a/patch/kernel/archive/meson64-6.2/add-board-bananapi-m2s-initial-support.patch b/patch/kernel/archive/meson64-6.2/add-board-bananapi-m2s-initial-support.patch index 0560770f1c..045d01c10d 100644 --- a/patch/kernel/archive/meson64-6.2/add-board-bananapi-m2s-initial-support.patch +++ b/patch/kernel/archive/meson64-6.2/add-board-bananapi-m2s-initial-support.patch @@ -11,7 +11,7 @@ Initial support for Bananapi M2S 3 files changed, 595 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 9fda2436c618..bbd5f6197e4d 100644 +index e16b5fa55847..8f27abb41efe 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -154,6 +154,7 @@ properties: @@ -23,7 +23,7 @@ index 9fda2436c618..bbd5f6197e4d 100644 - const: amlogic,g12b diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index e213aeebb774..858ae834cc9f 100644 +index 97b42e2100e0..11602291a9bf 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile @@ -9,6 +9,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12a-sei510.dtb diff --git a/patch/kernel/archive/meson64-6.2/add-board-radxa-zero2.patch b/patch/kernel/archive/meson64-6.2/add-board-radxa-zero2.patch index 74a52a312b..8b87c8c164 100644 --- a/patch/kernel/archive/meson64-6.2/add-board-radxa-zero2.patch +++ b/patch/kernel/archive/meson64-6.2/add-board-radxa-zero2.patch @@ -13,7 +13,7 @@ Signed-off-by: Yuntian Zhang 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index bbd5f6197e4d..6edb1b771cdc 100644 +index 8f27abb41efe..dc4b44f01b64 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -155,6 +155,7 @@ properties: @@ -54,11 +54,11 @@ Signed-off-by: Christian Hewitt 2 files changed, 577 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 858ae834cc9f..9e2ad0b42523 100644 +index 11602291a9bf..1244bc435313 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -15,6 +15,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb diff --git a/patch/kernel/archive/meson64-6.2/board-khadas-vim2-use-gpio-fan-matrix-instead-of-array.patch b/patch/kernel/archive/meson64-6.2/board-khadas-vim2-use-gpio-fan-matrix-instead-of-array.patch index 47f4ac6645..7752fefb77 100644 --- a/patch/kernel/archive/meson64-6.2/board-khadas-vim2-use-gpio-fan-matrix-instead-of-array.patch +++ b/patch/kernel/archive/meson64-6.2/board-khadas-vim2-use-gpio-fan-matrix-instead-of-array.patch @@ -14,7 +14,7 @@ Signed-off-by: David Heidelberg 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index f43c45daf7eb..a24102e3d369 100644 +index b21172ece1fa..74897a154891 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -52,10 +52,11 @@ gpio_fan: gpio-fan { diff --git a/patch/kernel/archive/meson64-6.2/board-khadas-vims-add-rtc-vrtc-aliases.patch b/patch/kernel/archive/meson64-6.2/board-khadas-vims-add-rtc-vrtc-aliases.patch index 924e4eb81c..9b57ae4927 100644 --- a/patch/kernel/archive/meson64-6.2/board-khadas-vims-add-rtc-vrtc-aliases.patch +++ b/patch/kernel/archive/meson64-6.2/board-khadas-vims-add-rtc-vrtc-aliases.patch @@ -12,7 +12,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts -index 6ab1cc125b96..24af15e18026 100644 +index 202deb4e2d63..bee51e29015b 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxl-s905x-khadas-vim.dts @@ -29,6 +29,8 @@ button-function { @@ -41,7 +41,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 2 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts -index a24102e3d369..9b0c7e9d0620 100644 +index 74897a154891..be3e91bbfb2f 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxm-khadas-vim2.dts @@ -18,6 +18,8 @@ / { diff --git a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-dumb-gpio-fan.patch b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-dumb-gpio-fan.patch index b7c7f79b5b..2ced92db0e 100644 --- a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-dumb-gpio-fan.patch +++ b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-dumb-gpio-fan.patch @@ -14,11 +14,11 @@ Tested-by: Ricardo Pardini 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index fd3fa82e4c33..1365f2767855 100644 +index 667d2b774924..e896bac3c5c1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -39,6 +39,15 @@ emmc_pwrseq: emmc-pwrseq { - reset-gpios = <&gpio BOOT_12 GPIO_ACTIVE_LOW>; +@@ -47,6 +47,15 @@ fan: gpio-fan { + #cooling-cells = <2>; }; + /* 5V 80x80x10.8mm cooling fan from Hardkernel shop... */ diff --git a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-gpio-fan-as-cooling-device.patch b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-gpio-fan-as-cooling-device.patch index 515dcb5145..6bbddbec72 100644 --- a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-gpio-fan-as-cooling-device.patch +++ b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-gpio-fan-as-cooling-device.patch @@ -13,10 +13,10 @@ Signed-off-by: Stefan Agner 1 file changed, 38 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -index 1365f2767855..33323f119406 100644 +index e896bac3c5c1..2db95373261c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2.dtsi -@@ -377,6 +377,44 @@ &clkc_audio { +@@ -385,6 +385,44 @@ &clkc_audio { status = "okay"; }; diff --git a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-spi-flash-enabled-dts.patch b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-spi-flash-enabled-dts.patch index 9e6197bdeb..8becf1c92b 100644 --- a/patch/kernel/archive/meson64-6.2/board-odroidn2-add-spi-flash-enabled-dts.patch +++ b/patch/kernel/archive/meson64-6.2/board-odroidn2-add-spi-flash-enabled-dts.patch @@ -14,19 +14,19 @@ Signed-off-by: Ricardo Pardini 4 files changed, 37 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 9e2ad0b42523..10205ee7627a 100644 +index 1244bc435313..7c71c6488606 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -13,7 +13,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb +@@ -15,7 +15,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb -+dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-spi.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-go-ultra.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus-spi.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2.dtb ++dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-spi.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-radxa-zero2.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-s922x-khadas-vim3.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-ugoos-am6.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2-enable-spi.dtsi new file mode 100644 index 000000000000..a6f11e8cdfbe diff --git a/patch/kernel/archive/meson64-6.2/general-add-overlay-compilation-support.patch b/patch/kernel/archive/meson64-6.2/general-add-overlay-compilation-support.patch index b4a839f403..e14b27e147 100644 --- a/patch/kernel/archive/meson64-6.2/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/meson64-6.2/general-add-overlay-compilation-support.patch @@ -21,11 +21,11 @@ index 8c759326baf4..e6ce8f6ad4b1 100644 +*.dtb* +*.scr diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst -index 190d781e84f4..6540de71182b 100644 +index 2ab936e4179d..cd810fec15a7 100644 --- a/scripts/Makefile.dtbinst +++ b/scripts/Makefile.dtbinst @@ -18,9 +18,12 @@ include $(srctree)/scripts/Kbuild.include - include $(src)/Makefile + include $(kbuild-file) dtbs := $(addprefix $(dst)/, $(dtb-y) $(if $(CONFIG_OF_ALL_DTBS),$(dtb-))) +dtbos := $(addprefix $(dst)/, $(dtbo-y)) @@ -55,12 +55,12 @@ index 190d781e84f4..6540de71182b 100644 $(subdirs): $(Q)$(MAKE) $(dtbinst)=$@ dst=$(patsubst $(obj)/%,$(dst)/%,$@) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 3aa384cec76b..553018f80d8c 100644 +index 4a4a5f67c1a6..f6844387b77b 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -336,6 +336,9 @@ quiet_cmd_gzip = GZIP $@ - DTC ?= $(objtree)/scripts/dtc/dtc - DTC_FLAGS += -Wno-interrupt_provider +@@ -343,6 +343,9 @@ DTC ?= $(objtree)/scripts/dtc/dtc + DTC_FLAGS += -Wno-interrupt_provider \ + -Wno-unique_unit_address +# Overlay support +DTC_FLAGS += -@ -Wno-unit_address_format -Wno-simple_bus_reg @@ -68,8 +68,8 @@ index 3aa384cec76b..553018f80d8c 100644 # Disable noisy checks by default ifeq ($(findstring 1,$(KBUILD_EXTRA_WARN)),) DTC_FLAGS += -Wno-unit_address_vs_reg \ -@@ -408,6 +411,23 @@ $(obj)/%.dtb: $(src)/%.dts $(DTC) $(DT_TMP_SCHEMA) FORCE - $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE +@@ -439,6 +442,23 @@ $(obj)/%.dtbo: $(src)/%.dts $(DTC) FORCE + $(obj)/%.dtbo: $(src)/%.dtso $(DTC) FORCE $(call if_changed_dep,dtc) +quiet_cmd_dtco = DTCO $@ diff --git a/patch/kernel/archive/meson64-6.2/general-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/meson64-6.2/general-fix-Kodi-sysinfo-CPU-information.patch index b0ef5b470d..1d24dc88c9 100644 --- a/patch/kernel/archive/meson64-6.2/general-fix-Kodi-sysinfo-CPU-information.patch +++ b/patch/kernel/archive/meson64-6.2/general-fix-Kodi-sysinfo-CPU-information.patch @@ -13,10 +13,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/kernel/cpuinfo.c b/arch/arm64/kernel/cpuinfo.c -index 28d4f442b0bc..d46cea365be4 100644 +index 379695262b77..e13b015120b2 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -170,8 +170,7 @@ static int c_show(struct seq_file *m, void *v) +@@ -173,8 +173,7 @@ static int c_show(struct seq_file *m, void *v) * "processor". Give glibc what it expects. */ seq_printf(m, "processor\t: %d\n", i); diff --git a/patch/kernel/archive/meson64-6.2/general-hdmi-codec-reorder-channel-allocation-list.patch b/patch/kernel/archive/meson64-6.2/general-hdmi-codec-reorder-channel-allocation-list.patch index 7df472c21b..6193e0c4e0 100644 --- a/patch/kernel/archive/meson64-6.2/general-hdmi-codec-reorder-channel-allocation-list.patch +++ b/patch/kernel/archive/meson64-6.2/general-hdmi-codec-reorder-channel-allocation-list.patch @@ -24,7 +24,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 77 insertions(+), 63 deletions(-) diff --git a/sound/soc/codecs/hdmi-codec.c b/sound/soc/codecs/hdmi-codec.c -index 0b1cdb2d6049..ad05e6517706 100644 +index 74cbbe16f9ae..51dd5915e506 100644 --- a/sound/soc/codecs/hdmi-codec.c +++ b/sound/soc/codecs/hdmi-codec.c @@ -184,84 +184,97 @@ static const struct snd_pcm_chmap_elem hdmi_codec_8ch_chmaps[] = { diff --git a/patch/kernel/archive/meson64-6.2/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.2/general-input-touchscreen-Add-D-WAV-Multitouch.patch index d1fd34214c..8660aee22c 100644 --- a/patch/kernel/archive/meson64-6.2/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.2/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -42,12 +42,12 @@ index 0e9702c7f7d6..afa6f910a28f 100644 }; diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig -index dc90a3ea51ee..fd31ad28b952 100644 +index 68d99a112e14..50fa5d06b4e0 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig -@@ -1379,4 +1379,14 @@ config TOUCHSCREEN_ZINITIX +@@ -1419,4 +1419,14 @@ config TOUCHSCREEN_HIMAX_HX83112B To compile this driver as a module, choose M here: the - module will be called zinitix. + module will be called himax_hx83112b. +config TOUCHSCREEN_DWAV_USB_MT + tristate "D-WAV Scientific USB MultiTouch" @@ -61,14 +61,15 @@ index dc90a3ea51ee..fd31ad28b952 100644 + endif diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile -index 557f84fd2075..68feafadf7fe 100644 +index 4968c370479a..cb7c4fc6af74 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile -@@ -116,3 +116,4 @@ obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o +@@ -118,4 +118,5 @@ obj-$(CONFIG_TOUCHSCREEN_ROHM_BU21023) += rohm_bu21023.o obj-$(CONFIG_TOUCHSCREEN_RASPBERRYPI_FW) += raspberrypi-ts.o obj-$(CONFIG_TOUCHSCREEN_IQS5XX) += iqs5xx.o obj-$(CONFIG_TOUCHSCREEN_ZINITIX) += zinitix.o +obj-$(CONFIG_TOUCHSCREEN_DWAV_USB_MT) += dwav-usb-mt.o + obj-$(CONFIG_TOUCHSCREEN_HIMAX_HX83112B) += himax_hx83112b.o diff --git a/drivers/input/touchscreen/dwav-usb-mt.c b/drivers/input/touchscreen/dwav-usb-mt.c new file mode 100644 index 000000000000..7ec8b6dd15fd diff --git a/patch/kernel/archive/meson64-6.2/general-memory-marked-nomap.patch b/patch/kernel/archive/meson64-6.2/general-memory-marked-nomap.patch index bada373507..ac941c0754 100644 --- a/patch/kernel/archive/meson64-6.2/general-memory-marked-nomap.patch +++ b/patch/kernel/archive/meson64-6.2/general-memory-marked-nomap.patch @@ -14,7 +14,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 9 deletions(-) diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 7b571a631639..dd9f19e7938f 100644 +index f08b25195ae7..853b65bae5f6 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -481,15 +481,6 @@ static int __init early_init_dt_reserve_memory(phys_addr_t base, diff --git a/patch/kernel/archive/meson64-6.2/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch b/patch/kernel/archive/meson64-6.2/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch index 2f88251e2b..fcd8ea0694 100644 --- a/patch/kernel/archive/meson64-6.2/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch +++ b/patch/kernel/archive/meson64-6.2/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch @@ -12,7 +12,7 @@ Signed-off-by: Vyacheslav Bocharov 1 file changed, 3 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi -index 04f797b5a012..0af4784d84c7 100644 +index 1648e67afbb6..d26f3b20bfec 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -13,6 +13,7 @@ @@ -23,7 +23,7 @@ index 04f797b5a012..0af4784d84c7 100644 / { compatible = "amlogic,meson-axg"; -@@ -1891,6 +1892,7 @@ sd_emmc_b: sd@5000 { +@@ -1892,6 +1893,7 @@ sd_emmc_b: sd@5000 { <&clkc CLKID_SD_EMMC_B_CLK0>, <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; @@ -31,7 +31,7 @@ index 04f797b5a012..0af4784d84c7 100644 resets = <&reset RESET_SD_EMMC_B>; }; -@@ -1904,6 +1906,7 @@ sd_emmc_c: mmc@7000 { +@@ -1905,6 +1907,7 @@ sd_emmc_c: mmc@7000 { <&clkc CLKID_FCLK_DIV2>; clock-names = "core", "clkin0", "clkin1"; resets = <&reset RESET_SD_EMMC_C>; diff --git a/patch/kernel/archive/meson64-6.2/general-meson-vdec-improve-mmu-and-fbc-handling-.patch b/patch/kernel/archive/meson64-6.2/general-meson-vdec-improve-mmu-and-fbc-handling-.patch index 0bfde1fe5f..4562569821 100644 --- a/patch/kernel/archive/meson64-6.2/general-meson-vdec-improve-mmu-and-fbc-handling-.patch +++ b/patch/kernel/archive/meson64-6.2/general-meson-vdec-improve-mmu-and-fbc-handling-.patch @@ -338,7 +338,7 @@ index cf072b8a9da2..13f9f1d90a94 100644 #endif diff --git a/drivers/staging/media/meson/vdec/codec_vp9.c b/drivers/staging/media/meson/vdec/codec_vp9.c -index 897f5d7a6aad..bfc312ec2a56 100644 +index 394df5761556..c2fec7a89fea 100644 --- a/drivers/staging/media/meson/vdec/codec_vp9.c +++ b/drivers/staging/media/meson/vdec/codec_vp9.c @@ -458,12 +458,6 @@ struct codec_vp9 { @@ -419,7 +419,7 @@ index 897f5d7a6aad..bfc312ec2a56 100644 intra_only = param->p.show_frame ? 0 : param->p.intra_only; -@@ -2132,7 +2133,8 @@ static irqreturn_t codec_vp9_threaded_isr(struct amvdec_session *sess) +@@ -2130,7 +2131,8 @@ static irqreturn_t codec_vp9_threaded_isr(struct amvdec_session *sess) codec_vp9_fetch_rpm(sess); if (codec_vp9_process_rpm(vp9)) { diff --git a/patch/kernel/archive/meson64-6.2/general-meson64-overlays.patch b/patch/kernel/archive/meson64-6.2/general-meson64-overlays.patch index 668222da1b..be5813ee9d 100644 --- a/patch/kernel/archive/meson64-6.2/general-meson64-overlays.patch +++ b/patch/kernel/archive/meson64-6.2/general-meson64-overlays.patch @@ -20,10 +20,10 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> 12 files changed, 176 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 10205ee7627a..82374835e1c3 100644 +index 7c71c6488606..25d37bb721d4 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -71,3 +71,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb +@@ -72,3 +72,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-sei610.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air-gbit.dtb dtb-$(CONFIG_ARCH_MESON) += meson-sm1-x96-air.dtb @@ -261,7 +261,7 @@ index 000000000000..f6b0d7eff158 + }; +}; diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 553018f80d8c..821e1c51aed9 100644 +index f6844387b77b..9db98698769f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -88,6 +88,9 @@ base-dtb-y := $(foreach m, $(multi-dtb-y), $(firstword $(call suffix-search, $m, diff --git a/patch/kernel/archive/meson64-6.2/general-si2168-fix-cmd-timeout.patch b/patch/kernel/archive/meson64-6.2/general-si2168-fix-cmd-timeout.patch index c18e127b27..9a1da3bd3f 100644 --- a/patch/kernel/archive/meson64-6.2/general-si2168-fix-cmd-timeout.patch +++ b/patch/kernel/archive/meson64-6.2/general-si2168-fix-cmd-timeout.patch @@ -11,7 +11,7 @@ Details: https://github.com/CoreELEC/CoreELEC/pull/208 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c -index 8157df4570d1..48054d792b16 100644 +index 2a0e108c5eb0..e7bfb8096bf9 100644 --- a/drivers/media/dvb-frontends/si2168.c +++ b/drivers/media/dvb-frontends/si2168.c @@ -40,7 +40,7 @@ static int si2168_cmd_execute(struct i2c_client *client, struct si2168_cmd *cmd) diff --git a/patch/kernel/archive/meson64-6.2/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.2/general-spi-nor-add-support-for-XT25F128B.patch index 847f01e0cb..dffaea43d7 100644 --- a/patch/kernel/archive/meson64-6.2/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.2/general-spi-nor-add-support-for-XT25F128B.patch @@ -39,7 +39,7 @@ index e347b435a038..8992c592a896 100644 obj-$(CONFIG_MTD_SPI_NOR) += spi-nor.o diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index 2e0655c0b606..fafffe64b9d7 100644 +index d8703d7dfd0a..071bc2071366 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -1632,6 +1632,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { @@ -49,12 +49,12 @@ index 2e0655c0b606..fafffe64b9d7 100644 + &spi_nor_xtx, }; - static const struct flash_info *spi_nor_match_id(struct spi_nor *nor, + static const struct flash_info spi_nor_generic_flash = { diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h -index 85b0cf254e97..e79188ca9955 100644 +index f03b55cf7e6f..27aeb7dff93b 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -627,6 +627,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; +@@ -629,6 +629,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; extern const struct spi_nor_manufacturer spi_nor_winbond; extern const struct spi_nor_manufacturer spi_nor_xilinx; extern const struct spi_nor_manufacturer spi_nor_xmc; diff --git a/patch/kernel/archive/meson64-6.2/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.2/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 349bc21a56..79a0c354f3 100644 --- a/patch/kernel/archive/meson64-6.2/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.2/general-usb-core-improve-handling-of-hubs-with-no-ports.patch @@ -33,7 +33,7 @@ Signed-off-by: Heiner Kallweit 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index bbab424b0d55..87cc6d816e91 100644 +index 77e73fc8d673..f0fb30f9bd06 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1424,9 +1424,8 @@ static int hub_configure(struct usb_hub *hub, diff --git a/patch/kernel/archive/meson64-6.2/meson-g12a-pinctrl-add-missing-ir-options.patch b/patch/kernel/archive/meson64-6.2/meson-g12a-pinctrl-add-missing-ir-options.patch index e5627cf5be..afec1591f0 100644 --- a/patch/kernel/archive/meson64-6.2/meson-g12a-pinctrl-add-missing-ir-options.patch +++ b/patch/kernel/archive/meson64-6.2/meson-g12a-pinctrl-add-missing-ir-options.patch @@ -12,7 +12,7 @@ Signed-off-by: Yuntian Zhang 2 files changed, 25 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 45947c1031c4..8bc032c38a50 100644 +index 9dbd50820b1c..a92c1ec9266d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi @@ -562,6 +562,14 @@ mux { @@ -30,7 +30,7 @@ index 45947c1031c4..8bc032c38a50 100644 mclk0_a_pins: mclk0-a { mux { groups = "mclk0_a"; -@@ -2000,6 +2008,14 @@ mux { +@@ -2006,6 +2014,14 @@ mux { bias-disable; }; }; diff --git a/patch/kernel/archive/meson64-6.2/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch b/patch/kernel/archive/meson64-6.2/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch index 27f7e9d956..6390b0f3d3 100644 --- a/patch/kernel/archive/meson64-6.2/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch +++ b/patch/kernel/archive/meson64-6.2/meson-g12b-pinctrl-Add-missing-pinmux-for-pwm.patch @@ -16,12 +16,12 @@ Signed-off-by: Yuntian Zhang 2 files changed, 45 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi -index ee8fcae9f9f0..d938f883c66e 100644 +index 75ff00fb2e4c..c57abbd405d3 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12b.dtsi -@@ -139,3 +139,37 @@ map1 { - &mali { - dma-coherent; +@@ -144,3 +144,37 @@ &mali { + &pmu { + compatible = "amlogic,g12b-ddr-pmu"; }; + +&periphs_pinctrl { diff --git a/patch/kernel/archive/meson64-6.2/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch b/patch/kernel/archive/meson64-6.2/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch index 4b14fe3305..56173f8b6b 100644 --- a/patch/kernel/archive/meson64-6.2/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch +++ b/patch/kernel/archive/meson64-6.2/meson-gx-dts-add-support-for-GX-PM-and-VRTC.patch @@ -9,10 +9,10 @@ Signed-off-by: Neil Armstrong 1 file changed, 9 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -index 023a52005494..86ffd599b086 100644 +index e3c12e0be99d..4937cdc818f6 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi -@@ -221,6 +221,10 @@ sm: secure-monitor { +@@ -222,6 +222,10 @@ sm: secure-monitor { }; }; @@ -23,7 +23,7 @@ index 023a52005494..86ffd599b086 100644 efuse: efuse { compatible = "amlogic,meson-gx-efuse", "amlogic,meson-gxbb-efuse"; #address-cells = <1>; -@@ -459,6 +463,11 @@ clkc_AO: clock-controller { +@@ -460,6 +464,11 @@ clkc_AO: clock-controller { }; }; diff --git a/patch/kernel/archive/meson64-6.2/meson-gxbb-dts-i2cX-missing-pins.patch b/patch/kernel/archive/meson64-6.2/meson-gxbb-dts-i2cX-missing-pins.patch index 28fedde5f2..00deb6425c 100644 --- a/patch/kernel/archive/meson64-6.2/meson-gxbb-dts-i2cX-missing-pins.patch +++ b/patch/kernel/archive/meson64-6.2/meson-gxbb-dts-i2cX-missing-pins.patch @@ -9,7 +9,7 @@ Subject: fix i2cA and i2cB miossing pins 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi -index 7c029f552a23..b3c22861b022 100644 +index 923d2d8bbb9c..43d9d1d10f53 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi @@ -333,6 +333,8 @@ &hwrng { diff --git a/patch/kernel/archive/meson64-6.2/meson-sm1-dts-add-higher-clocks.patch b/patch/kernel/archive/meson64-6.2/meson-sm1-dts-add-higher-clocks.patch index e0b9b76945..722124990c 100644 --- a/patch/kernel/archive/meson64-6.2/meson-sm1-dts-add-higher-clocks.patch +++ b/patch/kernel/archive/meson64-6.2/meson-sm1-dts-add-higher-clocks.patch @@ -9,10 +9,10 @@ Signed-off-by: Igor Pecovnik 1 file changed, 10 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -index 80737731af3f..ba52da32cd73 100644 +index 56ca0ba2241e..6dcc7562efb8 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi -@@ -134,6 +134,16 @@ opp-1908000000 { +@@ -135,6 +135,16 @@ opp-1908000000 { opp-hz = /bits/ 64 <1908000000>; opp-microvolt = <950000>; };