diff --git a/patch/kernel/archive/meson64-6.2/0001-dt-bindings-arm-amlogic-Document-the-boards-with-the.patch b/patch/kernel/archive/meson64-6.2/0001-dt-bindings-arm-amlogic-Document-the-boards-with-the.patch deleted file mode 100644 index 7d5317f0b0..0000000000 --- a/patch/kernel/archive/meson64-6.2/0001-dt-bindings-arm-amlogic-Document-the-boards-with-the.patch +++ /dev/null @@ -1,42 +0,0 @@ -From f4794df976bbf6c109f3d4bd7e247bcbfc587db6 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Mon, 6 Mar 2023 09:31:38 +0100 -Subject: [PATCH] dt-bindings: arm: amlogic: Document the boards with the - BPI-CM4 connected - -The BPI-CM4 module with an Amlogic A311D SoC is a module compatible -with the Raspberry Pi CM4 specifications. - -Document the boards using this module, by specifying the BananaPi CM4 -compatible in addition to the baseboard compatible. - -Acked-by: Krzysztof Kozlowski -Reviewed-by: Martin Blumenstingl -Link: https://lore.kernel.org/r/20230303-topic-amlogic-upstream-bpi-cm4-v2-1-2ecfde76fc4d@linaro.org -Signed-off-by: Neil Armstrong ---- - Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++ - 1 file changed, 8 insertions(+) - -diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index e16b5fa55847..30b27917a8be 100644 ---- a/Documentation/devicetree/bindings/arm/amlogic.yaml -+++ b/Documentation/devicetree/bindings/arm/amlogic.yaml -@@ -157,6 +157,14 @@ properties: - - const: amlogic,a311d - - const: amlogic,g12b - -+ - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC -+ items: -+ - enum: -+ - bananapi,bpi-cm4io -+ - const: bananapi,bpi-cm4 -+ - const: amlogic,a311d -+ - const: amlogic,g12b -+ - - description: Boards with the Amlogic Meson G12B S922X SoC - items: - - enum: --- -2.34.1 - diff --git a/patch/kernel/archive/meson64-6.2/0002-arm64-dts-amlogic-Add-initial-support-for-BPI-CM4-mo.patch b/patch/kernel/archive/meson64-6.2/add-board-bananapi-cm4-cm4io.patch similarity index 86% rename from patch/kernel/archive/meson64-6.2/0002-arm64-dts-amlogic-Add-initial-support-for-BPI-CM4-mo.patch rename to patch/kernel/archive/meson64-6.2/add-board-bananapi-cm4-cm4io.patch index bc74aec7cd..198e0b70d1 100644 --- a/patch/kernel/archive/meson64-6.2/0002-arm64-dts-amlogic-Add-initial-support-for-BPI-CM4-mo.patch +++ b/patch/kernel/archive/meson64-6.2/add-board-bananapi-cm4-cm4io.patch @@ -1,8 +1,50 @@ -From 2f449155e401644dd2f28b0ee8e17bd609e4ba0e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Neil Armstrong +Date: Mon, 6 Mar 2023 09:31:38 +0100 +Subject: dt-bindings: arm: amlogic: Document the boards with the BPI-CM4 + connected + +The BPI-CM4 module with an Amlogic A311D SoC is a module compatible +with the Raspberry Pi CM4 specifications. + +Document the boards using this module, by specifying the BananaPi CM4 +compatible in addition to the baseboard compatible. + +Acked-by: Krzysztof Kozlowski +Reviewed-by: Martin Blumenstingl +Link: https://lore.kernel.org/r/20230303-topic-amlogic-upstream-bpi-cm4-v2-1-2ecfde76fc4d@linaro.org +Signed-off-by: Neil Armstrong +--- + Documentation/devicetree/bindings/arm/amlogic.yaml | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml +index e16b5fa55847..30b27917a8be 100644 +--- a/Documentation/devicetree/bindings/arm/amlogic.yaml ++++ b/Documentation/devicetree/bindings/arm/amlogic.yaml +@@ -157,6 +157,14 @@ properties: + - const: amlogic,a311d + - const: amlogic,g12b + ++ - description: Boards using the BPI-CM4 module with Amlogic Meson G12B A311D SoC ++ items: ++ - enum: ++ - bananapi,bpi-cm4io ++ - const: bananapi,bpi-cm4 ++ - const: amlogic,a311d ++ - const: amlogic,g12b ++ + - description: Boards with the Amlogic Meson G12B S922X SoC + items: + - enum: +-- +Armbian + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Mon, 6 Mar 2023 09:31:39 +0100 -Subject: [PATCH] arm64: dts: amlogic: Add initial support for BPI-CM4 module - with BPI-CM4IO baseboard +Subject: arm64: dts: amlogic: Add initial support for BPI-CM4 module with + BPI-CM4IO baseboard Add support for both the BananaPi BPI-CM4 module and the BananaPi baseboard which is comnpatible with the RaspberryPi CM4IO baseboard. @@ -24,12 +66,10 @@ Reviewed-by: Martin Blumenstingl Link: https://lore.kernel.org/r/20230303-topic-amlogic-upstream-bpi-cm4-v2-2-2ecfde76fc4d@linaro.org Signed-off-by: Neil Armstrong --- - arch/arm64/boot/dts/amlogic/Makefile | 1 + - .../amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++++++ - .../dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 ++++++++++++++++++ + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 165 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi | 388 ++++++++++ 3 files changed, 554 insertions(+) - create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts - create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4.dtsi diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile index 97b42e2100e0..d4b315a05ef9 100644 @@ -609,5 +649,5 @@ index 000000000000..97e522921b06 + phy-names = "usb2-phy0", "usb2-phy1"; +}; -- -2.34.1 +Armbian 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 045d01c10d..297a4f0c5a 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 e16b5fa55847..8f27abb41efe 100644 +index 30b27917a8be..5460cae8edcd 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 e16b5fa55847..8f27abb41efe 100644 - const: amlogic,g12b diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 97b42e2100e0..11602291a9bf 100644 +index d4b315a05ef9..59d086050ec2 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 @@ -31,9 +31,9 @@ index 97b42e2100e0..11602291a9bf 100644 dtb-$(CONFIG_ARCH_MESON) += meson-g12a-x96-max.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-khadas-vim3.dtb +dtb-$(CONFIG_ARCH_MESON) += meson-g12b-a311d-bananapi-m2s.dtb + dtb-$(CONFIG_ARCH_MESON) += meson-g12b-bananapi-cm4-cm4io.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gsking-x.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb - dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb diff --git a/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts b/arch/arm64/boot/dts/amlogic/meson-g12b-a311d-bananapi-m2s.dts new file mode 100644 index 000000000000..65f11dde0a7a 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 8b87c8c164..a8db98abd3 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 @@ -9,11 +9,13 @@ A311D chip. Signed-off-by: Christian Hewitt Signed-off-by: Yuntian Zhang --- - Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + - 1 file changed, 1 insertion(+) + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 576 ++++++++++ + 3 files changed, 578 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/amlogic.yaml b/Documentation/devicetree/bindings/arm/amlogic.yaml -index 8f27abb41efe..dc4b44f01b64 100644 +index 5460cae8edcd..81be728c83e7 100644 --- a/Documentation/devicetree/bindings/arm/amlogic.yaml +++ b/Documentation/devicetree/bindings/arm/amlogic.yaml @@ -155,6 +155,7 @@ properties: @@ -24,40 +26,11 @@ index 8f27abb41efe..dc4b44f01b64 100644 - const: amlogic,a311d - const: amlogic,g12b --- -Armbian - -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Yuntian Zhang -Date: Fri, 14 Jan 2022 15:50:02 +0000 -Subject: arm64: dts: meson: add support for Radxa Zero2 - -Radxa Zero2 is a small form factor SBC based on the Amlogic A311D -chipset that ships in a number of eMMC configurations: - -- Amlogic A311D (Quad A73 + Dual A53) CPU -- 4GB LPDDR4 RAM -- 32/64/128GB eMMC -- Mali G52-MP4 GPU -- HDMI 2.1 output (micro) -- BCM4345 WiFi (2.4/5GHz a/b/g/n/ac) and BT 5.0 -- 1x USB 2.0 port - Type C (OTG) -- 1x USB 3.0 port - Type C (Host) -- 1x micro SD Card slot -- 40 Pin GPIO header - -Signed-off-by: Yuntian Zhang -Signed-off-by: Christian Hewitt ---- - arch/arm64/boot/dts/amlogic/Makefile | 1 + - arch/arm64/boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 576 ++++++++++ - 2 files changed, 577 insertions(+) - diff --git a/arch/arm64/boot/dts/amlogic/Makefile b/arch/arm64/boot/dts/amlogic/Makefile -index 11602291a9bf..1244bc435313 100644 +index 59d086050ec2..d94e3f3530d9 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -16,6 +16,7 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking.dtb +@@ -17,6 +17,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 diff --git a/patch/kernel/archive/meson64-6.2/board-bananapim5-sd-use-270-mmc-clock-phase-via-dt.patch b/patch/kernel/archive/meson64-6.2/board-bananapim5-sd-use-270-mmc-clock-phase-via-dt.patch index 9e68f88b3f..791256a027 100644 --- a/patch/kernel/archive/meson64-6.2/board-bananapim5-sd-use-270-mmc-clock-phase-via-dt.patch +++ b/patch/kernel/archive/meson64-6.2/board-bananapim5-sd-use-270-mmc-clock-phase-via-dt.patch @@ -9,7 +9,7 @@ BananaPi M5: 270 clock phase, via amlogic,mmc-phase 1 file changed, 5 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts -index cadba194b149..9c3155426d40 100644 +index 38ebe98ba9c6..37ae57f81b87 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-bananapi-m5.dts @@ -12,6 +12,7 @@ diff --git a/patch/kernel/archive/meson64-6.2/board-odroidhc4-enable-fan1_input.patch b/patch/kernel/archive/meson64-6.2/board-odroidhc4-enable-fan1_input.patch index 024bb5bdce..1e694e8f13 100644 --- a/patch/kernel/archive/meson64-6.2/board-odroidhc4-enable-fan1_input.patch +++ b/patch/kernel/archive/meson64-6.2/board-odroidhc4-enable-fan1_input.patch @@ -10,7 +10,7 @@ Subject: ODROID-HC4: add DT attributes to enable fan1_input 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index a1f0c38ccadd..7fd4aac142af 100644 +index 74088e7280fe..9b3d3e7930d1 100644 --- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts +++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts @@ -23,6 +23,10 @@ fan0: pwm-fan { diff --git a/patch/kernel/archive/meson64-6.2/board-odroidhc4-kernel-trip-for-cooling-map.patch b/patch/kernel/archive/meson64-6.2/board-odroidhc4-kernel-trip-for-cooling-map.patch deleted file mode 100644 index 038695c669..0000000000 --- a/patch/kernel/archive/meson64-6.2/board-odroidhc4-kernel-trip-for-cooling-map.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Neil Armstrong -Date: Tue, 24 Jan 2023 12:39:08 +0100 -Subject: arm64: dts: amlogic: meson-sm1-odroid-hc4: fix active fan thermal - trip - -Add an active trip tied to the on-board fan cooling device, which is better -than describing it along the passive cooling maps. - -Fixes: 33b14f663df8 ("arm64: dts: meson: add initial device-tree for ODROID-HC4") -Reported-by: Ricardo Pardini -Signed-off-by: Neil Armstrong ---- - arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -index 7fd4aac142af..9b3d3e7930d1 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-sm1-odroid-hc4.dts -@@ -80,9 +80,17 @@ sound { - }; - - &cpu_thermal { -+ trips { -+ cpu_active: cpu-active { -+ temperature = <60000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "active"; -+ }; -+ }; -+ - cooling-maps { - map { -- trip = <&cpu_passive>; -+ trip = <&cpu_active>; - cooling-device = <&fan0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; - }; - }; --- -Armbian - 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 8becf1c92b..276e6f1e89 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,10 +14,10 @@ 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 1244bc435313..7c71c6488606 100644 +index d94e3f3530d9..1431d6a8be04 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -15,7 +15,9 @@ dtb-$(CONFIG_ARCH_MESON) += meson-g12b-gtking-pro.dtb +@@ -16,7 +16,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-go-ultra.dtb dtb-$(CONFIG_ARCH_MESON) += meson-g12b-odroid-n2-plus.dtb diff --git a/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch b/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch index 19e996c124..8b6b37ce5f 100644 --- a/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch +++ b/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-add-support-for-the-usb-c-controller.patch @@ -23,7 +23,7 @@ Signed-off-by: Yuntian Zhang 1 file changed, 48 insertions(+) diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index e3bb6df42ff3..28eaaa83a00e 100644 +index cf0a9be83fc4..29cfcc045bea 100644 --- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts +++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts @@ -60,6 +60,14 @@ sdio_pwrseq: sdio-pwrseq { @@ -87,9 +87,9 @@ index e3bb6df42ff3..28eaaa83a00e 100644 &pwm_AO_cd { pinctrl-0 = <&pwm_ao_d_e_pins>; pinctrl-names = "default"; -@@ -403,3 +443,11 @@ &usb { +@@ -402,3 +442,11 @@ &uart_AO { + &usb { status = "okay"; - dr_mode = "host"; }; + +&usb2_phy0 { diff --git a/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-otg-fix.patch b/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-otg-fix.patch deleted file mode 100644 index bcb9adf608..0000000000 --- a/patch/kernel/archive/meson64-6.2/board-radxa-zero-dts-otg-fix.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Stephen -Date: Thu, 28 Oct 2021 14:26:24 +0800 -Subject: arm64: dts: radxa zero: set dr_mode of usb node to otg - -This enables dwc2 otg function. - -Signed-off-by: Stephen -Signed-off-by: Yuntian Zhang ---- - arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -index 28eaaa83a00e..29cfcc045bea 100644 ---- a/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -+++ b/arch/arm64/boot/dts/amlogic/meson-g12a-radxa-zero.dts -@@ -441,7 +441,6 @@ &uart_AO { - - &usb { - status = "okay"; -- dr_mode = "host"; - }; - - &usb2_phy0 { --- -Armbian - 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 bb188b6217..ba12ae1a44 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 @@ -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 9e36b4cd905e..8897e84f2dd5 100644 +index 2235d78784b1..eea0aba3ac08 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h -@@ -1421,4 +1421,10 @@ +@@ -1423,4 +1423,10 @@ #define USB_VENDOR_ID_SIGNOTEC 0x2133 #define USB_DEVICE_ID_SIGNOTEC_VIEWSONIC_PD1011 0x0018 @@ -28,7 +28,7 @@ index 9e36b4cd905e..8897e84f2dd5 100644 + #endif diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c -index 5bc91f68b374..d90979c6dc30 100644 +index 66e64350f138..1d8bd0b7c6d9 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c @@ -879,6 +879,9 @@ static const struct hid_device_id hid_ignore_list[] = { 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 dce22df33f..545b59ee78 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 417523dc4cc0..b8a9e476bde2 100644 +index ff2b33313e63..58848e78efe4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -13,6 +13,7 @@ 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 be5813ee9d..cc8af9def9 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 7c71c6488606..25d37bb721d4 100644 +index 1431d6a8be04..d06419191e88 100644 --- a/arch/arm64/boot/dts/amlogic/Makefile +++ b/arch/arm64/boot/dts/amlogic/Makefile -@@ -72,3 +72,5 @@ dtb-$(CONFIG_ARCH_MESON) += meson-sm1-odroid-hc4.dtb +@@ -73,3 +73,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 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 d4415249f3..0bfee17233 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 @@ -41,7 +41,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 d67c926bca8b..c63ac0c77468 100644 +index 2ef2660f5818..699624ea6835 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c @@ -1633,6 +1633,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { @@ -53,7 +53,7 @@ index d67c926bca8b..c63ac0c77468 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 f03b55cf7e6f..27aeb7dff93b 100644 +index 958cd143c934..21c195a72793 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h @@ -629,6 +629,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; 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 6ac5f6cc24..8fccef6313 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 9eca403af2a8..33ad681f87d7 100644 +index 97a0f8faea6e..d5f256e7a144 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, 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 1e71ba2aa1..8bf4b055a7 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 7f55d97f6c28..ab36d2e41381 100644 +index c063a144e0e7..50d6065fdb6e 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 { 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 d846183ad6..84fad81c69 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,7 +9,7 @@ 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 5eed15035b67..8f1e17a656cb 100644 +index 11f89bfecb56..87948abd30d4 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi @@ -222,6 +222,10 @@ sm: secure-monitor {