From 29085a7f7361a2578c86ef526f5a0dfd20a820b2 Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Sun, 14 Jan 2024 09:08:57 +0100 Subject: [PATCH] meson64: 6.7 edge: rebase patches to 6.7 - general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch: dropped - added `-spidev` DT's for a few boards (gives access to SPI Flash in exchange for slower eMMC) - cleanup 0000.patching_config.yaml for meson64-6.7 --- .../meson64-6.7/0000.patching_config.yaml | 17 ++++------- ...sable-autosuspend-for-Genesys-Logic-.patch | 4 +-- .../board-t95z-add-rc-remote-keymap.patch | 4 +-- .../driver-power-meson64-reset.patch | 2 +- .../drv-spi-spidev-remove-warnings.patch | 8 ++--- .../dt/meson-g12a-radxa-zero-spidev.dts | 29 +++++++++++++++++++ .../meson-g12b-a311d-khadas-vim3-spidev.dts | 29 +++++++++++++++++++ .../dt/meson-g12b-odroid-n2-plus-spidev.dts | 21 ++++++++++++++ .../dt/meson-g12b-radxa-zero2-spidev.dts | 29 +++++++++++++++++++ .../dt/meson-sm1-khadas-vim3l-spidev.dts | 29 +++++++++++++++++++ .../dt/meson-sm1-odroid-c4-spidev.dts | 24 +++++++++++++++ ...eral-add-overlay-compilation-support.patch | 2 +- ...hdmi-call-hdmi_set_cts_n-after-clock.patch | 2 +- ...eral-drm-panfrost-fix-reference-leak.patch | 4 +-- ...ral-fix-Kodi-sysinfo-CPU-information.patch | 4 +-- ...odec-reorder-channel-allocation-list.patch | 2 +- ...put-touchscreen-Add-D-WAV-Multitouch.patch | 8 ++--- ...cec-silence-CEC-timeout-message-HACK.patch | 2 +- ...c-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch | 2 +- ...s-meson-update-meson-axg-device-tree.patch | 4 +-- .../general-meson64-overlays.patch | 2 +- ...ernate-pulse-and-space-timing-events.patch | 28 ------------------ ...al-spi-nor-add-support-for-XT25F128B.patch | 12 ++++---- ...prove-handling-of-hubs-with-no-ports.patch | 4 +-- ...rm64-dts-jethub-j1xx-add-eeprom-node.patch | 10 +++---- 25 files changed, 205 insertions(+), 77 deletions(-) create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-g12a-radxa-zero-spidev.dts create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-g12b-a311d-khadas-vim3-spidev.dts create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-g12b-odroid-n2-plus-spidev.dts create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-g12b-radxa-zero2-spidev.dts create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-sm1-khadas-vim3l-spidev.dts create mode 100644 patch/kernel/archive/meson64-6.7/dt/meson-sm1-odroid-c4-spidev.dts delete mode 100644 patch/kernel/archive/meson64-6.7/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch diff --git a/patch/kernel/archive/meson64-6.7/0000.patching_config.yaml b/patch/kernel/archive/meson64-6.7/0000.patching_config.yaml index 23f640762d..393d991777 100644 --- a/patch/kernel/archive/meson64-6.7/0000.patching_config.yaml +++ b/patch/kernel/archive/meson64-6.7/0000.patching_config.yaml @@ -1,30 +1,25 @@ -config: # This is file 'patch/kernel/archive/meson64-6.4/0000.patching_config.yaml' +config: # Just some info stuff; not used by the patching scripts - name: meson64-6.4 + name: meson64-6.7 kind: kernel type: mainline # or: vendor - branch: linux-6.4.y - last-known-good-tag: v6.4-rc5 + branch: linux-6.7.y + last-known-good-tag: v6.7.0 maintainers: - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini } - # Automatic grabbing of patches from mailing lists, using 'b4' tool 'am' command. - # Patches will be grabbed and written to disk in the order they are listed here, before any other processing is done. - #b4-am: - # - { prefix: "0666", lore: "https://lore.kernel.org/r/20230706-topic-amlogic-upstream-dt-fixes-take3-v1-0-63ed070eeab2@linaro.org" } - # .dts files in these directories will be copied as-is to the build tree; later ones overwrite earlier ones. # This is meant to provide a way to "add a board DTS" without having to null-patch them in. dts-directories: - # will copy patch/kernel/archive/meson64-6.4/dt-boards/*.dts to arch/arm64/boot/dts/amlogic + # will copy patch/kernel/archive/meson64-MAJOR.MINOR/dt-boards/*.dts to arch/arm64/boot/dts/amlogic - { source: "dt", target: "arch/arm64/boot/dts/amlogic" } # every file in these directories will be copied as-is to the build tree; later ones overwrite earlier ones # This is meant as a way to have overlays, bare, in a directory, without having to null-patch them in. # @TODO need a solution to auto-Makefile the overlays as well overlay-directories: - # will copy patch/kernel/archive/meson64-6.4/overlay/**/* to arch/arm64/boot/dts/amlogic/overlay + # will copy patch/kernel/archive/meson64-MAJOR.MINOR/overlay/**/* to arch/arm64/boot/dts/amlogic/overlay - { source: "overlay", target: "arch/arm64/boot/dts/amlogic/overlay" } # the Makefile in each of these directories will be magically patched to include the dts files copied diff --git a/patch/kernel/archive/meson64-6.7/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.7/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 5b9e80fe52..e58b36d569 100644 --- a/patch/kernel/archive/meson64-6.7/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.7/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch @@ -16,10 +16,10 @@ Signed-off-by: Christian Hewitt 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0ff47eeffb49..fd94382c3fcc 100644 +index 87480a6e6d93..80ed09e9be4a 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5903,7 +5903,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5884,7 +5884,7 @@ static const struct usb_device_id hub_id_table[] = { | USB_DEVICE_ID_MATCH_INT_CLASS, .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, diff --git a/patch/kernel/archive/meson64-6.7/board-t95z-add-rc-remote-keymap.patch b/patch/kernel/archive/meson64-6.7/board-t95z-add-rc-remote-keymap.patch index b6cfc0617f..8bc9f7c69e 100644 --- a/patch/kernel/archive/meson64-6.7/board-t95z-add-rc-remote-keymap.patch +++ b/patch/kernel/archive/meson64-6.7/board-t95z-add-rc-remote-keymap.patch @@ -31,10 +31,10 @@ index 7bbe580c80f7..dc53a1cbf6fd 100644 - rc-tanix-tx3mini - rc-tanix-tx5max diff --git a/Documentation/devicetree/bindings/vendor-prefixes.yaml b/Documentation/devicetree/bindings/vendor-prefixes.yaml -index 573578db9509..3faab01160cf 100644 +index 309b94c328c8..2236510eb594 100644 --- a/Documentation/devicetree/bindings/vendor-prefixes.yaml +++ b/Documentation/devicetree/bindings/vendor-prefixes.yaml -@@ -1324,6 +1324,8 @@ patternProperties: +@@ -1348,6 +1348,8 @@ patternProperties: description: Sundance DSP Inc. "^sunplus,.*": description: Sunplus Technology Co., Ltd. diff --git a/patch/kernel/archive/meson64-6.7/driver-power-meson64-reset.patch b/patch/kernel/archive/meson64-6.7/driver-power-meson64-reset.patch index dcca65d8a5..0718d9442c 100644 --- a/patch/kernel/archive/meson64-6.7/driver-power-meson64-reset.patch +++ b/patch/kernel/archive/meson64-6.7/driver-power-meson64-reset.patch @@ -10,7 +10,7 @@ Subject: pyavitz meson64-generalized `odroid-reboot` driver 3 files changed, 194 insertions(+) diff --git a/drivers/power/reset/Kconfig b/drivers/power/reset/Kconfig -index 411e00b255d6..a47ce2a431d6 100644 +index fece990af4a7..3b924b23b05c 100644 --- a/drivers/power/reset/Kconfig +++ b/drivers/power/reset/Kconfig @@ -148,6 +148,13 @@ config POWER_RESET_ODROID_GO_ULTRA_POWEROFF diff --git a/patch/kernel/archive/meson64-6.7/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/meson64-6.7/drv-spi-spidev-remove-warnings.patch index 860d6be168..3f45ecf1ea 100644 --- a/patch/kernel/archive/meson64-6.7/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/meson64-6.7/drv-spi-spidev-remove-warnings.patch @@ -13,18 +13,18 @@ Remove SPIdev warnings 1 file changed, 2 insertions(+) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index d13dc15cc191..90d9a33a97bf 100644 +index 655f2c959cd4..d80d474a606e 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -704,6 +704,7 @@ static const struct file_operations spidev_fops = { - static struct class *spidev_class; +@@ -700,6 +700,7 @@ static const struct class spidev_class = { + }; static const struct spi_device_id spidev_spi_ids[] = { + { .name = "spi-dev" }, { .name = "dh2228fv" }, { .name = "ltc2488" }, { .name = "sx1301" }, -@@ -732,6 +733,7 @@ static int spidev_of_check(struct device *dev) +@@ -728,6 +729,7 @@ static int spidev_of_check(struct device *dev) } static const struct of_device_id spidev_dt_ids[] = { diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-g12a-radxa-zero-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-g12a-radxa-zero-spidev.dts new file mode 100644 index 0000000000..5ee13525d1 --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-g12a-radxa-zero-spidev.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-g12a-radxa-zero.dts" + +/ { + model = "Radxa Zero with SPIDEV and I2C - MOSI pin 19, CLK pin 23 - SDA pin 3, SCL pin 5"; +}; + +&spicc1 { + pinctrl-0 = <&spicc1_pins &spicc1_ss0_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>; + pinctrl-names = "default"; +}; diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-g12b-a311d-khadas-vim3-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-a311d-khadas-vim3-spidev.dts new file mode 100644 index 0000000000..8982a04c9d --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-a311d-khadas-vim3-spidev.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-g12b-a311d-khadas-vim3.dts" + +/ { + model = "Khadas VIM3 with SPIDEV and I2C - MOSI pin 37, CLK pin 16 - SDA pin 23, SCL pin 23"; +}; + +&spicc1 { + pinctrl-0 = <&spicc1_pins &spicc1_ss0_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>; + pinctrl-names = "default"; +}; diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-g12b-odroid-n2-plus-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-odroid-n2-plus-spidev.dts new file mode 100644 index 0000000000..a87ddd4647 --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-odroid-n2-plus-spidev.dts @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-g12b-odroid-n2-plus.dts" + +/ { + model = "Hardkernel ODROID-N2Plus with SPIDEV - MISO is pin 19, CLK is pin 23"; +}; + +&spicc0 { + cs-gpios = <&gpio GPIOX_10 GPIO_ACTIVE_LOW>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-g12b-radxa-zero2-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-radxa-zero2-spidev.dts new file mode 100644 index 0000000000..0d16cde214 --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-g12b-radxa-zero2-spidev.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-g12b-radxa-zero2.dts" + +/ { + model = "Radxa Zero2 with SPIDEV and I2C - MOSI pin 19, CLK pin 23 - SDA pin 3, SCL pin 5"; +}; + +&spicc1 { + pinctrl-0 = <&spicc1_pins &spicc1_ss0_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>; + pinctrl-names = "default"; +}; diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-sm1-khadas-vim3l-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-sm1-khadas-vim3l-spidev.dts new file mode 100644 index 0000000000..e7a0f5a3fc --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-sm1-khadas-vim3l-spidev.dts @@ -0,0 +1,29 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-sm1-khadas-vim3l.dts" + +/ { + model = "Khadas VIM3L with SPIDEV and I2C - MOSI pin 37, CLK pin 16 - SDA pin 23, SCL pin 23"; +}; + +&spicc1 { + pinctrl-0 = <&spicc1_pins &spicc1_ss0_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + +&i2c3 { + status = "okay"; + pinctrl-0 = <&i2c3_sck_a_pins &i2c3_sda_a_pins>; + pinctrl-names = "default"; +}; diff --git a/patch/kernel/archive/meson64-6.7/dt/meson-sm1-odroid-c4-spidev.dts b/patch/kernel/archive/meson64-6.7/dt/meson-sm1-odroid-c4-spidev.dts new file mode 100644 index 0000000000..4688b40052 --- /dev/null +++ b/patch/kernel/archive/meson64-6.7/dt/meson-sm1-odroid-c4-spidev.dts @@ -0,0 +1,24 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) + +/dts-v1/; + +#include "meson-sm1-odroid-c4.dts" + +/ { + model = "Hardkernel ODROID-C4 - MOSI is pin y, CLK is pin x"; +}; + +&spicc1 { + pinctrl-0 = <&spicc1_pins &spicc1_ss0_pins>; + pinctrl-names = "default"; + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + spidev@0 { + compatible = "armbian,spi-dev"; + status = "okay"; + reg = <0>; + spi-max-frequency = <10000000>; + }; +}; + diff --git a/patch/kernel/archive/meson64-6.7/general-add-overlay-compilation-support.patch b/patch/kernel/archive/meson64-6.7/general-add-overlay-compilation-support.patch index 65f5c5b01d..879999c72e 100644 --- a/patch/kernel/archive/meson64-6.7/general-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/meson64-6.7/general-add-overlay-compilation-support.patch @@ -55,7 +55,7 @@ index 4405d5b67578..04df2e7c8453 100644 $(subdirs): $(Q)$(MAKE) $(dtbinst)=$@ dst=$(if $(CONFIG_ARCH_WANT_FLAT_DTB_INSTALL),$(dst),$(patsubst $(obj)/%,$(dst)/%,$@)) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 68d0134bdbf9..9ea801a22569 100644 +index 1a965fe68e01..989bcf25abc9 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -343,6 +343,9 @@ DTC ?= $(objtree)/scripts/dtc/dtc diff --git a/patch/kernel/archive/meson64-6.7/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch b/patch/kernel/archive/meson64-6.7/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch index 2c2d0dddc5..5d9d51085a 100644 --- a/patch/kernel/archive/meson64-6.7/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch +++ b/patch/kernel/archive/meson64-6.7/general-drm-dw-hdmi-call-hdmi_set_cts_n-after-clock.patch @@ -10,7 +10,7 @@ Unknown patch. Archeology: 1 file changed, 5 insertions(+) diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c -index 6c1d79474505..a6c205bb4164 100644 +index 52d91a0df85e..f42089295834 100644 --- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c +++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c @@ -768,6 +768,11 @@ static void hdmi_enable_audio_clk(struct dw_hdmi *hdmi, bool enable) diff --git a/patch/kernel/archive/meson64-6.7/general-drm-panfrost-fix-reference-leak.patch b/patch/kernel/archive/meson64-6.7/general-drm-panfrost-fix-reference-leak.patch index b7431fb5af..6426b3943f 100644 --- a/patch/kernel/archive/meson64-6.7/general-drm-panfrost-fix-reference-leak.patch +++ b/patch/kernel/archive/meson64-6.7/general-drm-panfrost-fix-reference-leak.patch @@ -21,10 +21,10 @@ Signed-off-by: Qinglang Miao 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panfrost/panfrost_job.c b/drivers/gpu/drm/panfrost/panfrost_job.c -index a8b4827dc425..90acafb4ea7a 100644 +index ecd2e035147f..34dd32d58404 100644 --- a/drivers/gpu/drm/panfrost/panfrost_job.c +++ b/drivers/gpu/drm/panfrost/panfrost_job.c -@@ -194,7 +194,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) +@@ -204,7 +204,7 @@ static void panfrost_job_hw_submit(struct panfrost_job *job, int js) panfrost_devfreq_record_busy(&pfdev->pfdevfreq); diff --git a/patch/kernel/archive/meson64-6.7/general-fix-Kodi-sysinfo-CPU-information.patch b/patch/kernel/archive/meson64-6.7/general-fix-Kodi-sysinfo-CPU-information.patch index b51e8c9f06..8a0a33232f 100644 --- a/patch/kernel/archive/meson64-6.7/general-fix-Kodi-sysinfo-CPU-information.patch +++ b/patch/kernel/archive/meson64-6.7/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 98fda8500535..945030a5caf6 100644 +index a257da7b56fe..de893e3a5e57 100644 --- a/arch/arm64/kernel/cpuinfo.c +++ b/arch/arm64/kernel/cpuinfo.c -@@ -189,8 +189,7 @@ static int c_show(struct seq_file *m, void *v) +@@ -192,8 +192,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.7/general-hdmi-codec-reorder-channel-allocation-list.patch b/patch/kernel/archive/meson64-6.7/general-hdmi-codec-reorder-channel-allocation-list.patch index e8045bb1b8..dc97e12845 100644 --- a/patch/kernel/archive/meson64-6.7/general-hdmi-codec-reorder-channel-allocation-list.patch +++ b/patch/kernel/archive/meson64-6.7/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 09eef6042aad..f2de713d17be 100644 +index 0938671700c6..03290d3ae59c 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.7/general-input-touchscreen-Add-D-WAV-Multitouch.patch b/patch/kernel/archive/meson64-6.7/general-input-touchscreen-Add-D-WAV-Multitouch.patch index e55917b5a1..9710b024d3 100644 --- a/patch/kernel/archive/meson64-6.7/general-input-touchscreen-Add-D-WAV-Multitouch.patch +++ b/patch/kernel/archive/meson64-6.7/general-input-touchscreen-Add-D-WAV-Multitouch.patch @@ -13,10 +13,10 @@ Change-Id: Ia1c8c29d3f69c6ba5d630279c4cc98119b68ab71 5 files changed, 574 insertions(+) diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h -index e4d2dfd5d253..28543327a2df 100644 +index 72046039d1be..5c0efbad32ac 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1457,4 +1457,10 @@ +@@ -1461,4 +1461,10 @@ #define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 @@ -28,10 +28,10 @@ index e4d2dfd5d253..28543327a2df 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 3983b4f282f8..38217748b1ec 100644 +index e0bbf0c6345d..c2d0f8d9ef3b 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c -@@ -888,6 +888,9 @@ static const struct hid_device_id hid_ignore_list[] = { +@@ -891,6 +891,9 @@ static const struct hid_device_id hid_ignore_list[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SYNAPTICS, USB_DEVICE_ID_SYNAPTICS_DPAD) }, #endif { HID_USB_DEVICE(USB_VENDOR_ID_YEALINK, USB_DEVICE_ID_YEALINK_P1K_P4K_B2K) }, diff --git a/patch/kernel/archive/meson64-6.7/general-media-cec-silence-CEC-timeout-message-HACK.patch b/patch/kernel/archive/meson64-6.7/general-media-cec-silence-CEC-timeout-message-HACK.patch index 513b386dd5..3197249214 100644 --- a/patch/kernel/archive/meson64-6.7/general-media-cec-silence-CEC-timeout-message-HACK.patch +++ b/patch/kernel/archive/meson64-6.7/general-media-cec-silence-CEC-timeout-message-HACK.patch @@ -19,7 +19,7 @@ Signed-off-by: Christian Hewitt 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/media/cec/core/cec-adap.c b/drivers/media/cec/core/cec-adap.c -index 09ca83c23329..e86b8e3f463c 100644 +index 6bb49bb3f98c..118511ec69b7 100644 --- a/drivers/media/cec/core/cec-adap.c +++ b/drivers/media/cec/core/cec-adap.c @@ -501,9 +501,9 @@ int cec_thread_func(void *_adap) diff --git a/patch/kernel/archive/meson64-6.7/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch b/patch/kernel/archive/meson64-6.7/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch index 92136891bd..5486ec1836 100644 --- a/patch/kernel/archive/meson64-6.7/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch +++ b/patch/kernel/archive/meson64-6.7/general-meson-mmc-1-arm64-amlogic-mmc-meson-gx-Add-core-tx-rx-eMMC-SD-SD.patch @@ -16,7 +16,7 @@ Signed-off-by: Vyacheslav Bocharov 2 files changed, 48 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/meson-gx-mmc.c b/drivers/mmc/host/meson-gx-mmc.c -index 9837dab096e6..30404107f85d 100644 +index c7c067b9415a..7268946d3894 100644 --- a/drivers/mmc/host/meson-gx-mmc.c +++ b/drivers/mmc/host/meson-gx-mmc.c @@ -27,6 +27,7 @@ diff --git a/patch/kernel/archive/meson64-6.7/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch b/patch/kernel/archive/meson64-6.7/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch index 88f85a73de..1c3a874506 100644 --- a/patch/kernel/archive/meson64-6.7/general-meson-mmc-2-arm64-amlogic-dts-meson-update-meson-axg-device-tree.patch +++ b/patch/kernel/archive/meson64-6.7/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 768d0ed78dbe..892a5f147e6d 100644 +index a49aa62e3f9f..01fa5d42c74d 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -13,6 +13,7 @@ @@ -38,7 +38,7 @@ index 768d0ed78dbe..892a5f147e6d 100644 + amlogic,mmc-phase = ; }; - usb2_phy1: phy@9020 { + nfc: nand-controller@7800 { -- Armbian diff --git a/patch/kernel/archive/meson64-6.7/general-meson64-overlays.patch b/patch/kernel/archive/meson64-6.7/general-meson64-overlays.patch index cfe89608b4..75886c5154 100644 --- a/patch/kernel/archive/meson64-6.7/general-meson64-overlays.patch +++ b/patch/kernel/archive/meson64-6.7/general-meson64-overlays.patch @@ -9,7 +9,7 @@ Signed-off-by: Zhang Ning <832666+zhangn1985@users.noreply.github.com> 1 file changed, 3 insertions(+) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 9ea801a22569..d68118f6ec48 100644 +index 989bcf25abc9..49e8ac24c604 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.7/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch b/patch/kernel/archive/meson64-6.7/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch deleted file mode 100644 index a6f917d005..0000000000 --- a/patch/kernel/archive/meson64-6.7/general-rc-drivers-should-produce-alternate-pulse-and-space-timing-events.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Igor Pecovnik -Date: Tue, 26 Jun 2018 12:47:49 +0000 -Subject: media: rc: drivers should produce alternate pulse and space timing - events - -Unknown patch. Archeology revelated nothing. Good luck... ---- - drivers/media/rc/meson-ir.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/drivers/media/rc/meson-ir.c b/drivers/media/rc/meson-ir.c -index 70322fab34ac..690ad0ddc31c 100644 ---- a/drivers/media/rc/meson-ir.c -+++ b/drivers/media/rc/meson-ir.c -@@ -77,7 +77,8 @@ static irqreturn_t meson_ir_irq(int irqno, void *dev_id) - regmap_read(ir->reg, IR_DEC_STATUS, &status); - rawir.pulse = !!(status & IR_DEC_STATUS_PULSE); - -- ir_raw_event_store_with_timeout(ir->rc, &rawir); -+ if (ir_raw_event_store_with_filter(ir->rc, &rawir)) -+ ir_raw_event_handle(ir->rc); - - spin_unlock(&ir->lock); - --- -Armbian - diff --git a/patch/kernel/archive/meson64-6.7/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.7/general-spi-nor-add-support-for-XT25F128B.patch index 407dabd2ca..8b7af508f5 100644 --- a/patch/kernel/archive/meson64-6.7/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.7/general-spi-nor-add-support-for-XT25F128B.patch @@ -29,10 +29,10 @@ in the core.{c,h} files. 4 files changed, 20 insertions(+) diff --git a/drivers/mtd/spi-nor/Makefile b/drivers/mtd/spi-nor/Makefile -index e347b435a038..8992c592a896 100644 +index 5e68468b72fc..4463d161aa5b 100644 --- a/drivers/mtd/spi-nor/Makefile +++ b/drivers/mtd/spi-nor/Makefile -@@ -17,6 +17,7 @@ spi-nor-objs += sst.o +@@ -15,6 +15,7 @@ spi-nor-objs += sst.o spi-nor-objs += winbond.o spi-nor-objs += xilinx.o spi-nor-objs += xmc.o @@ -41,10 +41,10 @@ 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 1b0c6770c14e..0cd1b57ecfcd 100644 +index 1c443fe568cf..a5127a62a6c0 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -2013,6 +2013,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_winbond, &spi_nor_xilinx, &spi_nor_xmc, @@ -53,10 +53,10 @@ index 1b0c6770c14e..0cd1b57ecfcd 100644 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 9217379b9cfe..28b90256425a 100644 +index 93cd2fc3606d..349a11a2e9f5 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -647,6 +647,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; +@@ -615,6 +615,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.7/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.7/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 6fbf4bb50b..c7976ed6a9 100644 --- a/patch/kernel/archive/meson64-6.7/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.7/general-usb-core-improve-handling-of-hubs-with-no-ports.patch @@ -33,10 +33,10 @@ 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 fd94382c3fcc..52f776430d32 100644 +index 80ed09e9be4a..565c5f5b9fce 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1458,9 +1458,8 @@ static int hub_configure(struct usb_hub *hub, +@@ -1435,9 +1435,8 @@ static int hub_configure(struct usb_hub *hub, ret = -ENODEV; goto fail; } else if (hub->descriptor->bNbrPorts == 0) { diff --git a/patch/kernel/archive/meson64-6.7/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch b/patch/kernel/archive/meson64-6.7/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch index e52050d533..ea00ddd50d 100644 --- a/patch/kernel/archive/meson64-6.7/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch +++ b/patch/kernel/archive/meson64-6.7/jethome-0002-arm64-dts-jethub-j1xx-add-eeprom-node.patch @@ -1,12 +1,12 @@ -From b2551c258d19c06a8d946338a7f79395f12870c4 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Fri, 20 Oct 2023 14:06:58 +0300 -Subject: [PATCH] arm64: dts: jethub-j1xx: add eeprom node +Subject: arm64: dts: jethub-j1xx: add eeprom node Add node for eeprom on baseboard in JetHub D1+ device --- - .../amlogic/meson-axg-jethome-jethub-j110-rev-2.dts | 12 ++++++++++++ - .../amlogic/meson-axg-jethome-jethub-j110-rev-3.dts | 12 ++++++++++++ + arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts | 12 ++++++++++ + arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-3.dts | 12 ++++++++++ 2 files changed, 24 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts b/arch/arm64/boot/dts/amlogic/meson-axg-jethome-jethub-j110-rev-2.dts @@ -50,5 +50,5 @@ index c2d22b00c1cd..6a5664d908d5 100644 + }; +}; -- -2.34.1 +Armbian