diff --git a/patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_A-and-AO_B.patch b/patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_A-and-AO_B.patch index 4d7426fa83..15d5afa70b 100644 --- a/patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_A-and-AO_B.patch +++ b/patch/kernel/archive/meson64-6.5/board-bananapism1-add-uart_A-and-AO_B.patch @@ -1,20 +1,20 @@ -From 3252f85be0129364248e90ffea77c3ce5d1a4623 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Patrick Yavitz Date: Thu, 21 Sep 2023 07:46:59 -0400 -Subject: [PATCH] arm64: dts: amlogic: meson-sm1-bananapi: add uart A and AO_B +Subject: arm64: dts: amlogic: meson-sm1-bananapi: add uart A and AO_B Signed-off-by: Patrick Yavitz --- - arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 +++++++++ - .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 10 ++++++++++ - arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 7 +++++++ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 +++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 10 ++++++++++ + arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi | 7 +++++++ 3 files changed, 26 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -index 88b848c65b0d..7e85b7dc356d 100644 +index 0c49655cc90c..016529233345 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi -@@ -1893,6 +1893,15 @@ mux { +@@ -1899,6 +1899,15 @@ mux { }; }; @@ -56,10 +56,10 @@ index 586034316ec3..5ccdc91ac276 100644 + pinctrl-0 = <&uart_a_pins>; +}; diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -index ea4784a190da..4f7c11481133 100644 +index 7e80151874f1..1ab93090dc4c 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi.dtsi -@@ -26,6 +26,7 @@ key { +@@ -26,6 +26,7 @@ button-sw3 { aliases { serial0 = &uart_AO; @@ -81,5 +81,5 @@ index ea4784a190da..4f7c11481133 100644 status = "okay"; }; -- -2.39.2 +Armbian diff --git a/patch/kernel/archive/meson64-6.5/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch b/patch/kernel/archive/meson64-6.5/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch index 861c861fc2..481a239cdf 100644 --- a/patch/kernel/archive/meson64-6.5/board-odroidc2-usb-hub-disable-autosuspend-for-Genesys-Logic-.patch +++ b/patch/kernel/archive/meson64-6.5/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 a739403a9e45..d56ad5ccac81 100644 +index 26a27ff50408..60fe64551e5b 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -5870,7 +5870,7 @@ static const struct usb_device_id hub_id_table[] = { +@@ -5926,7 +5926,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.5/general-media-cec-silence-CEC-timeout-message-HACK.patch b/patch/kernel/archive/meson64-6.5/general-media-cec-silence-CEC-timeout-message-HACK.patch index e3653a3265..513b386dd5 100644 --- a/patch/kernel/archive/meson64-6.5/general-media-cec-silence-CEC-timeout-message-HACK.patch +++ b/patch/kernel/archive/meson64-6.5/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 241b1621b197..a5823a416a0d 100644 +index 09ca83c23329..e86b8e3f463c 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.5/general-spi-nor-add-support-for-XT25F128B.patch b/patch/kernel/archive/meson64-6.5/general-spi-nor-add-support-for-XT25F128B.patch index 13e34f5fbb..e169d859dc 100644 --- a/patch/kernel/archive/meson64-6.5/general-spi-nor-add-support-for-XT25F128B.patch +++ b/patch/kernel/archive/meson64-6.5/general-spi-nor-add-support-for-XT25F128B.patch @@ -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 5f29fac8669a..8e737ce9bee7 100644 +index 72973cfb1d20..6f30fed5760e 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2014,6 +2014,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_winbond, &spi_nor_xilinx, &spi_nor_xmc, @@ -53,10 +53,10 @@ index 5f29fac8669a..8e737ce9bee7 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 4fb5ff09c63a..099a47cceba0 100644 +index 2453bd5743ac..ce395aee5472 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -644,6 +644,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; +@@ -646,6 +646,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.5/general-usb-core-improve-handling-of-hubs-with-no-ports.patch b/patch/kernel/archive/meson64-6.5/general-usb-core-improve-handling-of-hubs-with-no-ports.patch index 201f0a1581..4ec6e867a9 100644 --- a/patch/kernel/archive/meson64-6.5/general-usb-core-improve-handling-of-hubs-with-no-ports.patch +++ b/patch/kernel/archive/meson64-6.5/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 d56ad5ccac81..1234da0761cf 100644 +index 60fe64551e5b..b2ebe7b75beb 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c @@ -1427,9 +1427,8 @@ static int hub_configure(struct usb_hub *hub,