From 7b0c873f4d0ac3049c07de14e72442df598990c8 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 1 Jul 2022 02:02:59 +0300 Subject: [PATCH] Sunxi 5.18: add megous patches: tag: orange-pi-5.18-20220627-1924 (#3946) * sunxi-5.18: add megous patches: tag: orange-pi-5.18-20220627-1924 * tools: mk_format_patch: ignore-matching-lines git version * sunxi-5.18: re-extracted armbian patches after being applied to 5.18.8 * sunxi-5.18: switch to version tag=v5.18.8 --- ...-dump_reg-and-sunxi-sysinfo-drivers.patch} | 8 +- ...o-fix-uwe5622-bluetooth-MAC-address.patch} | 8 +- ...ay.patch => Compile-the-pwm-overlay.patch} | 6 +- ...arm-sunxi-Add-OrangePi-Zero2-binding.patch | 10 +- ...dd-two-H616-board-compatible-strings.patch | 10 +- ...gpio-gpio-axp209-add-AXP803-GPIO-bin.patch | 38 --- ...n8i-emac-Add-H616-compatible-string.patch} | 8 +- ...ing-for-DWC3-controller-on-Allwinne.patch} | 6 +- ...media-v4l-Add-scaling-matrix-control.patch | 58 ++-- ...media-uapi-hevc-tiles-and-num_slices.patch | 10 +- ...-h6-pwm-settings-to-its-own-overlay.patch} | 6 +- ...h-and-uapi-linux-ipx.h-header-files.patch} | 6 +- ...sb.patch => Rollback-r_rsb-to-r_i2c.patch} | 11 +- ...pi-hevc-add-fields-needed-for-rkvdec.patch | 10 +- ...d-initial-support-for-orangepi3-lts.patch} | 7 +- ...=> add-uwe-bsp-to-OPi3-LTS-dts-file.patch} | 6 +- ...winner-h6-Support-ac200-audio-codec.patch} | 17 +- ...rm-arm64-dts-Add-leds-axp20x-charger.patch | 10 +- ...-Add-sun8i-h2-plus-nanopi-duo-device.patch | 10 +- ...Add-sun8i-h2-plus-sunvell-r69-device.patch | 10 +- ...bietruck-green-LED-mmc0-default-tri.patch} | 6 +- ...3-nanopi-neo-Add-regulator-leds-mmc2.patch | 12 +- ...d-regulator-camera-wifi-bluetooth-o.patch} | 12 +- ...-h3-orangepi-2-Add-regulator-vdd-cpu.patch | 12 +- ...m-dts-overlay-Add-Overlays-for-sunxi.patch | 22 +- ...-Add-panel-lcd-olinuxino-4.3-needed-.patch | 8 +- ...B-IRQ-for-brcm-wifi-on-Cubietruck-a.patch} | 6 +- ...-a20-bananapro-add-hdmi-connector-de.patch | 12 +- ...m-204-evb-olinuxino-micro-decrease-d.patch | 8 +- ...linuxino-lime2-enable-ldo3-always-on.patch | 7 +- ...-orangepi-zero-fix-xradio-interrupt.patch} | 6 +- .../arm-dts-sun8i-h3-add-thermal-zones.patch | 12 +- ...ts-sun8i-h3-nanopi-add-leds-pio-pins.patch | 10 +- ...0-bananapi-m2-ultra-add-codec-analog.patch | 10 +- ...h616-x96-mate-TV-box-device-support.patch} | 8 +- ...dts-allwinner-sun50i-h6-Fix-H6-emmc.patch} | 11 +- ...-dts-sun50i-a64-force-mmc0-bus-width.patch | 10 +- ...-a64-olinuxino-emmc-enable-bluetooth.patch | 7 +- ...4-orangepi-win-add-aliase-ethernet1.patch} | 9 +- ...sun50i-a64-pinebook-enable-Bluetooth.patch | 10 +- ...4-sopine-baseboard-enable-Bluetooth.patch} | 6 +- ...-a64.dtsi-adjust-thermal-trip-points.patch | 10 +- ...arm64-dts-sun50i-h5-add-termal-zones.patch | 10 +- ...anopi-neo2-add-regulator-led-triger.patch} | 6 +- ...sun50i-h5-orangepi-pc2-add-spi-flash.patch | 12 +- ...ngepi-zero-plus2-regulator-gpio-fix.patch} | 6 +- ...n50i-h6-Add-AC200-EPHY-related-nodes.patch | 18 +- ...ts-sun50i-h6-Add-r_uart-uart2-3-pins.patch | 20 +- ...gepi-lite2-spi0-usb3phy-dwc3-enable.patch} | 6 +- ...50i-h6.dtsi-add-pinctrl-pins-for-spi.patch | 12 +- ...-dts-sun50i-h6.dtsi-improve-thermals.patch | 10 +- ...oth-btrtl-Add-rtl8822cs-hci-ver-0008.patch | 10 +- ...-sun50i-a64-revert-ccu-Pinebook-A64.patch} | 13 +- ...urce-arm_arch_timer-fix-a64-timejump.patch | 10 +- ...simple-Add-compability-olinuxino-lcd.patch | 17 +- .../drv-gpu-drm-sun4i-Add-GEM-allocator.patch | 14 +- ...4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch | 12 +- ...rm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch | 12 +- ...dc-Kconfig-enable-A80-A64-H5-for-THS.patch | 10 +- ...rm64-dts-axp803-hwmon-enable-thermal.patch | 24 +- ...rename-A33-specified-registers-to-c.patch} | 6 +- ...sampling-start-end-code-readout-reg.patch} | 6 +- ...-iio-support-nvmem-calibration-data.patch} | 6 +- ...drus-Add-callback-for-buffer-cleanup.patch | 12 +- ...edrus-h264-Improve-buffer-management.patch | 13 +- ...edrus-hevc-Improve-buffer-management.patch | 32 +- .../drv-media-cedrus-hevc-tiles-hack.patch | 22 +- .../drv-mfd-Add-support-for-AC200.patch | 12 +- ...ble-DDR52-mode-on-all-A20-based-boar.patch | 10 +- ...ac-sun8i-second-EMAC-clock-register.patch} | 14 +- ...-nvmem-sunxi_sid-Support-SID-on-H616.patch | 12 +- ...vice-Tree-Overlay-ConfigFS-interface.patch | 14 +- ...usb-Add-support-for-the-H616-USB-PHY.patch | 12 +- ...rtc-sun6i-Add-Allwinner-H616-support.patch | 12 +- ...-support-RTCs-without-external-LOSCs.patch | 14 +- .../drv-spi-spidev-remove-warnings.patch | 15 +- ...-media-sunxi-cedrus-add-H616-variant.patch | 12 +- .../drv-staging-rtl8723bs-AP-bugfix.patch | 10 +- ...name-gadget-serial-console-manufactu.patch | 10 +- ...ourcc-add-ARM-tiled-format-modifier.patch} | 10 +- ...h => mmc-host-sunxi-mmc-Fix-H6-emmc.patch} | 9 +- ...1c.patch => net-phy-Support-yt8531c.patch} | 14 +- ...nxi_get_soc_chipid-sunxi_get_serial.patch} | 10 +- ...ipts-add-overlay-compilation-support.patch | 12 +- ...enable-kernel-dtbs-symbol-generation.patch | 10 +- ...4i-codec-adcis-select-capture-source.patch | 9 +- ...unxi-sun4i-spdif-add-mclk_multiplier.patch | 16 +- ...atch => wireless-Add-uwe5622-driver.patch} | 16 +- ...ake-sure-the-plug-orientation-is-res.patch | 58 ++++ ...inebook-pro-Support-both-Type-C-plug.patch | 28 ++ ...inephone-pro-Cleanup-regulator-sleep.patch | 122 +++++++ ...inephone-pro-Support-both-Type-C-plu.patch | 28 ++ .../media-imx258-Fix-4208x3120-mode.patch | 58 ++++ ...rkisp1-Allow-higher-input-resolution.patch | 30 ++ ...chip-Fix-runtime-PM-and-other-issues.patch | 299 ++++++++++++++++++ ...upport-for-snps-usb3-phy-reset-quirk.patch | 264 ++++++++++++++++ ...le-on-stack-during-set_mode-processi.patch | 83 +++++ ...-the-power-state-of-usb3_generic_phy.patch | 63 ++++ .../kernel/archive/sunxi-5.18/series.armbian | 64 ++-- patch/kernel/archive/sunxi-5.18/series.conf | 75 +++-- patch/kernel/archive/sunxi-5.18/series.megous | 12 + tools/mk_format_patch | 1 + 102 files changed, 1625 insertions(+), 601 deletions(-) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch => Add-dump_reg-and-sunxi-sysinfo-drivers.patch} (99%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch => Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch} (98%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0002-compile-the-pwm-overlay.patch => Compile-the-pwm-overlay.patch} (84%) delete mode 100644 patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-gpio-gpio-axp209-add-AXP803-GPIO-bin.patch rename patch/kernel/archive/sunxi-5.18/patches.armbian/{Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch => Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch} (86%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch => Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch} (93%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch => Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch} (92%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch => Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch} (98%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{999-rollback-rsb.patch => Rollback-r_rsb-to-r_i2c.patch} (85%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0011-add-initial-support-for-orangepi3-lts.patch => add-initial-support-for-orangepi3-lts.patch} (99%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch => add-uwe-bsp-to-OPi3-LTS-dts-file.patch} (85%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0009-allwinner-h6-support-ac200-audio-codec.patch => allwinner-h6-Support-ac200-audio-codec.patch} (99%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch => arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch} (89%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch => arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch} (93%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch => arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch} (96%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch => arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch} (86%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch => arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch} (97%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0013-x-fix-h6-emmc-dts.patch => arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch} (75%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch => arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch} (76%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch => arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch} (90%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch => arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch} (92%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch => arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch} (95%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch => arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch} (92%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch => drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch} (85%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch => drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch} (93%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch => drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch} (98%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch => drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch} (97%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch => drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch} (85%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch => include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch} (78%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0012-fix-h6-emmc.patch => mmc-host-sunxi-mmc-Fix-H6-emmc.patch} (91%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0005-net-phy-support-yt8531c.patch => net-phy-Support-yt8531c.patch} (99%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch => nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch} (88%) rename patch/kernel/archive/sunxi-5.18/patches.armbian/{0007-wireless-add-uwe5622-driver.patch => wireless-Add-uwe5622-driver.patch} (99%) create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/media-imx258-Fix-4208x3120-mode.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/media-rkisp1-Allow-higher-input-resolution.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch create mode 100644 patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch similarity index 99% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch index 58b6b65ea..a9d6ef982 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch @@ -1,7 +1,7 @@ -From ad291f3fffe361a3a424f9a892475b6343870ed9 Mon Sep 17 00:00:00 2001 +From 4268d3e858f89ccd3addd0bd3c1faf2c772a0b41 Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 19:28:00 +0000 -Subject: [PATCH 03/11] Add dump_reg and sunxi-sysinfo drivers +Subject: [PATCH 159/169] Add dump_reg and sunxi-sysinfo drivers --- drivers/char/Kconfig | 2 + @@ -25,7 +25,7 @@ Subject: [PATCH 03/11] Add dump_reg and sunxi-sysinfo drivers create mode 100644 drivers/char/sunxi-sysinfo/sunxi-sysinfo.c diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig -index 740811893..e8d6b5cb1 100644 +index d454428f4..3187e3313 100644 --- a/drivers/char/Kconfig +++ b/drivers/char/Kconfig @@ -131,6 +131,8 @@ config POWERNV_OP_PANEL @@ -1548,5 +1548,5 @@ index 000000000..349b92bf1 +MODULE_AUTHOR("xiafeng"); +MODULE_DESCRIPTION("sunxi sys info."); -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch similarity index 98% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch index cd261a5f5..24e3e04f2 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch @@ -1,7 +1,7 @@ -From 29cfa9437eaa2ff862ab0f06852383b181b60743 Mon Sep 17 00:00:00 2001 +From 9231f48c015c43855d5f8e0b8cb7ef0045028309 Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 20:18:18 +0000 -Subject: [PATCH 04/11] Add sunxi-addr driver - Used to fix uwe5622 bluetooth +Subject: [PATCH 160/169] Add sunxi-addr driver - Used to fix uwe5622 bluetooth MAC addresses --- @@ -18,7 +18,7 @@ Subject: [PATCH 04/11] Add sunxi-addr driver - Used to fix uwe5622 bluetooth create mode 100644 drivers/misc/sunxi-addr/sunxi-addr.c diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig -index 24cb809ae..52843042f 100644 +index f7fb1a4ca..b6eccfefa 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -507,4 +507,5 @@ source "drivers/misc/cardreader/Kconfig" @@ -609,5 +609,5 @@ index 000000000..a812e4e82 +MODULE_DESCRIPTION("Network MAC Addess Manager"); +MODULE_LICENSE("GPL"); -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0002-compile-the-pwm-overlay.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Compile-the-pwm-overlay.patch similarity index 84% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0002-compile-the-pwm-overlay.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Compile-the-pwm-overlay.patch index bcafe6ba4..8f7998f1c 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0002-compile-the-pwm-overlay.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Compile-the-pwm-overlay.patch @@ -1,7 +1,7 @@ -From 51112a4620dea5d3c77ca09572a249f5f877a1ce Mon Sep 17 00:00:00 2001 +From bca2fc05decd1eb0ab2c2abcfa8811f3aa91da09 Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 19:26:16 +0000 -Subject: [PATCH 02/11] Compile the pwm overlay +Subject: [PATCH 158/169] Compile the pwm overlay --- arch/arm64/boot/dts/allwinner/overlay/Makefile | 1 + @@ -20,5 +20,5 @@ index 87f5addec..7cabe8f42 100644 sun50i-h6-spi-add-cs1.dtbo \ sun50i-h6-spi-jedec-nor.dtbo \ -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch index 517319309..2e07b02c7 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch @@ -1,7 +1,7 @@ -From 1d0462899c9b8407b81be2ea6a586634d0bd3c45 Mon Sep 17 00:00:00 2001 +From eafad241a876e5996a4845e3fb37e8909e805b08 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Mon, 7 Dec 2020 21:35:46 +0000 -Subject: [PATCH 029/101] Doc:dt-bindings:arm:sunxi: Add OrangePi Zero2 binding +Subject: [PATCH 004/169] Doc:dt-bindings:arm:sunxi: Add OrangePi Zero2 binding Signed-off-by: Andre Przywara Acked-by: Rob Herring @@ -10,10 +10,10 @@ Acked-by: Rob Herring 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml -index 889128acf..a13cecb5f 100644 +index 086c68771..047246a57 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.yaml +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml -@@ -948,4 +948,9 @@ properties: +@@ -958,4 +958,9 @@ properties: - const: xunlong,orangepi-zero-plus2-h3 - const: allwinner,sun8i-h3 @@ -24,5 +24,5 @@ index 889128acf..a13cecb5f 100644 + additionalProperties: true -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch index 89ec889f7..a72eb0908 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch @@ -1,7 +1,7 @@ -From 9209f523ce11029efbbe22284b27707ed384d76c Mon Sep 17 00:00:00 2001 +From d27672484e1b20d9680fb0ac50be968a8d466c0e Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Mon, 7 Dec 2020 21:35:46 +0000 -Subject: [PATCH 01/50] Doc:dt-bindings:arm:sunxi: Add two H616 board +Subject: [PATCH 007/169] Doc:dt-bindings:arm:sunxi: Add two H616 board compatible strings Signed-off-by: Andre Przywara @@ -11,10 +11,10 @@ Acked-by: Rob Herring 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/arm/sunxi.yaml b/Documentation/devicetree/bindings/arm/sunxi.yaml -index a13cecb5f..1c557a736 100644 +index 047246a57..539af752d 100644 --- a/Documentation/devicetree/bindings/arm/sunxi.yaml +++ b/Documentation/devicetree/bindings/arm/sunxi.yaml -@@ -848,6 +848,11 @@ properties: +@@ -858,6 +858,11 @@ properties: - const: yones-toptech,bs1078-v2 - const: allwinner,sun6i-a31s @@ -27,5 +27,5 @@ index a13cecb5f..1c557a736 100644 items: - const: xunlong,orangepi -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-gpio-gpio-axp209-add-AXP803-GPIO-bin.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-gpio-gpio-axp209-add-AXP803-GPIO-bin.patch deleted file mode 100644 index be4cc0bcd..000000000 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-gpio-gpio-axp209-add-AXP803-GPIO-bin.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9c6eff265145ef77166242abd1181c3c15e302d4 Mon Sep 17 00:00:00 2001 -From: Oskari Lemmela -Date: Tue, 23 Oct 2018 21:53:22 +0300 -Subject: [PATCH 064/101] Doc:dt-bindings: gpio: gpio-axp209: add AXP803 GPIO - bindings - -The AXP803 GPIO is compatible with AXP813 GPIO, but add -specific compatible for it. - -Signed-off-by: Oskari Lemmela -Reviewed-by: Rob Herring ---- - Documentation/devicetree/bindings/gpio/gpio-axp209.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Documentation/devicetree/bindings/gpio/gpio-axp209.txt b/Documentation/devicetree/bindings/gpio/gpio-axp209.txt -index fc42b2caa..5337a21d7 100644 ---- a/Documentation/devicetree/bindings/gpio/gpio-axp209.txt -+++ b/Documentation/devicetree/bindings/gpio/gpio-axp209.txt -@@ -11,6 +11,7 @@ This driver employs the per-pin muxing pattern. - Required properties: - - compatible: Should be one of: - - "x-powers,axp209-gpio" -+ - "x-powers,axp803-gpio" - - "x-powers,axp813-gpio" - - #gpio-cells: Should be two. The first cell is the pin number and the - second is the GPIO flags. -@@ -67,6 +68,7 @@ GPIO0 | gpio_in, gpio_out, ldo, adc - GPIO1 | gpio_in, gpio_out, ldo, adc - GPIO2 | gpio_in, gpio_out - -+axp803 - axp813 - ------ - GPIO | Functions --- -2.31.1 - diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch similarity index 86% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch index 7c3090e3f..c253259a6 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch @@ -1,7 +1,7 @@ -From 7c04839ef865c48da931bddfa74fff188248d4fc Mon Sep 17 00:00:00 2001 +From f01e5b535f653d254090fec13b6e800414416a2f Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 27 Jan 2021 13:27:39 +0000 -Subject: [PATCH 018/101] Doc:dt-bindings:net: sun8i-emac: Add H616 compatible +Subject: [PATCH 003/169] Doc:dt-bindings:net: sun8i-emac: Add H616 compatible string Add the obvious compatible name to the existing EMAC binding, and pair @@ -16,7 +16,7 @@ Signed-off-by: Andre Przywara 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml -index 9eb4bb529..7a47c5142 100644 +index 6a4831fd3..87f130683 100644 --- a/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml +++ b/Documentation/devicetree/bindings/net/allwinner,sun8i-a83t-emac.yaml @@ -22,6 +22,7 @@ properties: @@ -28,5 +28,5 @@ index 9eb4bb529..7a47c5142 100644 reg: -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch similarity index 93% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch index 8d11a2618..ef0a0a5cb 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch @@ -1,7 +1,7 @@ -From d271d5f20015452fbe7fc8f983dde014b6904741 Mon Sep 17 00:00:00 2001 +From 10cedccbc8f0b6c067eed42e4bc33be2534c7149 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Mon, 25 Dec 2017 12:08:01 +0800 -Subject: [PATCH 097/101] Doc:dt-bindings:usb: add binding for DWC3 controller +Subject: [PATCH 006/169] Doc:dt-bindings:usb: add binding for DWC3 controller on Allwinner SoC The Allwinner H6 SoC uses DWC3 controller for USB3. @@ -60,5 +60,5 @@ index 000000000..3f7714636 + }; + }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch index 15a71dace..932030a53 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch @@ -1,7 +1,7 @@ -From b0a5f4e53bb4de44c30c7b038f2660800be6c07a Mon Sep 17 00:00:00 2001 +From d7496f9c682843a48b22045866195600ebfdd7f9 Mon Sep 17 00:00:00 2001 From: Benjamin Gaignard Date: Thu, 15 Jul 2021 17:12:22 +0200 -Subject: [PATCH 043/101] Doc:u-api:media:v4l: Add scaling matrix control +Subject: [PATCH 005/169] Doc:u-api:media:v4l: Add scaling matrix control HEVC scaling lists are used for the scaling process for transform coefficients. @@ -15,37 +15,16 @@ Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- .../media/v4l/ext-ctrls-codec.rst | 57 +++++++++++++++++++ - .../media/v4l/vidioc-queryctrl.rst | 6 ++ - drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 ++ - drivers/media/v4l2-core/v4l2-ctrls-defs.c | 4 ++ - include/media/hevc-ctrls.h | 11 ++++ - 5 files changed, 84 insertions(+) + 1 file changed, 57 insertions(+) diff --git a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst -index 976d34445..e141f0e4e 100644 +index 4cd7c541f..7df1a0172 100644 --- a/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst +++ b/Documentation/userspace-api/media/v4l/ext-ctrls-codec.rst -@@ -3088,6 +3088,63 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - +@@ -3105,6 +3105,63 @@ enum v4l2_mpeg_video_hevc_size_of_length_field - - \normalsize + .. cssclass:: longtable -+``V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX (struct)`` -+ Specifies the HEVC scaling matrix parameters used for the scaling process -+ for transform coefficients. -+ These matrix and parameters are defined according to :ref:`hevc`. -+ They are described in section 7.4.5 "Scaling list data semantics" of -+ the specification. -+ -+.. c:type:: v4l2_ctrl_hevc_scaling_matrix -+ -+.. raw:: latex -+ -+ \scriptsize -+ -+.. tabularcolumns:: |p{5.4cm}|p{6.8cm}|p{5.1cm}| -+ -+.. cssclass:: longtable -+ +.. flat-table:: struct v4l2_ctrl_hevc_scaling_matrix + :header-rows: 0 + :stub-columns: 0 @@ -86,9 +65,26 @@ index 976d34445..e141f0e4e 100644 + + \normalsize + - .. c:type:: v4l2_hevc_dpb_entry - - .. raw:: latex ++``V4L2_CID_MPEG_VIDEO_HEVC_SCALING_MATRIX (struct)`` ++ Specifies the HEVC scaling matrix parameters used for the scaling process ++ for transform coefficients. ++ These matrix and parameters are defined according to :ref:`hevc`. ++ They are described in section 7.4.5 "Scaling list data semantics" of ++ the specification. ++ ++.. c:type:: v4l2_ctrl_hevc_scaling_matrix ++ ++.. raw:: latex ++ ++ \scriptsize ++ ++.. tabularcolumns:: |p{5.4cm}|p{6.8cm}|p{5.1cm}| ++ ++.. cssclass:: longtable ++ + .. flat-table:: struct v4l2_ctrl_hevc_scaling_matrix + :header-rows: 0 + :stub-columns: 0 -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch index 65dc37f12..5ad451629 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch @@ -1,14 +1,14 @@ -From 59b72897a905b8254ac5ff697465bc02e2d0e87e Mon Sep 17 00:00:00 2001 +From 7274295c319acb1d94243a14f04931918b09b209 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sat, 23 May 2020 15:07:15 +0000 -Subject: [PATCH 055/101] HACK: media: uapi: hevc: tiles and num_slices +Subject: [PATCH 038/169] HACK: media: uapi: hevc: tiles and num_slices --- include/media/hevc-ctrls.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index a808894e8..f1b875652 100644 +index a536dab3f..c8618dc68 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -83,7 +83,8 @@ struct v4l2_ctrl_hevc_sps { @@ -21,7 +21,7 @@ index a808894e8..f1b875652 100644 __u64 flags; }; -@@ -210,7 +211,9 @@ struct v4l2_ctrl_hevc_slice_params { +@@ -208,7 +209,9 @@ struct v4l2_ctrl_hevc_slice_params { __u16 short_term_ref_pic_set_size; __u16 long_term_ref_pic_set_size; @@ -33,5 +33,5 @@ index a808894e8..f1b875652 100644 /* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */ struct v4l2_hevc_pred_weight_table pred_weight_table; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch similarity index 92% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch index f51af212f..526fb85d8 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch @@ -1,7 +1,7 @@ -From 444ae2245cdccb154ca7d21ba91d9e8e22389dd1 Mon Sep 17 00:00:00 2001 +From a9196935d426cd81ecd73e64828519507931246a Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 19:23:56 +0000 -Subject: [PATCH 01/11] Move sun50i-h6-pwm settings to its own overlay +Subject: [PATCH 157/169] Move sun50i-h6-pwm settings to its own overlay --- .../allwinner/overlay/sun50i-h6-fixup.scr-cmd | 14 ----------- @@ -66,5 +66,5 @@ index 000000000..a8aa74ed1 + }; +}; -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch similarity index 98% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch index 63d36cae3..45bc460cb 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch @@ -1,7 +1,7 @@ -From e3e9a55245fcadd5658cf783a3c273b4b4835b9e Mon Sep 17 00:00:00 2001 +From dd0ac6e9d475b8fbe070a42cf8f900b05b59d493 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Sat, 6 Nov 2021 19:15:23 +0100 -Subject: [PATCH 003/101] Revert "net: Remove net/ipx.h and uapi/linux/ipx.h +Subject: [PATCH 002/169] Revert "net: Remove net/ipx.h and uapi/linux/ipx.h header files" This reverts commit 6c9b40844751ea30c72f7a2f92f4d704bc6b2927. @@ -283,5 +283,5 @@ index 000000000..3168137ad +#define SIOCIPXNCPCONN (SIOCPROTOPRIVATE + 3) +#endif /* _IPX_H_ */ -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/999-rollback-rsb.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/Rollback-r_rsb-to-r_i2c.patch similarity index 85% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/999-rollback-rsb.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/Rollback-r_rsb-to-r_i2c.patch index 8230058bd..a7de19602 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/999-rollback-rsb.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/Rollback-r_rsb-to-r_i2c.patch @@ -1,7 +1,7 @@ -From 409dfdd8ad3dfc0f69ca1abbfad3d955b00f6a01 Mon Sep 17 00:00:00 2001 +From 6995bb5e1b1b6017ac048935fe0b29b10b9778cb Mon Sep 17 00:00:00 2001 From: Ukhellfire Date: Fri, 1 Apr 2022 09:44:19 +0100 -Subject: [PATCH] Rollback to r_i2c +Subject: [PATCH 169/169] Rollback r_rsb to r_i2c --- .../dts/allwinner/sun50i-h6-orangepi-3-lts.dts | 16 +++------------- @@ -11,7 +11,7 @@ diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts b/arch/a index 83fa87039..0b07f8ca2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts -@@ -180,16 +180,6 @@ +@@ -180,16 +180,6 @@ &mmc1 { bus-width = <4>; non-removable; status = "okay"; @@ -28,7 +28,7 @@ index 83fa87039..0b07f8ca2 100644 }; &mmc2 { -@@ -218,12 +208,12 @@ +@@ -218,12 +208,12 @@ &pio { vcc-pg-supply = <®_vcc_wifi_io>; }; @@ -44,3 +44,6 @@ index 83fa87039..0b07f8ca2 100644 interrupt-parent = <&r_intc>; interrupts = ; interrupt-controller; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/WIP-media-uapi-hevc-add-fields-needed-for-rkvdec.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/WIP-media-uapi-hevc-add-fields-needed-for-rkvdec.patch index 5d99721b1..39638dee5 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/WIP-media-uapi-hevc-add-fields-needed-for-rkvdec.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/WIP-media-uapi-hevc-add-fields-needed-for-rkvdec.patch @@ -1,7 +1,7 @@ -From b47ff0ab5ea204f3db72e8ab1c1b4a69679e6441 Mon Sep 17 00:00:00 2001 +From 02d85fa0e00888943f69605e5fd1ee5f904dbea0 Mon Sep 17 00:00:00 2001 From: Jonas Karlman Date: Sat, 23 May 2020 15:03:46 +0000 -Subject: [PATCH 054/101] WIP: media: uapi: hevc: add fields needed for rkvdec +Subject: [PATCH 037/169] WIP: media: uapi: hevc: add fields needed for rkvdec NOTE: these fields are used by rkvdec hevc backend @@ -11,7 +11,7 @@ Signed-off-by: Jonas Karlman 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/include/media/hevc-ctrls.h b/include/media/hevc-ctrls.h -index ef63bc205..a808894e8 100644 +index 01ccda48d..a536dab3f 100644 --- a/include/media/hevc-ctrls.h +++ b/include/media/hevc-ctrls.h @@ -58,6 +58,8 @@ enum v4l2_mpeg_video_hevc_start_code { @@ -49,7 +49,7 @@ index ef63bc205..a808894e8 100644 __u64 flags; }; -@@ -202,7 +207,10 @@ struct v4l2_ctrl_hevc_slice_params { +@@ -200,7 +205,10 @@ struct v4l2_ctrl_hevc_slice_params { __u8 ref_idx_l0[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; __u8 ref_idx_l1[V4L2_HEVC_DPB_ENTRIES_NUM_MAX]; @@ -62,5 +62,5 @@ index ef63bc205..a808894e8 100644 /* ISO/IEC 23008-2, ITU-T Rec. H.265: Weighted prediction parameter */ struct v4l2_hevc_pred_weight_table pred_weight_table; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0011-add-initial-support-for-orangepi3-lts.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/add-initial-support-for-orangepi3-lts.patch similarity index 99% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0011-add-initial-support-for-orangepi3-lts.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/add-initial-support-for-orangepi3-lts.patch index 083dec89b..ecfb17a71 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0011-add-initial-support-for-orangepi3-lts.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/add-initial-support-for-orangepi3-lts.patch @@ -1,7 +1,7 @@ -From 1f2b868b06041370235d7f87724fb1f397f2018e Mon Sep 17 00:00:00 2001 +From 8a1974b78f96336e13b9586452d583c78eb9a805 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 16 Apr 2022 11:51:35 +0300 -Subject: [PATCH] add initial support for orangepi3-lts +Subject: [PATCH 165/169] add initial support for orangepi3-lts --- arch/arm64/boot/dts/allwinner/Makefile | 1 + @@ -606,6 +606,5 @@ index d6217be99..97cd0f70f 100644 thermal-zones { -- -2.34.1 - +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch similarity index 85% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch index efac94331..5ae0fb0bd 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch @@ -1,7 +1,7 @@ -From 2b25d82f81c4eda2cfed56cd98e3178ccdb7d752 Mon Sep 17 00:00:00 2001 +From a488975618ac3652b451f8e354d256ea71a14549 Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 23:26:02 +0000 -Subject: [PATCH] add uwe-bsp to OPi3-LTS dts file +Subject: [PATCH 168/169] add uwe-bsp to OPi3-LTS dts file --- .../boot/dts/allwinner/sun50i-h6-orangepi-3-lts.dts | 10 ++++++++++ @@ -29,5 +29,5 @@ index cc5a73026..83fa87039 100644 &mmc2 { -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0009-allwinner-h6-support-ac200-audio-codec.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/allwinner-h6-Support-ac200-audio-codec.patch similarity index 99% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0009-allwinner-h6-support-ac200-audio-codec.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/allwinner-h6-Support-ac200-audio-codec.patch index 74561a14a..3a9f4250c 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0009-allwinner-h6-support-ac200-audio-codec.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/allwinner-h6-Support-ac200-audio-codec.patch @@ -1,7 +1,7 @@ -From 818b55daa8e217a54a8baf61943ca3b302371f78 Mon Sep 17 00:00:00 2001 +From 03d4b9ec56d67bd6adf38ca69c799275634ace5e Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 20:33:02 +0000 -Subject: [PATCH 09/11] allwinner: h6: Support ac200 audio codec +Subject: [PATCH 163/169] allwinner: h6: Support ac200 audio codec --- drivers/mfd/Makefile | 2 +- @@ -13,12 +13,11 @@ Subject: [PATCH 09/11] allwinner: h6: Support ac200 audio codec sound/soc/codecs/acx00.h | 356 ++++++ 7 files changed, 1755 insertions(+), 2 deletions(-) rename drivers/mfd/{ac200.c => sunxi-ac200.c} (93%) - mode change 100644 => 100755 create mode 100644 sound/soc/codecs/acx00.c create mode 100644 sound/soc/codecs/acx00.h diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 7edc825f9..669f838ab 100644 +index 24ff449f1..e86584db6 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -141,7 +141,7 @@ obj-$(CONFIG_MFD_DA9052_SPI) += da9052-spi.o @@ -31,12 +30,10 @@ index 7edc825f9..669f838ab 100644 obj-$(CONFIG_MFD_AXP20X_I2C) += axp20x-i2c.o obj-$(CONFIG_MFD_AXP20X_RSB) += axp20x-rsb.o diff --git a/drivers/mfd/ac200.c b/drivers/mfd/sunxi-ac200.c -old mode 100644 -new mode 100644 similarity index 93% rename from drivers/mfd/ac200.c rename to drivers/mfd/sunxi-ac200.c -index 570573790..368a54587 +index 570573790..368a54587 100644 --- a/drivers/mfd/ac200.c +++ b/drivers/mfd/sunxi-ac200.c @@ -41,6 +41,7 @@ static const struct regmap_range_cfg ac200_range_cfg[] = { @@ -98,10 +95,10 @@ index 0c677094a..c8c140226 100644 struct regmap_irq_chip_data *regmap_irqc; }; diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index 6fd8bc760..d98d9b300 100644 +index b8193a145..fe67e2093 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig -@@ -2048,4 +2048,12 @@ config SND_SOC_LPASS_TX_MACRO +@@ -2046,4 +2046,12 @@ config SND_SOC_LPASS_TX_MACRO select SND_SOC_LPASS_MACRO_COMMON tristate "Qualcomm TX Macro in LPASS(Low Power Audio SubSystem)" @@ -1874,5 +1871,5 @@ index 000000000..5137cf365 + +#endif -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch index 6565635f6..837624b6c 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch @@ -1,7 +1,7 @@ -From 3a934000cccaf616cca02dbede612aae51207d33 Mon Sep 17 00:00:00 2001 +From ae01ee010083c70502b8d54ed5f5a48917364f63 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 23 Jan 2022 16:43:53 +0300 -Subject: [PATCH 008/101] arm:arm64:dts: Add leds axp20x charger +Subject: [PATCH 065/169] arm:arm64:dts: Add leds axp20x charger --- arch/arm/boot/dts/axp209.dtsi | 5 +++++ @@ -59,10 +59,10 @@ index 9195a8c49..350e8ec11 100644 compatible = "x-powers,axp813-battery-power-supply"; status = "disabled"; diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi -index 578ef368e..6d00d3c27 100644 +index d0ccd55d8..ff1b95cc9 100644 --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi -@@ -37,6 +37,11 @@ gpio1_ldo: gpio1-ldo-pin { +@@ -38,6 +38,11 @@ gpio1_ldo: gpio1-ldo-pin { }; }; @@ -75,5 +75,5 @@ index 578ef368e..6d00d3c27 100644 compatible = "x-powers,axp803-battery-power-supply", "x-powers,axp813-battery-power-supply"; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch index 0d67431f6..4e10adb27 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch @@ -1,7 +1,7 @@ -From 67ce246e3bb03dec3851a5bfdffe93a32fa82b76 Mon Sep 17 00:00:00 2001 +From 94bada2e659262924c62a8d64f242acd752def02 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:00:36 +0300 -Subject: [PATCH 079/101] arm:dts: Add sun8i-h2-plus-nanopi-duo device +Subject: [PATCH 072/169] arm:dts: Add sun8i-h2-plus-nanopi-duo device --- arch/arm/boot/dts/Makefile | 1 + @@ -10,10 +10,10 @@ Subject: [PATCH 079/101] arm:dts: Add sun8i-h2-plus-nanopi-duo device create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-nanopi-duo.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 234762eb5..3f5f5498f 100644 +index b2babfd9b..affa0ebba 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1240,6 +1240,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ +@@ -1286,6 +1286,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-a83t-tbs-a711.dtb \ sun8i-h2-plus-bananapi-m2-zero.dtb \ sun8i-h2-plus-libretech-all-h3-cc.dtb \ @@ -192,5 +192,5 @@ index 000000000..2b31b8fdd + usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch index f6c753710..bae898b77 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch @@ -1,7 +1,7 @@ -From 472e545e962621bfcb806ce475ed6f6e403b2584 Mon Sep 17 00:00:00 2001 +From d9e90465b6b71e2fa982a0acb0253eb37add6704 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:23:33 +0300 -Subject: [PATCH 080/101] arm:dts: Add sun8i-h2-plus-sunvell-r69 device +Subject: [PATCH 073/169] arm:dts: Add sun8i-h2-plus-sunvell-r69 device --- arch/arm/boot/dts/Makefile | 1 + @@ -10,10 +10,10 @@ Subject: [PATCH 080/101] arm:dts: Add sun8i-h2-plus-sunvell-r69 device create mode 100644 arch/arm/boot/dts/sun8i-h2-plus-sunvell-r69.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index 3f5f5498f..a4367ae2a 100644 +index affa0ebba..27f35e8b9 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1243,6 +1243,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ +@@ -1289,6 +1289,7 @@ dtb-$(CONFIG_MACH_SUN8I) += \ sun8i-h2-plus-nanopi-duo.dtb \ sun8i-h2-plus-orangepi-r1.dtb \ sun8i-h2-plus-orangepi-zero.dtb \ @@ -253,5 +253,5 @@ index 000000000..bb0c2f72b + status = "okay"; +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch similarity index 89% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch index 2a1ad81d9..6cfeb1700 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch @@ -1,7 +1,7 @@ -From 87a2cfa2afc9952c7c9ffb7ed8af57a364ee2da2 Mon Sep 17 00:00:00 2001 +From 9a2700d348ddf4109ced2a772ab114aa7aeea47e Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:46:11 +0300 -Subject: [PATCH 078/101] arm:dts: a10-cubiebord a20-cubietruck green LED mmc0 +Subject: [PATCH 071/169] arm:dts: a10-cubiebord a20-cubietruck green LED mmc0 default-trigger --- @@ -35,5 +35,5 @@ index 525cb7fcc..df428f29b 100644 }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch index a4a581628..7129d3cf5 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch @@ -1,14 +1,14 @@ -From b71f9ac99f587f068b876494438bd60166bc02c4 Mon Sep 17 00:00:00 2001 +From 6a9162ec2ffc874449755359d4d53bbfae335997 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:34:01 +0300 -Subject: [PATCH 081/101] arm:dts: h3-nanopi-neo Add regulator, leds, mmc2 +Subject: [PATCH 074/169] arm:dts: h3-nanopi-neo Add regulator, leds, mmc2 --- - arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 53 +++++++++++++++++++++++ - 1 file changed, 53 insertions(+) + arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 57 +++++++++++++++++++++++ + 1 file changed, 57 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts -index 9f33f6fae..ada548028 100644 +index df71fab3c..032849663 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts @@ -49,6 +49,63 @@ / { @@ -76,5 +76,5 @@ index 9f33f6fae..ada548028 100644 &ehci0 { -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch similarity index 93% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch index e4e6119bc..efcc17ff4 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch @@ -1,15 +1,15 @@ -From 18e1970e8dd69c65161bc3ac6d1f404b93633cf9 Mon Sep 17 00:00:00 2001 +From da81de953dc84a8c57c600492d2fea7fabeb9a30 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 15:45:43 +0300 -Subject: [PATCH 082/101] arm:dts: h3-nanopi-neo-air Add regulator camera wifi +Subject: [PATCH 075/169] arm:dts: h3-nanopi-neo-air Add regulator camera wifi bluetooth otg --- - arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 169 ++++++++++++++++++ - 1 file changed, 169 insertions(+) + arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts | 153 ++++++++++++++++++ + 1 file changed, 153 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts -index be49eabbf..45936f046 100644 +index cd3df12b6..363683cd3 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts +++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts @@ -70,12 +70,92 @@ led-0 { @@ -193,5 +193,5 @@ index be49eabbf..45936f046 100644 /* USB VBUS is always on */ status = "okay"; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch index 58668c08c..46f5a40cf 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch @@ -1,17 +1,17 @@ -From fe15516466ced5e9aa71d71b44134833cab19ac4 Mon Sep 17 00:00:00 2001 +From 6db2b8308498be3600c860898a1b597aa7c04730 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 18:23:18 +0300 -Subject: [PATCH 083/101] arm:dts: h3-orangepi-2 Add regulator vdd cpu +Subject: [PATCH 076/169] arm:dts: h3-orangepi-2 Add regulator vdd cpu --- arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 29 +++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts -index 0347b763a..fcecfa037 100644 +index 858ce4682..c33fd1134 100644 --- a/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts +++ b/arch/arm/boot/dts/sun8i-h3-orangepi-2.dts -@@ -123,6 +123,10 @@ &de { +@@ -124,6 +124,10 @@ &de { status = "okay"; }; @@ -22,7 +22,7 @@ index 0347b763a..fcecfa037 100644 &ehci1 { status = "okay"; }; -@@ -177,6 +181,31 @@ rtl8189: sdio_wifi@1 { +@@ -178,6 +182,31 @@ rtl8189: sdio_wifi@1 { }; }; @@ -55,5 +55,5 @@ index 0347b763a..fcecfa037 100644 gpio = <&pio 6 13 GPIO_ACTIVE_HIGH>; status = "okay"; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch index b470a77bb..79a43a169 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-overlay-Add-Overlays-for-sunxi.patch @@ -1,7 +1,7 @@ -From 5d11fd237babc4594dc34fccddbdbfad36a28ede Mon Sep 17 00:00:00 2001 +From b86ab7760aa3b9ce89022ca43533d71670aeac87 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 12:54:05 +0300 -Subject: [PATCH 24/50] arm:dts:overlay Add Overlays for sunxi +Subject: [PATCH 123/169] arm:dts:overlay Add Overlays for sunxi --- arch/arm/boot/dts/Makefile | 2 + @@ -200,10 +200,10 @@ Subject: [PATCH 24/50] arm:dts:overlay Add Overlays for sunxi create mode 100644 arch/arm/boot/dts/overlay/sun8i-r40-uart7.dts diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile -index a4367ae2a..a82fdf2f7 100644 +index 27f35e8b9..09eb57c92 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -1553,3 +1553,5 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ +@@ -1570,3 +1570,5 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ aspeed-bmc-vegman-n110.dtb \ aspeed-bmc-vegman-rx20.dtb \ aspeed-bmc-vegman-sx20.dtb @@ -1884,7 +1884,7 @@ index 000000000..ee4ff6f45 +}; diff --git a/arch/arm/boot/dts/overlay/sun4i-a10-spi-spidev.dts b/arch/arm/boot/dts/overlay/sun4i-a10-spi-spidev.dts new file mode 100644 -index 000000000..5667aecac +index 000000000..eac4f1e2d --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun4i-a10-spi-spidev.dts @@ -0,0 +1,57 @@ @@ -2600,7 +2600,7 @@ index 000000000..8cebb0b98 +}; diff --git a/arch/arm/boot/dts/overlay/sun5i-a13-spi-spidev.dts b/arch/arm/boot/dts/overlay/sun5i-a13-spi-spidev.dts new file mode 100644 -index 000000000..ced1a0e26 +index 000000000..ad0685f8a --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun5i-a13-spi-spidev.dts @@ -0,0 +1,57 @@ @@ -3593,7 +3593,7 @@ index 000000000..b91097eca +}; diff --git a/arch/arm/boot/dts/overlay/sun7i-a20-spi-spidev.dts b/arch/arm/boot/dts/overlay/sun7i-a20-spi-spidev.dts new file mode 100644 -index 000000000..a3073b23c +index 000000000..341fe3229 --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun7i-a20-spi-spidev.dts @@ -0,0 +1,57 @@ @@ -4432,7 +4432,7 @@ index 000000000..95fa5f2ca +}; diff --git a/arch/arm/boot/dts/overlay/sun8i-h3-spi-spidev.dts b/arch/arm/boot/dts/overlay/sun8i-h3-spi-spidev.dts new file mode 100644 -index 000000000..575c970cc +index 000000000..c79beb95e --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun8i-h3-spi-spidev.dts @@ -0,0 +1,42 @@ @@ -4783,7 +4783,7 @@ index 000000000..949a98234 +}; diff --git a/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev0.dts b/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev0.dts new file mode 100644 -index 000000000..b1ea59847 +index 000000000..fae9c3f75 --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev0.dts @@ -0,0 +1,27 @@ @@ -4816,7 +4816,7 @@ index 000000000..b1ea59847 +}; diff --git a/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev1.dts b/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev1.dts new file mode 100644 -index 000000000..87d6cc602 +index 000000000..cb98ddf6b --- /dev/null +++ b/arch/arm/boot/dts/overlay/sun8i-r40-spi-spidev1.dts @@ -0,0 +1,27 @@ @@ -4960,5 +4960,5 @@ index 000000000..e57259833 + }; +}; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch index 97c15f880..27618f378 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun5i-a13-olinuxino-Add-panel-lcd-olinuxino-4.3-needed-.patch @@ -1,8 +1,8 @@ -From ca3d89bc067bddf84cb5ca182abfda9cebfab37a Mon Sep 17 00:00:00 2001 +From 2f83242b835e41082f3040e89bb08824c36f0b42 Mon Sep 17 00:00:00 2001 From: hehopmajieh Date: Thu, 19 Mar 2020 10:40:44 +0200 -Subject: [PATCH 32/50] arm:dts:sun5i-a13-olinuxino Add panel lcd-olinuxino-4.3 - needed to fix overlay tests +Subject: [PATCH 131/169] arm:dts:sun5i-a13-olinuxino Add panel + lcd-olinuxino-4.3 needed to fix overlay tests --- arch/arm/boot/dts/sun5i-a13-olinuxino.dts | 79 +++++++++++++---------- @@ -129,5 +129,5 @@ index fadeae3cd..d015a24c6 100644 + allwinner,filter-type = <3>; +}; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch similarity index 96% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch index f27d645ff..f8eeec326 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch @@ -1,7 +1,7 @@ -From a0cef4901bc0a988ba415189eddc0da8c0b467db Mon Sep 17 00:00:00 2001 +From 75f6cc18ed957b4984da40b3bca528265a7f6373 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 23 Jan 2022 22:32:07 +0300 -Subject: [PATCH 070/101] arm:dts:sun7i-a20 Disable OOB IRQ for brcm-wifi on +Subject: [PATCH 068/169] arm:dts:sun7i-a20 Disable OOB IRQ for brcm-wifi on Cubietruck and Banana-Pro While doing some brcmfmac driver work I needed to test this also on some @@ -95,5 +95,5 @@ index 52160e368..525cb7fcc 100644 }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-bananapro-add-hdmi-connector-de.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-bananapro-add-hdmi-connector-de.patch index 544ff2fdb..863f85273 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-bananapro-add-hdmi-connector-de.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-bananapro-add-hdmi-connector-de.patch @@ -1,14 +1,14 @@ -From 927ca4b6c7648cd69605ca95bf87bea310e27e3b Mon Sep 17 00:00:00 2001 +From 92fdc9e7d3bb8750fe53162fc41b9d2d32922683 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:15:19 +0300 -Subject: [PATCH 7/8] arm:dts: sun7i-a20-bananapro add hdmi-connector, de +Subject: [PATCH 082/169] arm:dts: sun7i-a20-bananapro add hdmi-connector, de --- - arch/arm/boot/dts/sun7i-a20-bananapro.dts | 26 +++++++++++++++++++++++ - 1 file changed, 26 insertions(+) + arch/arm/boot/dts/sun7i-a20-bananapro.dts | 30 +++++++++++++++++++++++ + 1 file changed, 30 insertions(+) diff --git a/arch/arm/boot/dts/sun7i-a20-bananapro.dts b/arch/arm/boot/dts/sun7i-a20-bananapro.dts -index e68748076..10ee53fba 100644 +index e68748076..3a34fb39a 100644 --- a/arch/arm/boot/dts/sun7i-a20-bananapro.dts +++ b/arch/arm/boot/dts/sun7i-a20-bananapro.dts @@ -60,6 +60,17 @@ chosen { @@ -74,5 +74,5 @@ index e68748076..10ee53fba 100644 + status = "okay"; +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olimex-som-204-evb-olinuxino-micro-decrease-d.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olimex-som-204-evb-olinuxino-micro-decrease-d.patch index 14476721e..464571dd7 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olimex-som-204-evb-olinuxino-micro-decrease-d.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olimex-som-204-evb-olinuxino-micro-decrease-d.patch @@ -1,8 +1,8 @@ -From d422739871bc6014f698218a13b67ec8bb63e537 Mon Sep 17 00:00:00 2001 +From e6cbc962ee289521d18b3a5740deb1559140f88e Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Wed, 24 Jun 2020 20:53:36 +0300 -Subject: [PATCH 36/50] arm:dts:sun7i-a20: olimex-som(204)-evb,olinuxino-micro - decrease dcdc2 min voltage +Subject: [PATCH 135/169] arm:dts:sun7i-a20: + olimex-som(204)-evb,olinuxino-micro decrease dcdc2 min voltage fixes some kernel crashes --- @@ -51,5 +51,5 @@ index a1b89b2a2..7077ceea7 100644 regulator-name = "vdd-cpu"; }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olinuxino-lime2-enable-ldo3-always-on.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olinuxino-lime2-enable-ldo3-always-on.patch index 39ccf64a3..af5f17471 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olinuxino-lime2-enable-ldo3-always-on.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun7i-a20-olinuxino-lime2-enable-ldo3-always-on.patch @@ -1,7 +1,8 @@ -From 04522e7055f1daa108469209c61ff5b4968a564f Mon Sep 17 00:00:00 2001 +From a3ab3bb63562969cc1d41d62ee2c5631b33a7af2 Mon Sep 17 00:00:00 2001 From: hehopmajieh Date: Tue, 16 Jun 2020 15:40:59 +0300 -Subject: [PATCH 35/50] arm:dts:sun7i-a20-olinuxino-lime2 enable ldo3 always-on +Subject: [PATCH 134/169] arm:dts:sun7i-a20-olinuxino-lime2 enable ldo3 + always-on --- arch/arm/boot/dts/sun7i-a20-olinuxino-lime2.dts | 2 +- @@ -24,5 +25,5 @@ index e0174ca48..ae710f785 100644 }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch similarity index 86% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch index 6a035fc00..11706f567 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch @@ -1,7 +1,7 @@ -From 20c12a00fa3d5f89cb149eed72041b79f630f2df Mon Sep 17 00:00:00 2001 +From 315d28f75b666b29251fbcbf0869517fd1ff8118 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 7 Feb 2022 19:15:17 +0300 -Subject: [PATCH 13/13] arm:dts: sun8i-h2-plus-orangepi-zero fix xradio +Subject: [PATCH 153/169] arm:dts: sun8i-h2-plus-orangepi-zero fix xradio interrupt --- @@ -32,5 +32,5 @@ index f19ed981d..4120437a1 100644 }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-add-thermal-zones.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-add-thermal-zones.patch index ab240dda4..aa94cdcf2 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-add-thermal-zones.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-add-thermal-zones.patch @@ -1,14 +1,14 @@ -From 923a8dbcd63e1bbd547d3952e7cdf1b726cb8f2d Mon Sep 17 00:00:00 2001 +From 4b9487ff3ccdfedb2aa865c41e8a5edb663834fd Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 21:34:48 +0300 -Subject: [PATCH 37/50] arm:dts:sun8i-h3 add thermal zones +Subject: [PATCH 136/169] arm:dts:sun8i-h3 add thermal zones --- - arch/arm/boot/dts/sun8i-h3.dtsi | 70 ++++++++++++++++++++++++++------- - 1 file changed, 56 insertions(+), 14 deletions(-) + arch/arm/boot/dts/sun8i-h3.dtsi | 68 ++++++++++++++++++++++++++------- + 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/arch/arm/boot/dts/sun8i-h3.dtsi b/arch/arm/boot/dts/sun8i-h3.dtsi -index e0aa7bf2f..1b02a4c3f 100644 +index 30d72d3b6..1b02a4c3f 100644 --- a/arch/arm/boot/dts/sun8i-h3.dtsi +++ b/arch/arm/boot/dts/sun8i-h3.dtsi @@ -297,32 +297,74 @@ ths: thermal-sensor@1c25000 { @@ -100,5 +100,5 @@ index e0aa7bf2f..1b02a4c3f 100644 }; }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch index 45aaecf5b..c9c655a2b 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch @@ -1,14 +1,14 @@ -From 0a961113148851f72343d4bea906527b0a3352c8 Mon Sep 17 00:00:00 2001 +From 2652980023dfc419e6e59d6b3bb8ac15eb550215 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:14:41 +0300 -Subject: [PATCH 075/101] arm:dts: sun8i-h3-nanopi add leds pio pins +Subject: [PATCH 070/169] arm:dts: sun8i-h3-nanopi add leds pio pins --- arch/arm/boot/dts/sun8i-h3-nanopi.dtsi | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi -index c7c3e7d8b..f57338e5a 100644 +index fc45d5aaa..b341dc573 100644 --- a/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi +++ b/arch/arm/boot/dts/sun8i-h3-nanopi.dtsi @@ -59,6 +59,8 @@ chosen { @@ -29,7 +29,7 @@ index c7c3e7d8b..f57338e5a 100644 k1 { label = "k1"; -@@ -100,6 +104,25 @@ &ohci3 { +@@ -101,6 +105,25 @@ &ohci3 { status = "okay"; }; @@ -56,5 +56,5 @@ index c7c3e7d8b..f57338e5a 100644 pinctrl-names = "default"; pinctrl-0 = <&uart0_pa_pins>; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch index bdc942b71..affb6abd1 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch @@ -1,7 +1,7 @@ -From c42403109d01c176ce425083b08303c46961e822 Mon Sep 17 00:00:00 2001 +From 1a98a734c1461a0bdcb01e82fe4d9820e0a7d7ea Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 25 Jan 2022 21:18:21 +0300 -Subject: [PATCH 101/101] arm:dts: sun8i-r40 bananapi-m2-ultra add codec analog +Subject: [PATCH 077/169] arm:dts: sun8i-r40 bananapi-m2-ultra add codec analog --- .../boot/dts/sun8i-r40-bananapi-m2-ultra.dts | 10 ++++++++++ @@ -30,10 +30,10 @@ index 87cf03574..73370f20d 100644 status = "okay"; }; diff --git a/arch/arm/boot/dts/sun8i-r40.dtsi b/arch/arm/boot/dts/sun8i-r40.dtsi -index 4f42e3c4b..5bb6e1530 100644 +index 60dd97825..7e5f4f9c9 100644 --- a/arch/arm/boot/dts/sun8i-r40.dtsi +++ b/arch/arm/boot/dts/sun8i-r40.dtsi -@@ -800,6 +800,24 @@ ths: thermal-sensor@1c24c00 { +@@ -810,6 +810,24 @@ ths: thermal-sensor@1c24c00 { #thermal-sensor-cells = <1>; }; @@ -59,5 +59,5 @@ index 4f42e3c4b..5bb6e1530 100644 compatible = "snps,dw-apb-uart"; reg = <0x01c28000 0x400>; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch similarity index 97% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch index 42fb6ee52..f18022fa3 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch @@ -1,7 +1,7 @@ -From f9756b4f8625f2bfd03ef52c5eef9762f489d578 Mon Sep 17 00:00:00 2001 +From 647a57d7bd84f904b88adebd3ee89583288acd69 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 28 Apr 2021 00:06:26 +0100 -Subject: [PATCH 033/101] arm64:dts: Add sun50i-h616-x96-mate TV box device +Subject: [PATCH 091/169] arm64:dts: Add sun50i-h616-x96-mate TV box device support The X96 Mate is an Allwinner H616 based TV box, featuring: @@ -31,7 +31,7 @@ Signed-off-by: Andre Przywara create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-x96-mate.dts diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile -index 62f8d43cf..14053c566 100644 +index df2214e6d..6a96494a2 100644 --- a/arch/arm64/boot/dts/allwinner/Makefile +++ b/arch/arm64/boot/dts/allwinner/Makefile @@ -39,3 +39,4 @@ dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h6-pine-h64-model-b.dtb @@ -247,5 +247,5 @@ index 000000000..b960bb310 + status = "okay"; +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0013-x-fix-h6-emmc-dts.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch similarity index 75% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0013-x-fix-h6-emmc-dts.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch index 91e8cb9dd..2ef5c9b96 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0013-x-fix-h6-emmc-dts.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch @@ -1,17 +1,17 @@ -From cfafb3f609842d63de13ccaa356b3861ac52c603 Mon Sep 17 00:00:00 2001 +From 9abd1601ddbb5fe1aac9543bef79b3a7e3a48038 Mon Sep 17 00:00:00 2001 From: Ukhellfire Date: Fri, 25 Mar 2022 07:10:57 +0000 -Subject: [PATCH] Fix H6 emmc +Subject: [PATCH 167/169] arm64: dts/allwinner/sun50i-h6: Fix H6 emmc --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index 40be5ad6d..3c6e9e875 100644 +index 97cd0f70f..770bdb8d2 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -566,8 +566,7 @@ +@@ -608,8 +608,7 @@ mmc1: mmc@4021000 { }; mmc2: mmc@4022000 { @@ -21,3 +21,6 @@ index 40be5ad6d..3c6e9e875 100644 reg = <0x04022000 0x1000>; clocks = <&ccu CLK_BUS_MMC2>, <&ccu CLK_MMC2>; clock-names = "ahb", "mmc"; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch index 9af44748a..4ce9e041a 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch @@ -1,17 +1,17 @@ -From f95f6c86d61601400569700a5cb2e006d4210af3 Mon Sep 17 00:00:00 2001 +From b05b0f337210baaebde2af9165864095e4fd29e2 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:52:48 +0300 -Subject: [PATCH 3/4] arm64:dts: sun50i-a64 force mmc0 bus-width +Subject: [PATCH 119/169] arm64:dts: sun50i-a64 force mmc0 bus-width --- arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index 17031c35d..cee9cd579 100644 +index 5e3749850..68c6b7931 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -559,6 +559,7 @@ mmc0: mmc@1c0f000 { +@@ -549,6 +549,7 @@ mmc0: mmc@1c0f000 { interrupts = ; max-frequency = <150000000>; status = "disabled"; @@ -20,5 +20,5 @@ index 17031c35d..cee9cd579 100644 #size-cells = <0>; }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-olinuxino-emmc-enable-bluetooth.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-olinuxino-emmc-enable-bluetooth.patch index ad7d87c64..5aecaccf7 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-olinuxino-emmc-enable-bluetooth.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-olinuxino-emmc-enable-bluetooth.patch @@ -1,7 +1,8 @@ -From 5439beb79a2eb6276685c2525f655ff8438e7df9 Mon Sep 17 00:00:00 2001 +From 446f6ab84421cbbed89fd8908d3eedc1ea5bb18d Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Fri, 20 Mar 2020 13:53:44 +0200 -Subject: [PATCH 41/50] arm64:dts: sun50i-a64-olinuxino-emmc: enable bluetooth +Subject: [PATCH 140/169] arm64:dts: sun50i-a64-olinuxino-emmc: enable + bluetooth --- .../dts/allwinner/sun50i-a64-olinuxino-emmc.dts | 17 +++++++++++++++++ @@ -34,5 +35,5 @@ index efb20846d..963b8b207 100644 + }; }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch similarity index 76% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch index 90f2ef834..e9730dab9 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch @@ -1,14 +1,15 @@ -From b81777f105ab05f76feb45c83f6616b05c953703 Mon Sep 17 00:00:00 2001 +From 1e5e30662cd6e84f8ff2a2f736556bc3320c1c1e Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:48:25 +0300 -Subject: [PATCH 2/4] arm64:dts: sun50i-a64-orangepi-win add aliase ethernet1 +Subject: [PATCH 118/169] arm64:dts: sun50i-a64-orangepi-win add aliase + ethernet1 --- arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts -index b9ec9c7e1..917105a51 100644 +index eb8969356..4b6caad1b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts @@ -15,6 +15,7 @@ / { @@ -20,5 +21,5 @@ index b9ec9c7e1..917105a51 100644 serial1 = &uart1; serial2 = &uart2; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch index 8e3e41f0a..66d4a33f2 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch @@ -1,7 +1,7 @@ -From baa2f7cf1d457a34b27d32fba0609b3eeabb6d7c Mon Sep 17 00:00:00 2001 +From 594cc6e8514eaf409277ddfc1c7dc24d389fd899 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Wed, 31 Oct 2018 20:43:26 -0700 -Subject: [PATCH 065/101] arm64:dts: sun50i-a64-pinebook enable Bluetooth +Subject: [PATCH 097/169] arm64:dts: sun50i-a64-pinebook enable Bluetooth Pinebook has an RTL8723CS WiFi + BT chip, BT is connected to UART1 and uses PL4 as BT reset, PL5 as device wake GPIO, PL6 as host wake GPIO @@ -15,10 +15,10 @@ Signed-off-by: Vasily Khoruzhick 1 file changed, 14 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts -index 34e67f5f8..0cd5cf419 100644 +index 63571df24..80f1ef241 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts -@@ -405,6 +405,20 @@ &uart0 { +@@ -406,6 +406,20 @@ &uart0 { status = "okay"; }; @@ -40,5 +40,5 @@ index 34e67f5f8..0cd5cf419 100644 dr_mode = "host"; }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch similarity index 90% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch index c742f11f7..a7d506610 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch @@ -1,7 +1,7 @@ -From 57e9f66bb8891a1157533f8b7193f84fc1a4b568 Mon Sep 17 00:00:00 2001 +From 1e849782dcb72c7c2896b45b6177aaf7d8eff039 Mon Sep 17 00:00:00 2001 From: Vasily Khoruzhick Date: Wed, 31 Oct 2018 20:50:09 -0700 -Subject: [PATCH 067/101] arm64:dts: sun50i-a64-sopine-baseboard enable +Subject: [PATCH 099/169] arm64:dts: sun50i-a64-sopine-baseboard enable Bluetooth SoPine has optional RTL8723BS WiFi + BT module, BT is connected to UART1 @@ -41,5 +41,5 @@ index ee4fd195e..56714cc3f 100644 &uart2 { pinctrl-names = "default"; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64.dtsi-adjust-thermal-trip-points.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64.dtsi-adjust-thermal-trip-points.patch index 1d3e87c26..e32825f0e 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64.dtsi-adjust-thermal-trip-points.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-a64.dtsi-adjust-thermal-trip-points.patch @@ -1,7 +1,7 @@ -From 6d01fd36994f8367e2c3d4f5f80240a8436b7b4e Mon Sep 17 00:00:00 2001 +From ca38d781db0b1c68834d1f986daa48ac4451f0de Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 6 Apr 2020 15:26:10 +0300 -Subject: [PATCH 43/50] arm64:dts:sun50i-a64.dtsi adjust thermal trip points +Subject: [PATCH 142/169] arm64:dts:sun50i-a64.dtsi adjust thermal trip points default values for alert1/crit are way too high. --- @@ -9,10 +9,10 @@ default values for alert1/crit are way too high. 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -index cee9cd579..2b39af262 100644 +index 68c6b7931..57e34f867 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi -@@ -253,21 +253,21 @@ map1 { +@@ -243,21 +243,21 @@ map1 { trips { cpu_alert0: cpu_alert0 { /* milliCelsius */ @@ -38,5 +38,5 @@ index cee9cd579..2b39af262 100644 type = "critical"; }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch index 63d4cc9db..ff0d5e223 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-add-termal-zones.patch @@ -1,17 +1,17 @@ -From 8124a98ee76297d03410df28226f6121ee998a3e Mon Sep 17 00:00:00 2001 +From 18c333c7f668d2ef9316677711ddff028100ab7d Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 21:12:46 +0300 -Subject: [PATCH 47/50] arm64:dts:sun50i-h5 add termal zones +Subject: [PATCH 146/169] arm64:dts:sun50i-h5 add termal zones --- arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi | 66 ++++++++++++++++---- 1 file changed, 54 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi -index 24cd29ad9..9ce6b0a3a 100644 +index 62952660b..f6d970d9b 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5.dtsi -@@ -234,31 +234,73 @@ ths: thermal-sensor@1c25000 { +@@ -207,31 +207,73 @@ ths: thermal-sensor@1c25000 { thermal-zones { cpu_thermal: cpu-thermal { @@ -98,5 +98,5 @@ index 24cd29ad9..9ce6b0a3a 100644 }; }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch similarity index 92% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch index f01635b41..4719a26d2 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch @@ -1,7 +1,7 @@ -From 00261eb89842912d41faca6ea0c46d13f9ffe7f6 Mon Sep 17 00:00:00 2001 +From 5cb5a9ba11ecfc4a28a30843aacd7d421791e901 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:24:24 +0300 -Subject: [PATCH 088/101] arm64:dts: sun50i-h5-nanopi-neo2 add regulator, led +Subject: [PATCH 106/169] arm64:dts: sun50i-h5-nanopi-neo2 add regulator, led triger --- @@ -62,5 +62,5 @@ index 05486ccce..39331229c 100644 status = "okay"; }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch index fffef8b95..15989a39f 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch @@ -1,14 +1,14 @@ -From 5084b907001b739337fda54ec442a35f2ed96afb Mon Sep 17 00:00:00 2001 +From a5656450085862100432ed4b1bb799dd982656ef Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:27:52 +0300 -Subject: [PATCH 089/101] arm64:dts: sun50i-h5-orangepi-pc2 add spi flash +Subject: [PATCH 107/169] arm64:dts: sun50i-h5-orangepi-pc2 add spi flash --- - .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 25 +++++++++++++++++++ - 1 file changed, 25 insertions(+) + .../dts/allwinner/sun50i-h5-orangepi-pc2.dts | 25 ++++++++++++++----- + 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts -index d7852fa4d..181a465fb 100644 +index d7852fa4d..2f03cf103 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts @@ -202,15 +202,28 @@ &sound_hdmi { @@ -47,5 +47,5 @@ index d7852fa4d..181a465fb 100644 }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch similarity index 95% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch index d18749cf7..7685e2d23 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch @@ -1,7 +1,7 @@ -From 2c0599854c3c4835aa778db604eba54f0dc5feee Mon Sep 17 00:00:00 2001 +From 0476ee3f563f9123972830a0faac1b4910f9afb8 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 19:54:04 +0300 -Subject: [PATCH 092/101] arm64:dts: sun50i-h5-orangepi-zero-plus2 +Subject: [PATCH 110/169] arm64:dts: sun50i-h5-orangepi-zero-plus2 regulator-gpio fix --- @@ -103,5 +103,5 @@ index 3e69ebde5..999fdcd96 100644 + status = "okay"; +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch index 6ffa86c69..45a8de35b 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-AC200-EPHY-related-nodes.patch @@ -1,7 +1,7 @@ -From c843cbfb9d8c5b68ed2fedfd2d6905ec852f2873 Mon Sep 17 00:00:00 2001 +From 3600a724796c1ac209922461a900c32e61d3dcf6 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sun, 12 Jan 2020 12:09:12 +0100 -Subject: [PATCH 011/101] arm64:dts: sun50i-h6: Add AC200 EPHY related nodes +Subject: [PATCH 086/169] arm64:dts: sun50i-h6: Add AC200 EPHY related nodes Signed-off-by: Jernej Skrabec --- @@ -9,7 +9,7 @@ Signed-off-by: Jernej Skrabec 1 file changed, 63 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index 6cdebbbff..7c17076d9 100644 +index 1206210e3..412e0ab2c 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -22,6 +22,16 @@ aliases { @@ -29,7 +29,7 @@ index 6cdebbbff..7c17076d9 100644 cpus { #address-cells = <1>; #size-cells = <0>; -@@ -307,6 +317,10 @@ ths_calibration: thermal-sensor-calibration@14 { +@@ -316,6 +326,10 @@ ths_calibration: thermal-sensor-calibration@14 { reg = <0x14 0x8>; }; @@ -40,7 +40,7 @@ index 6cdebbbff..7c17076d9 100644 cpu_speed_grade: cpu-speed-grade@1c { reg = <0x1c 0x4>; }; -@@ -364,6 +378,14 @@ ext_rgmii_pins: rgmii-pins { +@@ -373,6 +387,14 @@ ext_rgmii_pins: rgmii-pins { drive-strength = <40>; }; @@ -55,7 +55,7 @@ index 6cdebbbff..7c17076d9 100644 hdmi_pins: hdmi-pins { pins = "PH8", "PH9", "PH10"; function = "hdmi"; -@@ -384,6 +406,11 @@ i2c2_pins: i2c2-pins { +@@ -393,6 +415,11 @@ i2c2_pins: i2c2-pins { function = "i2c2"; }; @@ -67,7 +67,7 @@ index 6cdebbbff..7c17076d9 100644 mmc0_pins: mmc0-pins { pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5"; -@@ -401,6 +428,11 @@ mmc1_pins: mmc1-pins { +@@ -410,6 +437,11 @@ mmc1_pins: mmc1-pins { bias-pull-up; }; @@ -79,7 +79,7 @@ index 6cdebbbff..7c17076d9 100644 mmc2_pins: mmc2-pins { pins = "PC1", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", -@@ -643,6 +675,37 @@ spi1: spi@5011000 { +@@ -652,6 +684,37 @@ spi1: spi@5011000 { #size-cells = <0>; }; @@ -118,5 +118,5 @@ index 6cdebbbff..7c17076d9 100644 compatible = "allwinner,sun50i-h6-emac", "allwinner,sun50i-a64-emac"; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch index e230cedb0..1aedcbf36 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch @@ -1,17 +1,17 @@ -From 86694ad8ba1f02ba3148b282b1bdf710fd07d83b Mon Sep 17 00:00:00 2001 +From 7531d7b11cd38f1f84b55eb3cb55f74b00c1cac4 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 23 Jan 2022 20:49:27 +0300 -Subject: [PATCH 023/101] arm64:dts: sun50i-h6 Add r_uart uart2-3 pins +Subject: [PATCH 088/169] arm64:dts: sun50i-h6 Add r_uart uart2-3 pins --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 60 ++++++++++++++++---- 1 file changed, 50 insertions(+), 10 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index 7c17076d9..ceda702d6 100644 +index 412e0ab2c..ad4241a1a 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -307,6 +307,17 @@ msgbox: mailbox@3003000 { +@@ -316,6 +316,17 @@ msgbox: mailbox@3003000 { #mbox-cells = <1>; }; @@ -29,7 +29,7 @@ index 7c17076d9..ceda702d6 100644 sid: efuse@3006000 { compatible = "allwinner,sun50i-h6-sid"; reg = <0x03006000 0x400>; -@@ -370,6 +381,7 @@ pio: pinctrl@300b000 { +@@ -379,6 +390,7 @@ pio: pinctrl@300b000 { interrupt-controller; #interrupt-cells = <3>; @@ -37,7 +37,7 @@ index 7c17076d9..ceda702d6 100644 ext_rgmii_pins: rgmii-pins { pins = "PD0", "PD1", "PD2", "PD3", "PD4", "PD5", "PD7", "PD8", "PD9", "PD10", -@@ -433,6 +445,7 @@ pwm1_pin: pwm1-pin { +@@ -442,6 +454,7 @@ pwm1_pin: pwm1-pin { function = "pwm1"; }; @@ -45,7 +45,7 @@ index 7c17076d9..ceda702d6 100644 mmc2_pins: mmc2-pins { pins = "PC1", "PC4", "PC5", "PC6", "PC7", "PC8", "PC9", "PC10", -@@ -486,17 +499,26 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { +@@ -495,17 +508,26 @@ uart1_rts_cts_pins: uart1-rts-cts-pins { pins = "PG8", "PG9"; function = "uart1"; }; @@ -82,7 +82,7 @@ index 7c17076d9..ceda702d6 100644 }; iommu: iommu@30f0000 { -@@ -1014,6 +1036,19 @@ tcon_tv_out_tcon_top: endpoint@1 { +@@ -1023,6 +1045,19 @@ tcon_tv_out_tcon_top: endpoint@1 { }; }; @@ -102,7 +102,7 @@ index 7c17076d9..ceda702d6 100644 rtc: rtc@7000000 { compatible = "allwinner,sun50i-h6-rtc"; reg = <0x07000000 0x400>; -@@ -1078,6 +1113,11 @@ r_rsb_pins: r-rsb-pins { +@@ -1087,6 +1122,11 @@ r_rsb_pins: r-rsb-pins { pins = "PL0", "PL1"; function = "s_rsb"; }; @@ -115,5 +115,5 @@ index 7c17076d9..ceda702d6 100644 r_ir: ir@7040000 { -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch similarity index 92% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch index 3c0381265..8ae8d9b92 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch @@ -1,7 +1,7 @@ -From 7301a90cf33bdff78a22572e32daa3738544ee11 Mon Sep 17 00:00:00 2001 +From 109b8eb7b09433b77feb7f0a906a353958fbaa47 Mon Sep 17 00:00:00 2001 From: Igor Pecovnik Date: Thu, 22 Jul 2021 08:56:39 +0200 -Subject: [PATCH 095/101] arm64:dts: sun50i-h6-orangepi-lite2 spi0, usb3phy, +Subject: [PATCH 113/169] arm64:dts: sun50i-h6-orangepi-lite2 spi0, usb3phy, dwc3 enable Signed-off-by: Igor Pecovnik @@ -57,5 +57,5 @@ index e8770858b..ee6c01da5 100644 + status = "okay"; +}; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch index 35052f359..b1a9cc38b 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch @@ -1,17 +1,17 @@ -From 9e69bb4e0f9767b1ace285cf3227b5a82f6ace3a Mon Sep 17 00:00:00 2001 +From 1c5d5bd4b5dc05880a2fbc3550a496f59e02890c Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 15:19:32 +0300 -Subject: [PATCH 8/8] arm64:dts: sun50i-h6.dtsi add pinctrl pins for spi +Subject: [PATCH 117/169] arm64:dts: sun50i-h6.dtsi add pinctrl pins for spi --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index 35279469c..0bea1c77c 100644 +index cda5bb652..d6217be99 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -677,6 +677,8 @@ spi0: spi@5010000 { +@@ -686,6 +686,8 @@ spi0: spi@5010000 { clock-names = "ahb", "mod"; dmas = <&dma 22>, <&dma 22>; dma-names = "rx", "tx"; @@ -20,7 +20,7 @@ index 35279469c..0bea1c77c 100644 resets = <&ccu RST_BUS_SPI0>; status = "disabled"; #address-cells = <1>; -@@ -692,6 +694,8 @@ spi1: spi@5011000 { +@@ -701,6 +703,8 @@ spi1: spi@5011000 { clock-names = "ahb", "mod"; dmas = <&dma 23>, <&dma 23>; dma-names = "rx", "tx"; @@ -30,5 +30,5 @@ index 35279469c..0bea1c77c 100644 status = "disabled"; #address-cells = <1>; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch index 7638e8dd0..3b4b1e354 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch @@ -1,14 +1,14 @@ -From 9eac817d9c58eee57d287e09e1ff1b5e62746342 Mon Sep 17 00:00:00 2001 +From 669c1f274de2e50ba09dbef8a72e8b443365a400 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 25 Jan 2022 17:02:30 +0300 -Subject: [PATCH 093/101] arm64:dts: sun50i-h6.dtsi improve thermals +Subject: [PATCH 111/169] arm64:dts: sun50i-h6.dtsi improve thermals --- arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 68 ++++++++++++++++---- 1 file changed, 55 insertions(+), 13 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index ceda702d6..35279469c 100644 +index ad4241a1a..cda5bb652 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi @@ -1,5 +1,6 @@ @@ -18,7 +18,7 @@ index ceda702d6..35279469c 100644 #include #include -@@ -1177,33 +1178,74 @@ ths: thermal-sensor@5070400 { +@@ -1186,33 +1187,74 @@ ths: thermal-sensor@5070400 { thermal-zones { cpu-thermal { @@ -107,5 +107,5 @@ index ceda702d6..35279469c 100644 gpu-thermal { -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch index 65c4f3b29..d3a41c584 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch @@ -1,7 +1,7 @@ -From a6ff7a92a7bc37748410072f340bbbcda8c6206e Mon Sep 17 00:00:00 2001 +From 6369347a89aa7f31fb16807e8f5971126c33a097 Mon Sep 17 00:00:00 2001 From: chbgdn Date: Fri, 15 Oct 2021 23:08:52 +0300 -Subject: [PATCH] drv:bluetooth: btrtl: Add rtl8822cs (hci ver 0008) +Subject: [PATCH 001/169] drv:bluetooth: btrtl: Add rtl8822cs (hci ver 0008) Signed-off-by: chbgdn --- @@ -9,10 +9,10 @@ Signed-off-by: chbgdn 1 file changed, 7 insertions(+) diff --git a/drivers/bluetooth/btrtl.c b/drivers/bluetooth/btrtl.c -index fd293a9c4..ad4085eed 100644 +index 0ff802add..66212fc59 100644 --- a/drivers/bluetooth/btrtl.c +++ b/drivers/bluetooth/btrtl.c -@@ -192,6 +192,13 @@ static const struct id_table ic_id_table[] = { +@@ -205,6 +205,13 @@ static const struct id_table ic_id_table[] = { .fw_name = "rtl_bt/rtl8822cs_fw.bin", .cfg_name = "rtl_bt/rtl8822cs_config" }, @@ -27,5 +27,5 @@ index fd293a9c4..ad4085eed 100644 { IC_INFO(RTL_ROM_LMP_8822B, 0xc, 0xa, HCI_USB), .config_needed = false, -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch similarity index 85% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch index c76ab880c..c4166241b 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch @@ -1,14 +1,15 @@ -From 6dcd635e0305930f9f6d0a57345e6b46095c344b Mon Sep 17 00:00:00 2001 +From 0aaf6b37fd8338e9be363e7905ddadd9afa6243b Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 14:10:52 +0300 -Subject: [PATCH 3/8] drv:clk:sunxi-ng:ccu-sun50i-a64: revert ccu Pinebook-A64 +Subject: [PATCH 043/169] drv:clk:sunxi-ng:ccu-sun50i-a64: revert ccu + Pinebook-A64 --- drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c -index ba10a76b5..b72cf0f37 100644 +index 9833ab1a1..a731ce148 100644 --- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.c +++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.c @@ -560,8 +560,8 @@ static SUNXI_CCU_M_WITH_MUX_GATE(de_clk, "de", de_parents, @@ -22,7 +23,7 @@ index ba10a76b5..b72cf0f37 100644 static SUNXI_CCU_MUX_TABLE_WITH_GATE(tcon0_clk, "tcon0", tcon0_parents, tcon0_table, 0x118, 24, 3, BIT(31), CLK_SET_RATE_PARENT); -@@ -1006,9 +1006,9 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) +@@ -1004,9 +1004,9 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) } /* Force the parent of TCON0 to PLL-MIPI */ @@ -35,7 +36,7 @@ index ba10a76b5..b72cf0f37 100644 ret = devm_sunxi_ccu_probe(&pdev->dev, reg, &sun50i_a64_ccu_desc); if (ret) -@@ -1022,8 +1022,8 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) +@@ -1020,8 +1020,8 @@ static int sun50i_a64_ccu_probe(struct platform_device *pdev) &sun50i_a64_cpu_nb); /* Reset the rate of TCON0 clock when PLL-VIDEO0 is changed */ @@ -47,5 +48,5 @@ index ba10a76b5..b72cf0f37 100644 return 0; } -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch index 4d2869d92..6294add5e 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch @@ -1,17 +1,17 @@ -From 0842ca056554ac01c0a2c0770496291ca76d4480 Mon Sep 17 00:00:00 2001 +From 41ab7031f9d587a8364b79e77307af9e4808395f Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Fri, 28 Jan 2022 14:18:17 +0300 -Subject: [PATCH 4/8] drv:clocksource:arm_arch_timer fix a64 timejump +Subject: [PATCH 044/169] drv:clocksource:arm_arch_timer fix a64 timejump --- drivers/clocksource/arm_arch_timer.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/drivers/clocksource/arm_arch_timer.c b/drivers/clocksource/arm_arch_timer.c -index be6d741d4..ffc42573a 100644 +index 9ab8221ee..e72f822d5 100644 --- a/drivers/clocksource/arm_arch_timer.c +++ b/drivers/clocksource/arm_arch_timer.c -@@ -357,17 +357,20 @@ static u64 notrace arm64_858921_read_cntvct_el0(void) +@@ -364,17 +364,20 @@ static u64 notrace arm64_858921_read_cntvct_el0(void) * with all ones or all zeros in the low bits. Bound the loop by the maximum * number of CPU cycles in 3 consecutive 24 MHz counter periods. */ @@ -44,5 +44,5 @@ index be6d741d4..ffc42573a 100644 static u64 notrace sun50i_a64_read_cntpct_el0(void) -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch index f2abfba6d..3a49532f8 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-panel-simple-Add-compability-olinuxino-lcd.patch @@ -1,17 +1,18 @@ -From a9937f1aad9d2db502674e35fc8be3acd3319ecb Mon Sep 17 00:00:00 2001 +From e26ccd44b5d9c459c94b887d6653f5cf5133a6f3 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 19:34:55 +0300 -Subject: [PATCH 14/50] drv:gpu:drm: panel-simple Add compability olinuxino lcd +Subject: [PATCH 061/169] drv:gpu:drm: panel-simple Add compability olinuxino + lcd --- drivers/gpu/drm/panel/panel-simple.c | 126 ++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-simple.c b/drivers/gpu/drm/panel/panel-simple.c -index 9b6c4e6c3..542c05c89 100644 +index 6880dc59f..c6c5d9569 100644 --- a/drivers/gpu/drm/panel/panel-simple.c +++ b/drivers/gpu/drm/panel/panel-simple.c -@@ -2770,6 +2770,44 @@ static const struct panel_desc okaya_rs800480t_7x0gp = { +@@ -2771,6 +2771,44 @@ static const struct panel_desc okaya_rs800480t_7x0gp = { .bus_format = MEDIA_BUS_FMT_RGB666_1X18, }; @@ -56,7 +57,7 @@ index 9b6c4e6c3..542c05c89 100644 static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { .clock = 9000, .hdisplay = 480, -@@ -2782,8 +2820,8 @@ static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { +@@ -2783,8 +2821,8 @@ static const struct drm_display_mode olimex_lcd_olinuxino_43ts_mode = { .vtotal = 272 + 8 + 5 + 3, }; @@ -67,7 +68,7 @@ index 9b6c4e6c3..542c05c89 100644 .num_modes = 1, .size = { .width = 95, -@@ -2792,6 +2830,71 @@ static const struct panel_desc olimex_lcd_olinuxino_43ts = { +@@ -2793,6 +2831,71 @@ static const struct panel_desc olimex_lcd_olinuxino_43ts = { .bus_format = MEDIA_BUS_FMT_RGB888_1X24, }; @@ -139,7 +140,7 @@ index 9b6c4e6c3..542c05c89 100644 /* * 800x480 CVT. The panel appears to be quite accepting, at least as far as * pixel clocks, but this is the timing that was being used in the Adafruit -@@ -3931,8 +4034,23 @@ static const struct of_device_id platform_of_match[] = { +@@ -3932,8 +4035,23 @@ static const struct of_device_id platform_of_match[] = { .compatible = "okaya,rs800480t-7x0gp", .data = &okaya_rs800480t_7x0gp, }, { @@ -166,5 +167,5 @@ index 9b6c4e6c3..542c05c89 100644 .compatible = "ontat,yx700wv03", .data = &ontat_yx700wv03, -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch index 34ff3a4b9..a53b1d915 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch @@ -1,7 +1,7 @@ -From 68a63631a714cc28c401f66613ec90dced5226fd Mon Sep 17 00:00:00 2001 +From 317f2c7713d781becfec6407798b89acd226b44c Mon Sep 17 00:00:00 2001 From: Maxime Ripard Date: Mon, 7 Dec 2015 09:47:34 +0100 -Subject: [PATCH 017/101] drv:gpu:drm:sun4i: Add GEM allocator +Subject: [PATCH 013/169] drv:gpu:drm:sun4i: Add GEM allocator Signed-off-by: Maxime Ripard --- @@ -11,10 +11,10 @@ Signed-off-by: Maxime Ripard create mode 100644 include/uapi/drm/sun4i_drm.h diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c -index 54dd562e2..4a2c551be 100644 +index 4b29de65a..04772b2a6 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c -@@ -23,6 +23,8 @@ +@@ -24,6 +24,8 @@ #include #include @@ -23,7 +23,7 @@ index 54dd562e2..4a2c551be 100644 #include "sun4i_drv.h" #include "sun4i_frontend.h" #include "sun4i_framebuffer.h" -@@ -41,6 +43,27 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, +@@ -42,6 +44,27 @@ static int drm_sun4i_gem_dumb_create(struct drm_file *file_priv, DEFINE_DRM_GEM_CMA_FOPS(sun4i_drv_fops); @@ -51,7 +51,7 @@ index 54dd562e2..4a2c551be 100644 static const struct drm_driver sun4i_drv_driver = { .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, -@@ -52,6 +75,10 @@ static const struct drm_driver sun4i_drv_driver = { +@@ -53,6 +76,10 @@ static const struct drm_driver sun4i_drv_driver = { .major = 1, .minor = 0, @@ -98,5 +98,5 @@ index 000000000..67b9dd4ee + +#endif -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch index fe7875dff..b413ce3ae 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch @@ -1,7 +1,7 @@ -From c8b0cc17860a6819e42fd8967c74963af943ee3b Mon Sep 17 00:00:00 2001 +From cca6ef7129c5e209481e854125d95d3685309564 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 24 Jan 2022 13:07:16 +0300 -Subject: [PATCH 071/101] drv:gpu:drm:sun4i: Add HDMI audio sun4i-hdmi encoder +Subject: [PATCH 014/169] drv:gpu:drm:sun4i: Add HDMI audio sun4i-hdmi encoder Add HDMI audio support for the sun4i-hdmi encoder, used on the older Allwinner chips - A10, A20, A31. @@ -21,10 +21,10 @@ Signed-off-by: Stefan Mavrodiev create mode 100644 drivers/gpu/drm/sun4i/sun4i_hdmi_audio.c diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig -index 8c796de53..eebf67daf 100644 +index befc5a802..08be79c3d 100644 --- a/drivers/gpu/drm/sun4i/Kconfig +++ b/drivers/gpu/drm/sun4i/Kconfig -@@ -23,6 +23,17 @@ config DRM_SUN4I_HDMI +@@ -22,6 +22,17 @@ config DRM_SUN4I_HDMI Choose this option if you have an Allwinner SoC with an HDMI controller. @@ -585,7 +585,7 @@ index 000000000..2ac967bfd + dev_set_drvdata(hdmi->dev, data); +} diff --git a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c -index 2f2c9f0a1..f75b63550 100644 +index 3799a745b..26899c7db 100644 --- a/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c +++ b/drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c @@ -24,6 +24,8 @@ @@ -632,5 +632,5 @@ index 2f2c9f0a1..f75b63550 100644 DRM_DEBUG_DRIVER("Monitor is %s monitor\n", hdmi->hdmi_monitor ? "an HDMI" : "a DVI"); -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch index 2043877dc..c8fb7c739 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-gpu-drm-sun4i-sun8i_mixer.c-add-h3-mixer1.patch @@ -1,17 +1,17 @@ -From 6cda27bbd401900e131e47c9513220d97914407c Mon Sep 17 00:00:00 2001 +From e42108d31eefe1764093d4d37708d7cb1687e1a3 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:37:03 +0300 -Subject: [PATCH 04/50] drv:gpu:drm:sun4i:sun8i_mixer.c add h3 mixer1 +Subject: [PATCH 052/169] drv:gpu:drm:sun4i:sun8i_mixer.c add h3 mixer1 --- drivers/gpu/drm/sun4i/sun8i_mixer.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/gpu/drm/sun4i/sun8i_mixer.c b/drivers/gpu/drm/sun4i/sun8i_mixer.c -index 681adda35..fbd062dbd 100644 +index 43aad118e..54936395a 100644 --- a/drivers/gpu/drm/sun4i/sun8i_mixer.c +++ b/drivers/gpu/drm/sun4i/sun8i_mixer.c -@@ -618,6 +618,14 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { +@@ -616,6 +616,14 @@ static const struct sun8i_mixer_cfg sun8i_h3_mixer0_cfg = { .vi_num = 1, }; @@ -26,7 +26,7 @@ index 681adda35..fbd062dbd 100644 static const struct sun8i_mixer_cfg sun8i_r40_mixer0_cfg = { .ccsc = 0, .mod_rate = 297000000, -@@ -686,6 +694,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = { +@@ -684,6 +692,10 @@ static const struct of_device_id sun8i_mixer_of_table[] = { .compatible = "allwinner,sun8i-h3-de2-mixer-0", .data = &sun8i_h3_mixer0_cfg, }, @@ -38,5 +38,5 @@ index 681adda35..fbd062dbd 100644 .compatible = "allwinner,sun8i-r40-de2-mixer-0", .data = &sun8i_r40_mixer0_cfg, -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-Kconfig-enable-A80-A64-H5-for-THS.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-Kconfig-enable-A80-A64-H5-for-THS.patch index d6ae1b1ea..b6608c300 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-Kconfig-enable-A80-A64-H5-for-THS.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-Kconfig-enable-A80-A64-H5-for-THS.patch @@ -1,7 +1,7 @@ -From fb0aa61f5cf9811e41f55aab23686ce72b083f5f Mon Sep 17 00:00:00 2001 +From e0cd16896f5db0c6cba5103c687568df70013f89 Mon Sep 17 00:00:00 2001 From: Philipp Rossak Date: Wed, 24 Jan 2018 22:35:13 +0100 -Subject: [PATCH 047/101] drv:iio:adc: Kconfig: enable A80,A64,H5 for THS +Subject: [PATCH 027/169] drv:iio:adc: Kconfig: enable A80,A64,H5 for THS Signed-off-by: Philipp Rossak --- @@ -9,10 +9,10 @@ Signed-off-by: Philipp Rossak 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig -index af168e1c9..caa58fdaf 100644 +index 71ab0a06a..1481bcc55 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig -@@ -1010,7 +1010,7 @@ config STX104 +@@ -1031,7 +1031,7 @@ config STX104 config SUN4I_GPADC tristate "Support for the Allwinner SoCs GPADC" depends on IIO @@ -22,5 +22,5 @@ index af168e1c9..caa58fdaf 100644 select REGMAP_IRQ help -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch index 37acfcbaa..c4d3ab4e1 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-axp20x_adc-arm64-dts-axp803-hwmon-enable-thermal.patch @@ -1,7 +1,7 @@ -From 867a5950fe3cd4697c84467e84df89b35cf74660 Mon Sep 17 00:00:00 2001 +From 99f51c1591b8f22c088ae0e97e685e57ca29754a Mon Sep 17 00:00:00 2001 From: Mitko Gamishev Date: Wed, 5 Feb 2020 14:57:10 +0200 -Subject: [PATCH 13/50] drv:iio:adc:axp20x_adc arm64:dts:axp803 hwmon enable +Subject: [PATCH 060/169] drv:iio:adc:axp20x_adc arm64:dts:axp803 hwmon enable thermal --- @@ -10,10 +10,10 @@ Subject: [PATCH 13/50] drv:iio:adc:axp20x_adc arm64:dts:axp803 hwmon enable 2 files changed, 89 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/allwinner/axp803.dtsi b/arch/arm64/boot/dts/allwinner/axp803.dtsi -index 5a1034748..ac484b5da 100644 +index 578ef368e..d0ccd55d8 100644 --- a/arch/arm64/boot/dts/allwinner/axp803.dtsi +++ b/arch/arm64/boot/dts/allwinner/axp803.dtsi -@@ -19,6 +19,7 @@ ac_power_supply: ac-power-supply { +@@ -19,6 +19,7 @@ ac_power_supply: ac-power { axp_adc: adc { compatible = "x-powers,axp803-adc", "x-powers,axp813-adc"; #io-channel-cells = <1>; @@ -22,7 +22,7 @@ index 5a1034748..ac484b5da 100644 axp_gpio: gpio { diff --git a/drivers/iio/adc/axp20x_adc.c b/drivers/iio/adc/axp20x_adc.c -index e13f9a637..6bb7a4909 100644 +index 70136c0dd..28f21dcf8 100644 --- a/drivers/iio/adc/axp20x_adc.c +++ b/drivers/iio/adc/axp20x_adc.c @@ -6,6 +6,7 @@ @@ -41,7 +41,7 @@ index e13f9a637..6bb7a4909 100644 #include #include -@@ -583,6 +583,74 @@ static int axp813_adc_rate(struct axp20x_adc_iio *info, int rate) +@@ -616,6 +616,74 @@ static int axp813_adc_rate(struct axp20x_adc_iio *info, int rate) AXP813_ADC_RATE_HZ(rate)); } @@ -116,7 +116,7 @@ index e13f9a637..6bb7a4909 100644 struct axp_data { const struct iio_info *iio_info; int num_channels; -@@ -591,6 +659,7 @@ struct axp_data { +@@ -624,6 +692,7 @@ struct axp_data { int (*adc_rate)(struct axp20x_adc_iio *info, int rate); bool adc_en2; @@ -124,7 +124,7 @@ index e13f9a637..6bb7a4909 100644 struct iio_map *maps; }; -@@ -601,6 +670,7 @@ static const struct axp_data axp20x_data = { +@@ -634,6 +703,7 @@ static const struct axp_data axp20x_data = { .adc_en1_mask = AXP20X_ADC_EN1_MASK, .adc_rate = axp20x_adc_rate, .adc_en2 = true, @@ -132,7 +132,7 @@ index e13f9a637..6bb7a4909 100644 .maps = axp20x_maps, }; -@@ -611,6 +681,7 @@ static const struct axp_data axp22x_data = { +@@ -644,6 +714,7 @@ static const struct axp_data axp22x_data = { .adc_en1_mask = AXP22X_ADC_EN1_MASK, .adc_rate = axp22x_adc_rate, .adc_en2 = false, @@ -140,7 +140,7 @@ index e13f9a637..6bb7a4909 100644 .maps = axp22x_maps, }; -@@ -621,6 +692,7 @@ static const struct axp_data axp813_data = { +@@ -654,6 +725,7 @@ static const struct axp_data axp813_data = { .adc_en1_mask = AXP22X_ADC_EN1_MASK, .adc_rate = axp813_adc_rate, .adc_en2 = false, @@ -148,7 +148,7 @@ index e13f9a637..6bb7a4909 100644 .maps = axp22x_maps, }; -@@ -703,8 +775,23 @@ static int axp20x_probe(struct platform_device *pdev) +@@ -736,8 +808,23 @@ static int axp20x_probe(struct platform_device *pdev) goto fail_register; } @@ -173,5 +173,5 @@ index e13f9a637..6bb7a4909 100644 iio_map_array_unregister(indio_dev); -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch similarity index 93% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch index ea9ca3eb8..f8b6a0b68 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch @@ -1,7 +1,7 @@ -From dff7a7339f685bf9869d230605485cb98a3b5bd2 Mon Sep 17 00:00:00 2001 +From 264f0b7a0d187303dffeceeb51753c0e3a2604f2 Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 14 Sep 2017 22:52:47 +0800 -Subject: [PATCH 025/101] drv:iio:adc: sun4i-gpadc-iio: rename A33-specified +Subject: [PATCH 019/169] drv:iio:adc: sun4i-gpadc-iio: rename A33-specified registers to contain A33 As the H3 SoC, which is also in sun8i line, has totally different @@ -52,5 +52,5 @@ index 021f820f9..af79cfd9a 100644 #define SUN4I_GPADC_CTRL2 0x08 -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch similarity index 98% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch index a36c80e13..440b71545 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch @@ -1,7 +1,7 @@ -From c11b717d3d28b40c96004780db117fa0a932487f Mon Sep 17 00:00:00 2001 +From 69e2306cde177ac626827b59d803d1586cccbf71 Mon Sep 17 00:00:00 2001 From: Philipp Rossak Date: Sat, 20 Jan 2018 14:03:10 +0100 -Subject: [PATCH 028/101] drv:iio:adc: sun4i-gpadc-iio: sampling start/end code +Subject: [PATCH 020/169] drv:iio:adc: sun4i-gpadc-iio: sampling start/end code readout reg rework For adding newer sensor some basic rework of the code is necessary. @@ -233,5 +233,5 @@ index af79cfd9a..a7cd4c644 100644 struct device *dev; struct regmap *regmap; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch similarity index 97% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch index 0cce12d6c..6bdef6d73 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch @@ -1,7 +1,7 @@ -From 52adc77f5a22c9e51f9e62b2866909a9bfb14d9f Mon Sep 17 00:00:00 2001 +From 8a8d447bbe8f9d1361ed2b3b6d8ab7397aebdb83 Mon Sep 17 00:00:00 2001 From: Philipp Rossak Date: Sun, 21 Jan 2018 22:29:55 +0100 -Subject: [PATCH 034/101] drv:iio:adc:sun4i-gpadc-iio: support nvmem +Subject: [PATCH 023/169] drv:iio:adc:sun4i-gpadc-iio: support nvmem calibration data This patch reworks the driver to support nvmem calibration cells. @@ -162,5 +162,5 @@ index 4b4415bf4..1439422b0 100644 #define SUNXI_THS_TDATA1 0x84 #define SUNXI_THS_TDATA2 0x88 -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-Add-callback-for-buffer-cleanup.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-Add-callback-for-buffer-cleanup.patch index 8b2b588f9..e7f65ce83 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-Add-callback-for-buffer-cleanup.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-Add-callback-for-buffer-cleanup.patch @@ -1,7 +1,7 @@ -From 93b5b1670e96f2a3a8dd1d5a9ac9d2b38c295917 Mon Sep 17 00:00:00 2001 +From 9f599b107c70ffa8a1ba40574163505295a1fa7a Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 9 Nov 2019 13:06:15 +0100 -Subject: [PATCH 048/101] drv:media: cedrus: Add callback for buffer cleanup +Subject: [PATCH 034/169] drv:media: cedrus: Add callback for buffer cleanup Signed-off-by: Jernej Skrabec --- @@ -10,10 +10,10 @@ Signed-off-by: Jernej Skrabec 2 files changed, 14 insertions(+) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h -index c790963ef..35faf42f2 100644 +index 9d34e5785..0a17ed0dc 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h -@@ -166,6 +166,7 @@ struct cedrus_dec_ops { +@@ -168,6 +168,7 @@ struct cedrus_dec_ops { int (*start)(struct cedrus_ctx *ctx); void (*stop)(struct cedrus_ctx *ctx); void (*trigger)(struct cedrus_ctx *ctx); @@ -22,7 +22,7 @@ index c790963ef..35faf42f2 100644 struct cedrus_variant { diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_video.c b/drivers/staging/media/sunxi/cedrus/cedrus_video.c -index 6e1486987..80e33775b 100644 +index 33726175d..9bb82c8e0 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_video.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_video.c @@ -469,6 +469,18 @@ static int cedrus_buf_prepare(struct vb2_buffer *vb) @@ -53,5 +53,5 @@ index 6e1486987..80e33775b 100644 .buf_out_validate = cedrus_buf_out_validate, .buf_request_complete = cedrus_buf_request_complete, -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-h264-Improve-buffer-management.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-h264-Improve-buffer-management.patch index 5e8ae2e1d..371ad0a1e 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-h264-Improve-buffer-management.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-h264-Improve-buffer-management.patch @@ -1,7 +1,7 @@ -From eb94bf33cc1b37231063703c691c4b460481df7a Mon Sep 17 00:00:00 2001 +From 6e738560d26ed0d556925490f4c4f99d1e8c2d0e Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 9 Nov 2019 14:12:42 +0100 -Subject: [PATCH 051/101] drv:media: cedrus: h264: Improve buffer management +Subject: [PATCH 036/169] drv:media: cedrus: h264: Improve buffer management Signed-off-by: Jernej Skrabec --- @@ -10,10 +10,10 @@ Signed-off-by: Jernej Skrabec 2 files changed, 44 insertions(+), 54 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h -index 54a860ec7..25079901a 100644 +index 1b20e23ee..ef9f1d9c8 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h -@@ -105,6 +105,9 @@ struct cedrus_buffer { +@@ -106,6 +106,9 @@ struct cedrus_buffer { struct { unsigned int position; enum cedrus_h264_pic_type pic_type; @@ -24,7 +24,7 @@ index 54a860ec7..25079901a 100644 struct { void *mv_col_buf; diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c -index b4173a892..787c1575c 100644 +index d8fb93035..281909c57 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_h264.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h264.c @@ -55,16 +55,14 @@ static void cedrus_h264_write_sram(struct cedrus_dev *dev, @@ -203,6 +203,5 @@ index b4173a892..787c1575c 100644 + .buf_cleanup = cedrus_h264_buf_cleanup, }; -- -2.31.1 - +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-Improve-buffer-management.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-Improve-buffer-management.patch index 42ccc693d..44f4ee495 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-Improve-buffer-management.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-Improve-buffer-management.patch @@ -1,19 +1,19 @@ -From e5464070b7b15a21dc9bc133734f95a45d0c58e4 Mon Sep 17 00:00:00 2001 +From abfb99136745d35eac66e948cc1ab3babdeacc1f Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 9 Nov 2019 13:22:05 +0100 -Subject: [PATCH 049/101] drv:media:cedrus: hevc: Improve buffer management +Subject: [PATCH 035/169] drv:media:cedrus: hevc: Improve buffer management Signed-off-by: Jernej Skrabec --- drivers/staging/media/sunxi/cedrus/cedrus.h | 9 +- - .../staging/media/sunxi/cedrus/cedrus_h265.c | 119 ++++++++++-------- - 2 files changed, 70 insertions(+), 58 deletions(-) + .../staging/media/sunxi/cedrus/cedrus_h265.c | 120 ++++++++++-------- + 2 files changed, 70 insertions(+), 59 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h -index 35faf42f2..6ddcff8f5 100644 +index 0a17ed0dc..1b20e23ee 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h -@@ -106,6 +106,11 @@ struct cedrus_buffer { +@@ -107,6 +107,11 @@ struct cedrus_buffer { unsigned int position; enum cedrus_h264_pic_type pic_type; } h264; @@ -25,7 +25,7 @@ index 35faf42f2..6ddcff8f5 100644 } codec; }; -@@ -139,10 +144,6 @@ struct cedrus_ctx { +@@ -140,10 +145,6 @@ struct cedrus_ctx { ssize_t intra_pred_buf_size; } h264; struct { @@ -37,7 +37,7 @@ index 35faf42f2..6ddcff8f5 100644 dma_addr_t neighbor_info_buf_addr; void *entry_points_buf; diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -index 4fa5016a2..3d7f87a80 100644 +index f71ce6f87..908bccde2 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c @@ -91,26 +91,66 @@ static void cedrus_h265_sram_write_data(struct cedrus_dev *dev, void *data, @@ -134,7 +134,7 @@ index 4fa5016a2..3d7f87a80 100644 } } -@@ -388,37 +388,6 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -388,37 +429,6 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, width_in_ctb_luma = DIV_ROUND_UP(sps->pic_width_in_luma_samples, ctb_size_luma); @@ -172,7 +172,7 @@ index 4fa5016a2..3d7f87a80 100644 /* Activate H265 engine. */ cedrus_engine_enable(ctx, CEDRUS_CODEC_H265); -@@ -671,7 +682,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -672,7 +682,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, /* Write decoded picture buffer in pic list. */ cedrus_h265_frame_info_write_dpb(ctx, decode_params->dpb, @@ -181,7 +181,7 @@ index 4fa5016a2..3d7f87a80 100644 /* Output frame. */ -@@ -682,7 +693,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -683,7 +693,7 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, cedrus_h265_frame_info_write_single(ctx, output_pic_list_index, slice_params->pic_struct != 0, pic_order_cnt, @@ -190,7 +190,7 @@ index 4fa5016a2..3d7f87a80 100644 cedrus_write(dev, VE_DEC_H265_OUTPUT_FRAME_IDX, output_pic_list_index); -@@ -732,9 +701,6 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx) +@@ -732,9 +742,6 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx) { struct cedrus_dev *dev = ctx->dev; @@ -200,7 +200,7 @@ index 4fa5016a2..3d7f87a80 100644 /* Buffer is never accessed by CPU, so we can skip kernel mapping. */ ctx->codec.h265.neighbor_info_buf = dma_alloc_attrs(dev->dev, CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE, -@@ -759,15 +767,6 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx) +@@ -761,15 +768,6 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx) { struct cedrus_dev *dev = ctx->dev; @@ -216,7 +216,7 @@ index 4fa5016a2..3d7f87a80 100644 dma_free_attrs(dev->dev, CEDRUS_H265_NEIGHBOR_INFO_BUF_SIZE, ctx->codec.h265.neighbor_info_buf, ctx->codec.h265.neighbor_info_buf_addr, -@@ -784,6 +783,17 @@ static void cedrus_h265_trigger(struct cedrus_ctx *ctx) +@@ -786,6 +784,17 @@ static void cedrus_h265_trigger(struct cedrus_ctx *ctx) cedrus_write(dev, VE_DEC_H265_TRIGGER, VE_DEC_H265_TRIGGER_DEC_SLICE); } @@ -234,12 +234,12 @@ index 4fa5016a2..3d7f87a80 100644 struct cedrus_dec_ops cedrus_dec_ops_h265 = { .irq_clear = cedrus_h265_irq_clear, .irq_disable = cedrus_h265_irq_disable, -@@ -792,4 +802,5 @@ struct cedrus_dec_ops cedrus_dec_ops_h265 = { +@@ -794,4 +803,5 @@ struct cedrus_dec_ops cedrus_dec_ops_h265 = { .start = cedrus_h265_start, .stop = cedrus_h265_stop, .trigger = cedrus_h265_trigger, + .buf_cleanup = cedrus_h265_buf_cleanup, }; -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-tiles-hack.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-tiles-hack.patch index 7d1238b08..ae60e4187 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-tiles-hack.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-media-cedrus-hevc-tiles-hack.patch @@ -1,7 +1,7 @@ -From 08ec2c0d449a9e91f9174b347bd3f560f50ca872 Mon Sep 17 00:00:00 2001 +From 36c74debcb4578c1c82de2c6362f5e26fd3d3683 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Sat, 26 Oct 2019 21:23:55 +0200 -Subject: [PATCH 046/101] drv:media: cedrus: hevc: tiles hack +Subject: [PATCH 033/169] drv:media: cedrus: hevc: tiles hack Signed-off-by: Jernej Skrabec --- @@ -10,10 +10,10 @@ Signed-off-by: Jernej Skrabec 2 files changed, 89 insertions(+), 6 deletions(-) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.h b/drivers/staging/media/sunxi/cedrus/cedrus.h -index 9c7bfd2b6..c790963ef 100644 +index 3bc094eb4..9d34e5785 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.h +++ b/drivers/staging/media/sunxi/cedrus/cedrus.h -@@ -144,6 +144,8 @@ struct cedrus_ctx { +@@ -146,6 +146,8 @@ struct cedrus_ctx { ssize_t mv_col_buf_unit_size; void *neighbor_info_buf; dma_addr_t neighbor_info_buf_addr; @@ -23,7 +23,7 @@ index 9c7bfd2b6..c790963ef 100644 struct { unsigned int last_frame_p_type; diff --git a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c -index bb7eb5610..4fa5016a2 100644 +index 44f385be9..f71ce6f87 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus_h265.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus_h265.c @@ -301,6 +301,61 @@ static void cedrus_h265_write_scaling_list(struct cedrus_ctx *ctx, @@ -96,7 +96,7 @@ index bb7eb5610..4fa5016a2 100644 dma_addr_t src_buf_addr; dma_addr_t src_buf_end_addr; u32 chroma_log2_weight_denom; -@@ -390,12 +446,19 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -391,12 +447,19 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, cedrus_write(dev, VE_DEC_H265_BITS_END_ADDR, reg); /* Coding tree block address */ @@ -120,7 +120,7 @@ index bb7eb5610..4fa5016a2 100644 /* Clear the number of correctly-decoded coding tree blocks. */ if (ctx->fh.m2m_ctx->new_frame) -@@ -499,7 +562,9 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -500,7 +563,9 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, V4L2_HEVC_PPS_FLAG_ENTROPY_CODING_SYNC_ENABLED, pps->flags); @@ -131,7 +131,7 @@ index bb7eb5610..4fa5016a2 100644 reg |= VE_DEC_H265_FLAG(VE_DEC_H265_DEC_PPS_CTRL1_FLAG_TRANSQUANT_BYPASS_ENABLED, V4L2_HEVC_PPS_FLAG_TRANSQUANT_BYPASS_ENABLED, -@@ -575,12 +640,14 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, +@@ -576,12 +641,14 @@ static void cedrus_h265_setup(struct cedrus_ctx *ctx, chroma_log2_weight_denom = pred_weight_table->luma_log2_weight_denom + pred_weight_table->delta_chroma_log2_weight_denom; @@ -147,7 +147,7 @@ index bb7eb5610..4fa5016a2 100644 /* Decoded picture size. */ reg = VE_DEC_H265_DEC_PIC_SIZE_WIDTH(ctx->src_fmt.width) | -@@ -674,6 +741,17 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx) +@@ -676,6 +743,17 @@ static int cedrus_h265_start(struct cedrus_ctx *ctx) if (!ctx->codec.h265.neighbor_info_buf) return -ENOMEM; @@ -165,7 +165,7 @@ index bb7eb5610..4fa5016a2 100644 return 0; } -@@ -694,6 +772,9 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx) +@@ -696,6 +774,9 @@ static void cedrus_h265_stop(struct cedrus_ctx *ctx) ctx->codec.h265.neighbor_info_buf, ctx->codec.h265.neighbor_info_buf_addr, DMA_ATTR_NO_KERNEL_MAPPING); @@ -176,5 +176,5 @@ index bb7eb5610..4fa5016a2 100644 static void cedrus_h265_trigger(struct cedrus_ctx *ctx) -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mfd-Add-support-for-AC200.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mfd-Add-support-for-AC200.patch index 0a79ef9e9..7f330dbe4 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mfd-Add-support-for-AC200.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mfd-Add-support-for-AC200.patch @@ -1,7 +1,7 @@ -From 3e6411db1aa4dfe1d1a6d63c2cbed2c588d35aef Mon Sep 17 00:00:00 2001 +From 84804d64d02e4789519bd3b241f7c2883eb5095b Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 16 Aug 2019 16:38:21 +0200 -Subject: [PATCH 006/101] drv:mfd: Add support for AC200 +Subject: [PATCH 008/169] drv:mfd: Add support for AC200 Signed-off-by: Jernej Skrabec --- @@ -14,7 +14,7 @@ Signed-off-by: Jernej Skrabec create mode 100644 include/linux/mfd/ac200.h diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig -index d2f345245..5b756e81b 100644 +index 3b59456f5..6df66ff8a 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -178,6 +178,15 @@ config MFD_AC100 @@ -34,10 +34,10 @@ index d2f345245..5b756e81b 100644 tristate select MFD_CORE diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile -index 2ba6646e8..7edc825f9 100644 +index 858cacf65..24ff449f1 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile -@@ -142,6 +142,7 @@ obj-$(CONFIG_MFD_DA9052_SPI) += da9052-spi.o +@@ -141,6 +141,7 @@ obj-$(CONFIG_MFD_DA9052_SPI) += da9052-spi.o obj-$(CONFIG_MFD_DA9052_I2C) += da9052-i2c.o obj-$(CONFIG_MFD_AC100) += ac100.o @@ -436,5 +436,5 @@ index 000000000..0c677094a + +#endif /* __LINUX_MFD_AC200_H */ -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar.patch index b92751a75..f10d19d51 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-mmc-host-sunxi-mmc-Disable-DDR52-mode-on-all-A20-based-boar.patch @@ -1,7 +1,7 @@ -From 184acbae8659aecb55afa2d4ca2f0a61be46d205 Mon Sep 17 00:00:00 2001 +From 8f50e3632c2a92685cdabf176835f8e31d37cab4 Mon Sep 17 00:00:00 2001 From: Mitko Gamishev Date: Wed, 5 Feb 2020 15:31:25 +0200 -Subject: [PATCH 16/50] drv:mmc:host:sunxi-mmc Disable DDR52 mode on all A20 +Subject: [PATCH 063/169] drv:mmc:host:sunxi-mmc Disable DDR52 mode on all A20 based boards --- @@ -9,10 +9,10 @@ Subject: [PATCH 16/50] drv:mmc:host:sunxi-mmc Disable DDR52 mode on all A20 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c -index ce541403b..dd1c2a610 100644 +index ae7f3b930..a1eebc1dc 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c -@@ -1442,7 +1442,9 @@ static int sunxi_mmc_probe(struct platform_device *pdev) +@@ -1452,7 +1452,9 @@ static int sunxi_mmc_probe(struct platform_device *pdev) */ if ((host->cfg->clk_delays || host->use_new_timings) && !of_device_is_compatible(pdev->dev.of_node, @@ -24,5 +24,5 @@ index ce541403b..dd1c2a610 100644 ret = mmc_of_parse(mmc); -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch similarity index 85% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch index 96994ff7d..4cb2483ca 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch @@ -1,7 +1,7 @@ -From b6bbd1ab93c590bba893f007ffa651a3efa1a363 Mon Sep 17 00:00:00 2001 +From c40af107a290c3487d7e0e34bacab274f9398800 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Thu, 10 Dec 2020 14:42:12 +0000 -Subject: [PATCH 020/101] drv:net:stmmac:dwmac-sun8i: second EMAC clock +Subject: [PATCH 015/169] drv:net:stmmac:dwmac-sun8i: second EMAC clock register The Allwinner H616 SoC has two EMAC controllers, with the second one @@ -19,10 +19,10 @@ Signed-off-by: Andre Przywara 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -index 52cb40e1b..7f2a2298b 100644 +index 3fc0fcee4..c830f0584 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c -@@ -1157,11 +1157,13 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) +@@ -1145,11 +1145,13 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) struct stmmac_resources stmmac_res; struct sunxi_priv_data *gmac; struct device *dev = &pdev->dev; @@ -36,7 +36,7 @@ index 52cb40e1b..7f2a2298b 100644 ret = stmmac_get_platform_resources(pdev, &stmmac_res); if (ret) -@@ -1226,8 +1228,12 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) +@@ -1204,8 +1206,12 @@ static int sun8i_dwmac_probe(struct platform_device *pdev) return ret; } @@ -51,7 +51,7 @@ index 52cb40e1b..7f2a2298b 100644 if (IS_ERR(gmac->regmap_field)) { ret = PTR_ERR(gmac->regmap_field); dev_err(dev, "Unable to map syscon register: %d\n", ret); -@@ -1347,6 +1353,8 @@ static const struct of_device_id sun8i_dwmac_match[] = { +@@ -1334,6 +1340,8 @@ static const struct of_device_id sun8i_dwmac_match[] = { .data = &emac_variant_a64 }, { .compatible = "allwinner,sun50i-h6-emac", .data = &emac_variant_h6 }, @@ -61,5 +61,5 @@ index 52cb40e1b..7f2a2298b 100644 }; MODULE_DEVICE_TABLE(of, sun8i_dwmac_match); -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch index 5edbc2952..05af3c284 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-nvmem-sunxi_sid-Support-SID-on-H616.patch @@ -1,7 +1,7 @@ -From 9ae3013104a689d65f7235186d00d02c6b627eeb Mon Sep 17 00:00:00 2001 +From c356ef621f0d9dc0103d64f9476edbbfc19f94ab Mon Sep 17 00:00:00 2001 From: Kali Prasad Date: Sun, 19 Sep 2021 13:28:10 +0530 -Subject: [PATCH 11/50] drv:nvmem:sunxi_sid: Support SID on H616 +Subject: [PATCH 058/169] drv:nvmem:sunxi_sid: Support SID on H616 Add support for H616's SID controller. It supports 4K-bit EFUSE. @@ -12,10 +12,10 @@ Signed-off-by: Kali Prasad 1 file changed, 7 insertions(+) diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c -index 275b9155e..37a6abb0e 100644 +index 5750e1f4b..97f556838 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c -@@ -195,6 +195,12 @@ static const struct sunxi_sid_cfg sun50i_h6_cfg = { +@@ -200,6 +200,12 @@ static const struct sunxi_sid_cfg sun50i_h6_cfg = { .size = 0x200, }; @@ -28,7 +28,7 @@ index 275b9155e..37a6abb0e 100644 static const struct of_device_id sunxi_sid_of_match[] = { { .compatible = "allwinner,sun4i-a10-sid", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun7i-a20-sid", .data = &sun7i_a20_cfg }, -@@ -203,6 +209,7 @@ static const struct of_device_id sunxi_sid_of_match[] = { +@@ -209,6 +215,7 @@ static const struct of_device_id sunxi_sid_of_match[] = { { .compatible = "allwinner,sun50i-a64-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-h5-sid", .data = &sun50i_a64_cfg }, { .compatible = "allwinner,sun50i-h6-sid", .data = &sun50i_h6_cfg }, @@ -37,5 +37,5 @@ index 275b9155e..37a6abb0e 100644 }; MODULE_DEVICE_TABLE(of, sunxi_sid_of_match); -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch index 7824ea23d..04063cb93 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-of-Device-Tree-Overlay-ConfigFS-interface.patch @@ -1,7 +1,7 @@ -From 759a9b4cea4e992d54ecb9dd23584616a1b79890 Mon Sep 17 00:00:00 2001 +From 78d4ad954f7718104f5584347779389a5e328c70 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 1 Feb 2022 19:22:21 +0300 -Subject: [PATCH 03/50] drv:of: Device Tree Overlay ConfigFS interface +Subject: [PATCH 051/169] drv:of: Device Tree Overlay ConfigFS interface --- drivers/of/Kconfig | 7 + @@ -12,10 +12,10 @@ Subject: [PATCH 03/50] drv:of: Device Tree Overlay ConfigFS interface create mode 100644 drivers/of/configfs.c diff --git a/drivers/of/Kconfig b/drivers/of/Kconfig -index 3dfeae891..0ac5f4094 100644 +index 80b5fd44a..4f1869262 100644 --- a/drivers/of/Kconfig +++ b/drivers/of/Kconfig -@@ -91,6 +91,13 @@ config OF_OVERLAY +@@ -87,6 +87,13 @@ config OF_OVERLAY While this option is selected automatically when needed, you can enable it manually to improve device tree unit test coverage. @@ -30,10 +30,10 @@ index 3dfeae891..0ac5f4094 100644 bool diff --git a/drivers/of/Makefile b/drivers/of/Makefile -index c13b98208..76b665cfc 100644 +index e0360a443..9d088c759 100644 --- a/drivers/of/Makefile +++ b/drivers/of/Makefile -@@ -12,6 +12,7 @@ obj-$(CONFIG_OF_UNITTEST) += unittest.o +@@ -11,6 +11,7 @@ obj-$(CONFIG_OF_UNITTEST) += unittest.o obj-$(CONFIG_OF_RESERVED_MEM) += of_reserved_mem.o obj-$(CONFIG_OF_RESOLVE) += resolver.o obj-$(CONFIG_OF_OVERLAY) += overlay.o @@ -338,5 +338,5 @@ index 1dc15ab78..f697f2a52 100644 int parent, len; const struct of_bus *bus, *pbus; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch index f0ffaa840..14d8a6e85 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch @@ -1,7 +1,7 @@ -From b7044709eef4fc6c24791943c4d909daaaca1f2c Mon Sep 17 00:00:00 2001 +From 195bd3b94f84a2bd3cab56a8e5fb4e95fa8b9425 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Sun, 6 Dec 2020 01:40:16 +0000 -Subject: [PATCH 026/101] drv:phy: sun4i-usb: Add support for the H616 USB PHY +Subject: [PATCH 018/169] drv:phy: sun4i-usb: Add support for the H616 USB PHY The USB PHY used in the Allwinner H616 SoC inherits some traits from its various predecessors: it has four full PHYs like the H3, needs some @@ -17,10 +17,10 @@ Signed-off-by: Andre Przywara 1 file changed, 12 insertions(+) diff --git a/drivers/phy/allwinner/phy-sun4i-usb.c b/drivers/phy/allwinner/phy-sun4i-usb.c -index f121da65a..61ab34b00 100644 +index b74c0e0c8..a16760268 100644 --- a/drivers/phy/allwinner/phy-sun4i-usb.c +++ b/drivers/phy/allwinner/phy-sun4i-usb.c -@@ -1047,6 +1047,17 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { +@@ -1055,6 +1055,17 @@ static const struct sun4i_usb_phy_cfg sun50i_h6_cfg = { .missing_phys = BIT(1) | BIT(2), }; @@ -38,7 +38,7 @@ index f121da65a..61ab34b00 100644 static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible = "allwinner,sun4i-a10-usb-phy", .data = &sun4i_a10_cfg }, { .compatible = "allwinner,sun5i-a13-usb-phy", .data = &sun5i_a13_cfg }, -@@ -1061,6 +1072,7 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { +@@ -1070,6 +1081,7 @@ static const struct of_device_id sun4i_usb_phy_of_match[] = { { .compatible = "allwinner,sun50i-a64-usb-phy", .data = &sun50i_a64_cfg}, { .compatible = "allwinner,sun50i-h6-usb-phy", .data = &sun50i_h6_cfg }, @@ -47,5 +47,5 @@ index f121da65a..61ab34b00 100644 }; MODULE_DEVICE_TABLE(of, sun4i_usb_phy_of_match); -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch index 75f1ac4ef..2a6e96120 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-Add-Allwinner-H616-support.patch @@ -1,7 +1,7 @@ -From 06990583634891b1c6d8dfd0388f2272be8918cb Mon Sep 17 00:00:00 2001 +From c1487d2de2795b0564f8c420b74238b76d1c1b10 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Wed, 21 Apr 2021 12:46:43 +0100 -Subject: [PATCH 10/50] drv:rtc: sun6i: Add Allwinner H616 support +Subject: [PATCH 057/169] drv:rtc: sun6i: Add Allwinner H616 support The H616 RTC changes its day storage to the newly introduced linear day scheme, so pair the new compatible string with this feature flag. @@ -10,11 +10,11 @@ for future expansion we must thus ignore any provided clock for now. Signed-off-by: Andre Przywara --- - drivers/rtc/rtc-sun6i.c | 19 +++++++++++++++++++ - 1 file changed, 19 insertions(+) + drivers/rtc/rtc-sun6i.c | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c -index 0215900b5..81feda651 100644 +index be6057a2e..8b6c45e35 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c @@ -397,6 +397,23 @@ static void __init sun50i_h6_rtc_clk_init(struct device_node *node) @@ -42,5 +42,5 @@ index 0215900b5..81feda651 100644 * The R40 user manual is self-conflicting on whether the prescaler is * fixed or configurable. The clock diagram shows it as fixed, but there -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch index 8c1ef76f9..fbd1121d2 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-rtc-sun6i-support-RTCs-without-external-LOSCs.patch @@ -1,7 +1,7 @@ -From 590de40f460092e7c6b7a4e408ef37d3b2fb4539 Mon Sep 17 00:00:00 2001 +From 001b1d4a63b0f694e1084f94012e4cc918699ad8 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Mon, 14 Jun 2021 23:02:45 +0100 -Subject: [PATCH 016/101] drv:rtc:sun6i: support RTCs without external LOSCs +Subject: [PATCH 011/169] drv:rtc:sun6i: support RTCs without external LOSCs Some newer Allwinner RTCs (for instance the one in the H616 SoC) lack a pin for an external 32768 Hz oscillator. As a consequence, this LOSC @@ -19,10 +19,10 @@ Acked-by: Jernej Skrabec 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c -index 8e443952c..0215900b5 100644 +index 0ba7420a3..be6057a2e 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c -@@ -138,6 +138,7 @@ struct sun6i_rtc_clk_data { +@@ -139,6 +139,7 @@ struct sun6i_rtc_clk_data { unsigned int export_iosc : 1; unsigned int has_losc_en : 1; unsigned int has_auto_swt : 1; @@ -30,7 +30,7 @@ index 8e443952c..0215900b5 100644 }; #define RTC_LINEAR_DAY BIT(0) -@@ -260,7 +261,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, +@@ -261,7 +262,7 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, } /* Switch to the external, more precise, oscillator, if present */ @@ -39,7 +39,7 @@ index 8e443952c..0215900b5 100644 reg |= SUN6I_LOSC_CTRL_EXT_OSC; if (rtc->data->has_losc_en) reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN; -@@ -286,14 +287,19 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, +@@ -287,14 +288,19 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, } parents[0] = clk_hw_get_name(rtc->int_osc); @@ -64,5 +64,5 @@ index 8e443952c..0215900b5 100644 &init.name); -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-spi-spidev-remove-warnings.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-spi-spidev-remove-warnings.patch index 631efd5b6..c23a21833 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-spi-spidev-remove-warnings.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-spi-spidev-remove-warnings.patch @@ -1,17 +1,17 @@ -From 2653defc5e22ba86bd1d455eb01fc7edd2958473 Mon Sep 17 00:00:00 2001 +From 53969c730f4b9c417eed63486f9a1fa898d89ba1 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 11:56:51 +0300 -Subject: [PATCH 08/50] drv:spi:spidev remove warnings +Subject: [PATCH 055/169] drv:spi:spidev remove warnings --- drivers/spi/spidev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c -index a5cceca8b..b8ac14a53 100644 +index 53a551714..be1bdd509 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c -@@ -674,6 +674,7 @@ static const struct file_operations spidev_fops = { +@@ -681,6 +681,7 @@ static const struct file_operations spidev_fops = { static struct class *spidev_class; static const struct spi_device_id spidev_spi_ids[] = { @@ -19,7 +19,7 @@ index a5cceca8b..b8ac14a53 100644 { .name = "dh2228fv" }, { .name = "ltc2488" }, { .name = "sx1301" }, -@@ -688,6 +689,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids); +@@ -695,6 +696,7 @@ MODULE_DEVICE_TABLE(spi, spidev_spi_ids); #ifdef CONFIG_OF static const struct of_device_id spidev_dt_ids[] = { @@ -27,7 +27,7 @@ index a5cceca8b..b8ac14a53 100644 { .compatible = "rohm,dh2228fv" }, { .compatible = "lineartechnology,ltc2488" }, { .compatible = "semtech,sx1301" }, -@@ -750,9 +752,14 @@ static int spidev_probe(struct spi_device *spi) +@@ -757,9 +759,14 @@ static int spidev_probe(struct spi_device *spi) * spidev should never be referenced in DT without a specific * compatible string, it is a Linux implementation thing * rather than a description of the hardware. @@ -43,6 +43,5 @@ index a5cceca8b..b8ac14a53 100644 } -- -2.34.1 - +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-media-sunxi-cedrus-add-H616-variant.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-media-sunxi-cedrus-add-H616-variant.patch index 108843fe9..f0f3eb139 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-media-sunxi-cedrus-add-H616-variant.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-media-sunxi-cedrus-add-H616-variant.patch @@ -1,7 +1,7 @@ -From 1274fa501447bc7e004f09fc68e6af7bd82ed3a0 Mon Sep 17 00:00:00 2001 +From 5de8bcd85593f2733601231536e491be01a1d448 Mon Sep 17 00:00:00 2001 From: Jernej Skrabec Date: Fri, 15 Oct 2021 21:49:45 +0200 -Subject: [PATCH 040/101] drv:staging:media:sunxi:cedrus: add H616 variant +Subject: [PATCH 031/169] drv:staging:media:sunxi:cedrus: add H616 variant Signed-off-by: Jernej Skrabec --- @@ -9,10 +9,10 @@ Signed-off-by: Jernej Skrabec 1 file changed, 13 insertions(+) diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c -index 9389154b4..2bacccde2 100644 +index 7ff6f29e8..0c67e1ee3 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c -@@ -558,6 +558,15 @@ static const struct cedrus_variant sun50i_h6_cedrus_variant = { +@@ -622,6 +622,15 @@ static const struct cedrus_variant sun50i_h6_cedrus_variant = { .mod_rate = 600000000, }; @@ -28,7 +28,7 @@ index 9389154b4..2bacccde2 100644 static const struct of_device_id cedrus_dt_match[] = { { .compatible = "allwinner,sun4i-a10-video-engine", -@@ -599,6 +608,10 @@ static const struct of_device_id cedrus_dt_match[] = { +@@ -667,6 +676,10 @@ static const struct of_device_id cedrus_dt_match[] = { .compatible = "allwinner,sun50i-h6-video-engine", .data = &sun50i_h6_cedrus_variant, }, @@ -40,5 +40,5 @@ index 9389154b4..2bacccde2 100644 }; MODULE_DEVICE_TABLE(of, cedrus_dt_match); -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch index ac7ad30ab..81c375688 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch @@ -1,17 +1,17 @@ -From 6ed4df6a61d5653597348911fb4c97598a521564 Mon Sep 17 00:00:00 2001 +From 335fb6079713b8c417b068ce7b1a68eb2d944d5f Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Mon, 7 Feb 2022 17:00:50 +0300 -Subject: [PATCH 10/13] drv:staging:rtl8723bs: AP bugfix +Subject: [PATCH 150/169] drv:staging:rtl8723bs: AP bugfix --- drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c -index 0868f56e2..bcb53b788 100644 +index 43b5604c0..a3be2bed3 100644 --- a/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c +++ b/drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c -@@ -2083,7 +2083,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, +@@ -2049,7 +2049,7 @@ void rtw_cfg80211_indicate_sta_assoc(struct adapter *padapter, u8 *pmgmt_frame, else /* WIFI_REASSOCREQ */ ie_offset = _REASOCREQ_IE_OFFSET_; @@ -21,5 +21,5 @@ index 0868f56e2..bcb53b788 100644 sinfo.assoc_req_ies_len = frame_len - WLAN_HDR_A3_LEN - ie_offset; cfg80211_new_sta(ndev, GetAddr2Ptr(pmgmt_frame), &sinfo, GFP_ATOMIC); -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch index 004aef930..bee6bf074 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/drv-usb-gadget-composite-rename-gadget-serial-console-manufactu.patch @@ -1,7 +1,7 @@ -From 2468a986ed2a9ec4d4b69d263f08a25cabb0190c Mon Sep 17 00:00:00 2001 +From d3ec860e83ead057610ae272b9b33d4027d6923f Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 20:08:50 +0300 -Subject: [PATCH 18/50] drv:usb:gadget:composite rename gadget serial console +Subject: [PATCH 064/169] drv:usb:gadget:composite rename gadget serial console manufacturer rename the manufacturer of gadgets for serial consoles @@ -11,10 +11,10 @@ to the Armbian brand. 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/gadget/composite.c b/drivers/usb/gadget/composite.c -index 3789c3291..dc4f1d9de 100644 +index 2eaeaae96..91d0084d6 100644 --- a/drivers/usb/gadget/composite.c +++ b/drivers/usb/gadget/composite.c -@@ -2544,7 +2544,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue); +@@ -2562,7 +2562,7 @@ EXPORT_SYMBOL_GPL(usb_composite_setup_continue); static char *composite_default_mfr(struct usb_gadget *gadget) { @@ -24,5 +24,5 @@ index 3789c3291..dc4f1d9de 100644 } -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch similarity index 78% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch index 37dc21013..986227ca3 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch @@ -1,7 +1,7 @@ -From 491fd5378aa64b111306fadad61169cb87e0533f Mon Sep 17 00:00:00 2001 +From 6d397ec8dd850b1843642cd73b3f5e0eeb610e7c Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Tue, 19 Jun 2018 13:51:17 +0800 -Subject: [PATCH 062/101] include:uapi:drm_fourcc: add ARM tiled format +Subject: [PATCH 041/169] include:uapi:drm_fourcc: add ARM tiled format modifier Signed-off-by: Qiang Yu @@ -12,10 +12,10 @@ Signed-off-by: The-going <48602507+The-going@users.noreply.github.com> 1 file changed, 9 insertions(+) diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h -index 9f4bb4a6f..57b8acd1f 100644 +index fc0c1454d..0d67aad29 100644 --- a/include/uapi/drm/drm_fourcc.h +++ b/include/uapi/drm/drm_fourcc.h -@@ -1120,6 +1120,15 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) +@@ -1143,6 +1143,15 @@ drm_fourcc_canonicalize_nvidia_format_mod(__u64 modifier) */ #define AFRC_FORMAT_MOD_LAYOUT_SCAN (1ULL << 8) @@ -32,5 +32,5 @@ index 9f4bb4a6f..57b8acd1f 100644 * Arm 16x16 Block U-Interleaved modifier * -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0012-fix-h6-emmc.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch similarity index 91% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0012-fix-h6-emmc.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch index 348921b00..f6b204463 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0012-fix-h6-emmc.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch @@ -1,7 +1,7 @@ -From 9010972a9691d468eb68ab85c73c80bb572a5334 Mon Sep 17 00:00:00 2001 +From c3432f75c0c95da1dda465b86143eaf29e4093f2 Mon Sep 17 00:00:00 2001 From: Ukhellfire Date: Thu, 24 Mar 2022 22:21:00 +0000 -Subject: [PATCH] Fix H6 emmc +Subject: [PATCH 166/169] mmc/host/sunxi-mmc: Fix H6 emmc We have the wrong MMC CAP voltage for the emmc on this board --- @@ -9,7 +9,7 @@ We have the wrong MMC CAP voltage for the emmc on this board 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c -index dd1c2a610..9a641c7d2 100644 +index a1eebc1dc..d5f98e738 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c @@ -1233,6 +1233,7 @@ static const struct of_device_id sunxi_mmc_of_match[] = { @@ -38,3 +38,6 @@ index dd1c2a610..9a641c7d2 100644 !of_machine_is_compatible("allwinner,sun7i-a20") && !of_machine_is_compatible("olimex,a64-olinuxino-2ge8g")) mmc->caps |= MMC_CAP_1_8V_DDR | MMC_CAP_3_3V_DDR; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0005-net-phy-support-yt8531c.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/net-phy-Support-yt8531c.patch similarity index 99% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0005-net-phy-support-yt8531c.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/net-phy-Support-yt8531c.patch index 6855f0017..afa2b1673 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0005-net-phy-support-yt8531c.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/net-phy-Support-yt8531c.patch @@ -1,7 +1,7 @@ -From 94e0c0bf6941bb9b34859a3548df2d054041fc0b Mon Sep 17 00:00:00 2001 +From f53b5666adcffaabfd26440aaa601750827a664d Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 20:20:34 +0000 -Subject: [PATCH 05/11] net: phy: Support yt8531c +Subject: [PATCH 161/169] net: phy: Support yt8531c --- .../net/ethernet/stmicro/stmmac/stmmac_main.c | 60 + @@ -13,10 +13,10 @@ Subject: [PATCH 05/11] net: phy: Support yt8531c create mode 100644 include/linux/motorcomm_phy.h diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 9376c4e28..9e72e480c 100644 +index 2525a8035..0ef9b7ce5 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -141,6 +141,9 @@ static void stmmac_exit_fs(struct net_device *dev); +@@ -143,6 +143,9 @@ static void stmmac_exit_fs(struct net_device *dev); #define STMMAC_COAL_TIMER(x) (ns_to_ktime((x) * NSEC_PER_USEC)) @@ -26,7 +26,7 @@ index 9376c4e28..9e72e480c 100644 int stmmac_bus_clks_config(struct stmmac_priv *priv, bool enabled) { int ret = 0; -@@ -6959,6 +6962,54 @@ void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable) +@@ -6899,6 +6902,54 @@ void stmmac_fpe_handshake(struct stmmac_priv *priv, bool enable) } } @@ -81,7 +81,7 @@ index 9376c4e28..9e72e480c 100644 /** * stmmac_dvr_probe * @device: device pointer -@@ -7217,6 +7268,15 @@ int stmmac_dvr_probe(struct device *device, +@@ -7158,6 +7209,15 @@ int stmmac_dvr_probe(struct device *device, goto error_phy_setup; } @@ -2344,5 +2344,5 @@ index 000000000..9e01fc205 + + -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch similarity index 88% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch index 4fc50184b..c1c6d091c 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch @@ -1,14 +1,15 @@ -From caaa7def76801cbe9937602603f6b471f776e6f6 Mon Sep 17 00:00:00 2001 +From 623c9bcd837c8b0747af598700d7f3ca006d7591 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sat, 16 Apr 2022 11:19:05 +0300 -Subject: [PATCH] nvmem: sunxi_sid: add sunxi_get_soc_chipid, sunxi_get_serial +Subject: [PATCH 164/169] nvmem: sunxi_sid: add sunxi_get_soc_chipid, + sunxi_get_serial --- drivers/nvmem/sunxi_sid.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/drivers/nvmem/sunxi_sid.c b/drivers/nvmem/sunxi_sid.c -index 37a6abb0e..c81fac63d 100644 +index 97f556838..6ec59ba4d 100644 --- a/drivers/nvmem/sunxi_sid.c +++ b/drivers/nvmem/sunxi_sid.c @@ -37,6 +37,25 @@ struct sunxi_sid { @@ -54,6 +55,5 @@ index 37a6abb0e..c81fac63d 100644 } -- -2.34.1 - +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-add-overlay-compilation-support.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-add-overlay-compilation-support.patch index e3f1c89f4..7ab7ed850 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-add-overlay-compilation-support.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-add-overlay-compilation-support.patch @@ -1,13 +1,13 @@ -From 90b784f6ca0a33f4988ed5beee4135c6acaaf8fa Mon Sep 17 00:00:00 2001 +From 1f143920a2c3971a99c59bfa52cd9a3b46019189 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 1 Feb 2022 21:04:08 +0300 -Subject: [PATCH 21/50] scripts: add overlay compilation support +Subject: [PATCH 120/169] scripts: add overlay compilation support --- arch/arm/boot/.gitignore | 2 ++ scripts/Makefile.dtbinst | 39 ++++++++++++++++++++++++++------------- - scripts/Makefile.lib | 20 ++++++++++++++++++++ - 3 files changed, 48 insertions(+), 13 deletions(-) + scripts/Makefile.lib | 21 +++++++++++++++++++-- + 3 files changed, 47 insertions(+), 15 deletions(-) diff --git a/arch/arm/boot/.gitignore b/arch/arm/boot/.gitignore index 8c759326b..e6ce8f6ad 100644 @@ -78,7 +78,7 @@ index 190d781e8..d7d937903 100644 .PHONY: $(PHONY) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 54582673f..813735ca8 100644 +index 9f69ecdd7..089429106 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -292,6 +292,9 @@ quiet_cmd_gzip = GZIP $@ @@ -117,5 +117,5 @@ index 54582673f..813735ca8 100644 dtc-tmp = $(subst $(comma),_,$(dot-target).dts.tmp) -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-enable-kernel-dtbs-symbol-generation.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-enable-kernel-dtbs-symbol-generation.patch index 594de81bd..311a0de35 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-enable-kernel-dtbs-symbol-generation.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/scripts-enable-kernel-dtbs-symbol-generation.patch @@ -1,17 +1,17 @@ -From 5b7add545d77ccf1c6ffc9e0558bc2da432f0c32 Mon Sep 17 00:00:00 2001 +From ff190bb9816df2cf3807a2e7f51c4427400d41de Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Tue, 1 Feb 2022 21:51:46 +0300 -Subject: [PATCH 22/50] scripts: enable kernel dtbs symbol generation +Subject: [PATCH 121/169] scripts: enable kernel dtbs symbol generation --- scripts/Makefile.lib | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib -index 813735ca8..c62473b2c 100644 +index 089429106..66c1c74fd 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib -@@ -327,7 +327,8 @@ DTC_FLAGS += -Wnode_name_chars_strict \ +@@ -311,7 +311,8 @@ DTC_FLAGS += -Wnode_name_chars_strict \ -Winterrupt_provider endif @@ -22,5 +22,5 @@ index 813735ca8..c62473b2c 100644 # Set -@ if the target is a base DTB that overlay is applied onto DTC_FLAGS += $(if $(filter $(patsubst $(obj)/%,%,$@), $(base-dtb-y)), -@) -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch index f89f54c22..2cfaf5b02 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-codec-adcis-select-capture-source.patch @@ -1,14 +1,15 @@ -From 90852897b5924130a529f26da620a17ae611e1fe Mon Sep 17 00:00:00 2001 +From bea4968998b4ad926d82efa744921ebeafef7bf4 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Wed, 2 Feb 2022 21:42:37 +0300 -Subject: [PATCH 20/50] sound:soc:sunxi:sun4i-codec adcis select capture source +Subject: [PATCH 048/169] sound:soc:sunxi:sun4i-codec adcis select capture + source --- sound/soc/sunxi/sun4i-codec.c | 51 ++++++++++++++++++++++++++++++++--- 1 file changed, 47 insertions(+), 4 deletions(-) diff --git a/sound/soc/sunxi/sun4i-codec.c b/sound/soc/sunxi/sun4i-codec.c -index 9e41edbb7..f7de88f93 100644 +index 01b461c64..71c586597 100644 --- a/sound/soc/sunxi/sun4i-codec.c +++ b/sound/soc/sunxi/sun4i-codec.c @@ -5,6 +5,7 @@ @@ -116,5 +117,5 @@ index 9e41edbb7..f7de88f93 100644 { "Mic2", NULL, "VMIC" }, }; -- -2.34.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch index 3dfaf88f6..8e0d8d9ab 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch @@ -1,17 +1,17 @@ -From a37c789d400d4342376bc290bbf3f1ec4033389b Mon Sep 17 00:00:00 2001 +From 06f1521d17f38a8ca301b5526f17ed9dcdba9817 Mon Sep 17 00:00:00 2001 From: The-going <48602507+The-going@users.noreply.github.com> Date: Sun, 23 Jan 2022 22:22:39 +0300 -Subject: [PATCH 069/101] sound:soc:sunxi:sun4i-spdif add mclk_multiplier +Subject: [PATCH 045/169] sound:soc:sunxi:sun4i-spdif add mclk_multiplier --- sound/soc/sunxi/sun4i-spdif.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/sound/soc/sunxi/sun4i-spdif.c b/sound/soc/sunxi/sun4i-spdif.c -index a10949bf0..5aff40df2 100644 +index 17090f431..e7a877701 100644 --- a/sound/soc/sunxi/sun4i-spdif.c +++ b/sound/soc/sunxi/sun4i-spdif.c -@@ -175,6 +175,7 @@ struct sun4i_spdif_quirks { +@@ -177,6 +177,7 @@ struct sun4i_spdif_quirks { unsigned int reg_dac_txdata; bool has_reset; unsigned int val_fctl_ftx; @@ -19,7 +19,7 @@ index a10949bf0..5aff40df2 100644 }; struct sun4i_spdif_dev { -@@ -311,6 +312,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, +@@ -314,6 +315,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } @@ -27,7 +27,7 @@ index a10949bf0..5aff40df2 100644 ret = clk_set_rate(host->spdif_clk, mclk); if (ret < 0) { -@@ -345,6 +347,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, +@@ -348,6 +350,7 @@ static int sun4i_spdif_hw_params(struct snd_pcm_substream *substream, default: return -EINVAL; } @@ -35,7 +35,7 @@ index a10949bf0..5aff40df2 100644 reg_val = 0; reg_val |= SUN4I_SPDIF_TXCFG_ASS; -@@ -427,24 +430,28 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { +@@ -541,24 +544,28 @@ static struct snd_soc_dai_driver sun4i_spdif_dai = { static const struct sun4i_spdif_quirks sun4i_a10_spdif_quirks = { .reg_dac_txdata = SUN4I_SPDIF_TXFIFO, .val_fctl_ftx = SUN4I_SPDIF_FCTL_FTX, @@ -65,5 +65,5 @@ index a10949bf0..5aff40df2 100644 static const struct of_device_id sun4i_spdif_of_match[] = { -- -2.31.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.armbian/0007-wireless-add-uwe5622-driver.patch b/patch/kernel/archive/sunxi-5.18/patches.armbian/wireless-Add-uwe5622-driver.patch similarity index 99% rename from patch/kernel/archive/sunxi-5.18/patches.armbian/0007-wireless-add-uwe5622-driver.patch rename to patch/kernel/archive/sunxi-5.18/patches.armbian/wireless-Add-uwe5622-driver.patch index b238aea96..d7fdce3bb 100644 --- a/patch/kernel/archive/sunxi-5.18/patches.armbian/0007-wireless-add-uwe5622-driver.patch +++ b/patch/kernel/archive/sunxi-5.18/patches.armbian/wireless-Add-uwe5622-driver.patch @@ -1,7 +1,7 @@ -From f4798e623c5df51add6d29a333b7253acb6fa4d8 Mon Sep 17 00:00:00 2001 +From dba214b9ad06d012550a13c77363276afd59f5e4 Mon Sep 17 00:00:00 2001 From: afaulkner420 Date: Fri, 25 Mar 2022 20:29:16 +0000 -Subject: [PATCH 07/11] wireless: Add uwe5622 driver +Subject: [PATCH 162/169] wireless: Add uwe5622 driver --- drivers/net/wireless/Kconfig | 1 + @@ -960,7 +960,7 @@ index 000000000..f97b8365a +#endif diff --git a/drivers/net/wireless/uwe5622/tty-sdio/lpm.c b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c new file mode 100644 -index 000000000..b2d9a8994 +index 000000000..35e30651a --- /dev/null +++ b/drivers/net/wireless/uwe5622/tty-sdio/lpm.c @@ -0,0 +1,143 @@ @@ -5529,7 +5529,7 @@ index 000000000..638accb95 +#endif diff --git a/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c new file mode 100644 -index 000000000..3ee6910e7 +index 000000000..29a3ec298 --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c @@ -0,0 +1,852 @@ @@ -160416,7 +160416,7 @@ index 000000000..210a2ff96 +#endif diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c new file mode 100644 -index 000000000..2edb7903d +index 000000000..9e453365b --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c @@ -0,0 +1,1256 @@ @@ -171949,7 +171949,7 @@ index 000000000..793d627d0 +#endif diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c new file mode 100644 -index 000000000..f399ead5b +index 000000000..0c2664d87 --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c @@ -0,0 +1,346 @@ @@ -175326,7 +175326,7 @@ index 000000000..035635000 +} diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c new file mode 100644 -index 000000000..c2cccc658 +index 000000000..e7a9f2589 --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c @@ -0,0 +1,1447 @@ @@ -211812,5 +211812,5 @@ index 000000000..4e745903e + +#endif -- -2.25.1 +2.35.3 diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch new file mode 100644 index 000000000..ae478d2a9 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch @@ -0,0 +1,58 @@ +From fdb9af13ce94129dc9f35a147582966b2b43978a Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 15:57:10 +0200 +Subject: [PATCH 543/548] Revert "phy: rockchip-typec: Make sure the plug + orientation is respected" + +This reverts commit 3562f86d276ad905f3b095a65685f0ed0ca26c0d. +--- + drivers/phy/rockchip/phy-rockchip-typec.c | 5 ----- + 1 file changed, 5 deletions(-) + +diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c +index fa10ee9a5794..d2bbdc96a167 100644 +--- a/drivers/phy/rockchip/phy-rockchip-typec.c ++++ b/drivers/phy/rockchip/phy-rockchip-typec.c +@@ -350,7 +350,6 @@ struct usb3phy_reg { + * struct rockchip_usb3phy_port_cfg - usb3-phy port configuration. + * @reg: the base address for usb3-phy config. + * @typec_conn_dir: the register of type-c connector direction. +- * @typec_conn_dir_sel: the register of type-c connector direction source. + * @usb3tousb2_en: the register of type-c force usb2 to usb2 enable. + * @external_psm: the register of type-c phy external psm clock. + * @pipe_status: the register of type-c phy pipe status. +@@ -361,7 +360,6 @@ struct usb3phy_reg { + struct rockchip_usb3phy_port_cfg { + unsigned int reg; + struct usb3phy_reg typec_conn_dir; +- struct usb3phy_reg typec_conn_dir_sel; + struct usb3phy_reg usb3tousb2_en; + struct usb3phy_reg external_psm; + struct usb3phy_reg pipe_status; +@@ -436,7 +434,6 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = { + { + .reg = 0xff7c0000, + .typec_conn_dir = { 0xe580, 0, 16 }, +- .typec_conn_dir_sel = { 0xe580, 8, 16+8 }, + .usb3tousb2_en = { 0xe580, 3, 19 }, + .external_psm = { 0xe588, 14, 30 }, + .pipe_status = { 0xe5c0, 0, 0 }, +@@ -447,7 +444,6 @@ static const struct rockchip_usb3phy_port_cfg rk3399_usb3phy_port_cfgs[] = { + { + .reg = 0xff800000, + .typec_conn_dir = { 0xe58c, 0, 16 }, +- .typec_conn_dir_sel = { 0xe58c, 8, 16+8 }, + .usb3tousb2_en = { 0xe58c, 3, 19 }, + .external_psm = { 0xe594, 14, 30 }, + .pipe_status = { 0xe5c0, 16, 16 }, +@@ -743,7 +739,6 @@ static int tcphy_phy_init(struct rockchip_typec_phy *tcphy, u8 mode) + + reset_control_deassert(tcphy->tcphy_rst); + +- property_enable(tcphy, &cfg->typec_conn_dir_sel, 0); + property_enable(tcphy, &cfg->typec_conn_dir, tcphy->flip); + tcphy_dp_aux_set_flip(tcphy); + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch new file mode 100644 index 000000000..ec10e41c4 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch @@ -0,0 +1,28 @@ +From d9bdd3a2f4c2ab023c18a48b84ef95398326ec43 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 18:45:02 +0200 +Subject: [PATCH 547/548] arm64: dts: rockchip: rk3399-pinebook-pro: Support + both Type-C plug orientations + +This fixes USB 3.0 and Alt-DP modes in reverse plug orientation. + +Signed-off-by: Ondrej Jirman +--- + arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +index 03c53510cf6e..9bacd625f496 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts +@@ -1128,6 +1128,7 @@ &usbdrd3_0 { + &usbdrd_dwc3_0 { + dr_mode = "otg"; + extcon = <&typec_extcon_bridge>; ++ snps,usb3-phy-reset-quirk; + status = "okay"; + }; + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch new file mode 100644 index 000000000..de4d287ec --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch @@ -0,0 +1,122 @@ +From c16ca49484a15beceaf10436d5d216f73aa8dc6f Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Tue, 21 Jun 2022 23:04:52 +0200 +Subject: [PATCH 540/548] arm64: dts: rockchip: rk3399-pinephone-pro: Cleanup + regulator sleep states + +Forcing SD card I/O voltage to 3.3V in suspend is probably not a great +idea. A lot of properties were superfluous, etc. + +Signed-off-by: Ondrej Jirman +--- + .../dts/rockchip/rk3399-pinephone-pro.dts | 24 ++----------------- + 1 file changed, 2 insertions(+), 22 deletions(-) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +index 182e042a15ba..6c5ce176bcf3 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +@@ -410,10 +410,6 @@ vcc5v0_typec: vcc5v0-typec-regulator { + regulator-max-microvolt = <5000000>; + regulator-name = "vcc5v0_typec"; + vin-supply = <&boost_otg>; +- +- regulator-state-mem { +- regulator-on-in-suspend; +- }; + }; + + /* Main 3.3v supply */ +@@ -425,10 +421,6 @@ vcc3v3_sys: wifi_bat: vcc3v3-sys { + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + vin-supply = <&vcc_sysin>; +- +- regulator-state-mem { +- regulator-on-in-suspend; +- }; + }; + + vcc_4g_5v: vcc-4g-5v { +@@ -649,7 +641,6 @@ vcc_1v8: vcc_wl: DCDC_REG4 { + regulator-max-microvolt = <1800000>; + regulator-state-mem { + regulator-on-in-suspend; +- regulator-suspend-microvolt = <1800000>; + }; + }; + +@@ -660,7 +651,7 @@ vcca3v0_codec: LDO_REG1 { + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3000000>; + regulator-state-mem { +- regulator-off-in-suspend; ++ regulator-on-in-suspend; + }; + }; + +@@ -682,7 +673,7 @@ vcca1v8_codec: LDO_REG3 { + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-state-mem { +- regulator-off-in-suspend; ++ regulator-on-in-suspend; + }; + }; + +@@ -694,7 +685,6 @@ vcc_power_on: LDO_REG4 { + regulator-max-microvolt = <3300000>; + regulator-state-mem { + regulator-on-in-suspend; +- regulator-suspend-microvolt = <3300000>; + }; + }; + +@@ -706,7 +696,6 @@ vcc_3v0: LDO_REG5 { + regulator-max-microvolt = <3000000>; + regulator-state-mem { + regulator-on-in-suspend; +- regulator-suspend-microvolt = <3000000>; + }; + }; + +@@ -718,7 +707,6 @@ vcc_1v5: LDO_REG6 { + regulator-max-microvolt = <1500000>; + regulator-state-mem { + regulator-on-in-suspend; +- regulator-suspend-microvolt = <1500000>; + }; + }; + +@@ -726,9 +714,6 @@ vcc1v8_dvp: LDO_REG7 { + regulator-name = "vcc1v8_dvp"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; +- regulator-state-mem { +- regulator-off-in-suspend; +- }; + }; + + vcc3v3_s3: LDO_REG8 { +@@ -746,10 +731,6 @@ vccio_sd: LDO_REG9 { + regulator-name = "vccio_sd"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <3300000>; +- regulator-state-mem { +- regulator-on-in-suspend; +- regulator-suspend-microvolt = <3300000>; +- }; + }; + + vcc3v3_s0: SWITCH_REG { +@@ -769,7 +750,6 @@ boost_otg: DCDC_BOOST { + regulator-max-microvolt = <5000000>; + regulator-state-mem { + regulator-on-in-suspend; +- regulator-suspend-microvolt = <5000000>; + }; + }; + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch new file mode 100644 index 000000000..aad1d5102 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch @@ -0,0 +1,28 @@ +From 13dcfc7cc0b10ed0b6b77d9be55481f491fc4c10 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 18:45:09 +0200 +Subject: [PATCH 548/548] arm64: dts: rockchip: rk3399-pinephone-pro: Support + both Type-C plug orientations + +This fixes USB 3.0 and Alt-DP modes in reverse plug orientation. + +Signed-off-by: Ondrej Jirman +--- + arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +index 6c5ce176bcf3..615995f28eb5 100644 +--- a/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts ++++ b/arch/arm64/boot/dts/rockchip/rk3399-pinephone-pro.dts +@@ -1556,6 +1556,7 @@ &usbdrd3_0 { + &usbdrd_dwc3_0 { + dr_mode = "otg"; + extcon = <&typec_extcon_bridge>; ++ snps,usb3-phy-reset-quirk; + status = "okay"; + }; + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/media-imx258-Fix-4208x3120-mode.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/media-imx258-Fix-4208x3120-mode.patch new file mode 100644 index 000000000..32d976816 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/media-imx258-Fix-4208x3120-mode.patch @@ -0,0 +1,58 @@ +From 308f2355e3be68f9f5484d9308d7078835d5c00d Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 02:32:19 +0200 +Subject: [PATCH 542/548] media: imx258: Fix 4208x3120 mode + +Parameters were a bit weird. Real resolution is 4208x3120. + +Signed-off-by: Ondrej Jirman +--- + drivers/media/i2c/imx258.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/drivers/media/i2c/imx258.c b/drivers/media/i2c/imx258.c +index bcfa7f4e69e7..7d04b65d1e09 100644 +--- a/drivers/media/i2c/imx258.c ++++ b/drivers/media/i2c/imx258.c +@@ -442,11 +442,11 @@ static const struct imx258_reg common_regs[] = { + REG8(HDR_MODE, 0x00), + }; + +-static const struct imx258_reg mode_4208x3118_regs[] = { ++static const struct imx258_reg mode_4208x3120_regs[] = { + REG16(CSI_DT_FMT, 0x0a0a), + REG8(CSI_LANE_MODE, 0x03), + REG16(LINE_LENGTH_PCK, 5352), +- REG16(FRM_LENGTH_LINES, 3152), ++ REG16(FRM_LENGTH_LINES, 3224), + REG16(X_ADD_STA, 0), + REG16(Y_ADD_STA, 0), + REG16(X_ADD_END, 4207), +@@ -469,7 +469,7 @@ static const struct imx258_reg mode_4208x3118_regs[] = { + REG16(X_OUT_SIZE, 4208), + REG16(Y_OUT_SIZE, 3120), + REG8(FRM_LENGTH_CTL, 0x01), +- REG16(COARSE_INTEG_TIME, 3142), ++ REG16(COARSE_INTEG_TIME, 3184), + }; + + static const struct imx258_reg mode_4032x3024_regs[] = { +@@ -632,12 +632,12 @@ static const struct imx258_link_freq_config link_freq_configs[] = { + static const struct imx258_mode supported_modes[] = { + { + .width = 4208, +- .height = 3118, ++ .height = 3120, + .vts_def = IMX258_VTS_30FPS, + .vts_min = IMX258_VTS_30FPS, + .reg_list = { +- .num_of_regs = ARRAY_SIZE(mode_4208x3118_regs), +- .regs = mode_4208x3118_regs, ++ .num_of_regs = ARRAY_SIZE(mode_4208x3120_regs), ++ .regs = mode_4208x3120_regs, + }, + .link_freq_index = IMX258_LINK_FREQ_1224MBPS, + }, +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/media-rkisp1-Allow-higher-input-resolution.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/media-rkisp1-Allow-higher-input-resolution.patch new file mode 100644 index 000000000..c8c00a415 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/media-rkisp1-Allow-higher-input-resolution.patch @@ -0,0 +1,30 @@ +From b0181de96414a0176e9d577fc04d5133a8208221 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Sun, 26 Jun 2022 13:10:39 +0200 +Subject: [PATCH 541/548] media: rkisp1: Allow higher input resolution + +Try if this can work. In BSP driver, it is allowed. + +Signed-off-by: Ondrej Jirman +--- + drivers/media/platform/rockchip/rkisp1/rkisp1-common.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +index d8fa3f1a5a85..6274c51219cf 100644 +--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h ++++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-common.h +@@ -31,8 +31,8 @@ + #define RKISP1_ISP_SD_SINK BIT(1) + + /* min and max values for the widths and heights of the entities */ +-#define RKISP1_ISP_MAX_WIDTH 4032 +-#define RKISP1_ISP_MAX_HEIGHT 3024 ++#define RKISP1_ISP_MAX_WIDTH 4416 ++#define RKISP1_ISP_MAX_HEIGHT 3312 + #define RKISP1_ISP_MIN_WIDTH 32 + #define RKISP1_ISP_MIN_HEIGHT 32 + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch new file mode 100644 index 000000000..dca8ecf3d --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch @@ -0,0 +1,299 @@ +From ba2de170b82f4fd1c3fd6672334c587bceaa6b37 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Tue, 21 Jun 2022 18:18:21 +0200 +Subject: [PATCH 539/548] spi: rockchip: Fix runtime PM and other issues + +The driver didn't bother with proper error handling, or clock resource +management, leaing to warnings during suspend/resume. + +Signed-off-by: Ondrej Jirman +--- + drivers/spi/spi-rockchip.c | 155 ++++++++++++++++++------------------- + 1 file changed, 75 insertions(+), 80 deletions(-) + +diff --git a/drivers/spi/spi-rockchip.c b/drivers/spi/spi-rockchip.c +index a08215eb9e14..dbb5951ab734 100644 +--- a/drivers/spi/spi-rockchip.c ++++ b/drivers/spi/spi-rockchip.c +@@ -199,6 +199,8 @@ struct rockchip_spi { + bool cs_high_supported; /* native CS supports active-high polarity */ + + struct spi_transfer *xfer; /* Store xfer temporarily */ ++ ++ bool clk_enabled; + }; + + static inline void spi_enable_chip(struct rockchip_spi *rs, bool enable) +@@ -744,6 +746,35 @@ static int rockchip_spi_setup(struct spi_device *spi) + return 0; + } + ++static int rockchip_spi_enable_clocks(struct rockchip_spi *rs, bool en) ++{ ++ int ret; ++ ++ if (!!en == rs->clk_enabled) ++ return 0; ++ ++ if (en) { ++ ret = clk_prepare_enable(rs->apb_pclk); ++ if (ret < 0) { ++ dev_err(rs->dev, "Failed to enable apb_pclk\n"); ++ return ret; ++ } ++ ++ ret = clk_prepare_enable(rs->spiclk); ++ if (ret < 0) { ++ dev_err(rs->dev, "Failed to enable spiclk\n"); ++ clk_disable_unprepare(rs->apb_pclk); ++ return ret; ++ } ++ } else { ++ clk_disable_unprepare(rs->spiclk); ++ clk_disable_unprepare(rs->apb_pclk); ++ } ++ ++ rs->clk_enabled = en; ++ return 0; ++} ++ + static int rockchip_spi_probe(struct platform_device *pdev) + { + int ret; +@@ -757,10 +788,10 @@ static int rockchip_spi_probe(struct platform_device *pdev) + slave_mode = of_property_read_bool(np, "spi-slave"); + + if (slave_mode) +- ctlr = spi_alloc_slave(&pdev->dev, ++ ctlr = devm_spi_alloc_slave(&pdev->dev, + sizeof(struct rockchip_spi)); + else +- ctlr = spi_alloc_master(&pdev->dev, ++ ctlr = devm_spi_alloc_master(&pdev->dev, + sizeof(struct rockchip_spi)); + + if (!ctlr) +@@ -774,47 +805,33 @@ static int rockchip_spi_probe(struct platform_device *pdev) + /* Get basic io resource and map it */ + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); + rs->regs = devm_ioremap_resource(&pdev->dev, mem); +- if (IS_ERR(rs->regs)) { +- ret = PTR_ERR(rs->regs); +- goto err_put_ctlr; +- } ++ if (IS_ERR(rs->regs)) ++ return PTR_ERR(rs->regs); + + rs->apb_pclk = devm_clk_get(&pdev->dev, "apb_pclk"); +- if (IS_ERR(rs->apb_pclk)) { +- dev_err(&pdev->dev, "Failed to get apb_pclk\n"); +- ret = PTR_ERR(rs->apb_pclk); +- goto err_put_ctlr; +- } ++ if (IS_ERR(rs->apb_pclk)) ++ return dev_err_probe(&pdev->dev, PTR_ERR(rs->apb_pclk), ++ "Failed to get apb_pclk\n"); + + rs->spiclk = devm_clk_get(&pdev->dev, "spiclk"); +- if (IS_ERR(rs->spiclk)) { +- dev_err(&pdev->dev, "Failed to get spi_pclk\n"); +- ret = PTR_ERR(rs->spiclk); +- goto err_put_ctlr; +- } +- +- ret = clk_prepare_enable(rs->apb_pclk); +- if (ret < 0) { +- dev_err(&pdev->dev, "Failed to enable apb_pclk\n"); +- goto err_put_ctlr; +- } ++ if (IS_ERR(rs->spiclk)) ++ return dev_err_probe(&pdev->dev, PTR_ERR(rs->spiclk), ++ "Failed to get spi_pclk\n"); + +- ret = clk_prepare_enable(rs->spiclk); +- if (ret < 0) { +- dev_err(&pdev->dev, "Failed to enable spi_clk\n"); +- goto err_disable_apbclk; +- } ++ ret = rockchip_spi_enable_clocks(rs, true); ++ if (ret < 0) ++ return ret; + + spi_enable_chip(rs, false); + + ret = platform_get_irq(pdev, 0); + if (ret < 0) +- goto err_disable_spiclk; ++ goto err_disable_clks; + + ret = devm_request_threaded_irq(&pdev->dev, ret, rockchip_spi_isr, NULL, + IRQF_ONESHOT, dev_name(&pdev->dev), ctlr); + if (ret) +- goto err_disable_spiclk; ++ goto err_disable_clks; + + rs->dev = &pdev->dev; + rs->freq = clk_get_rate(rs->spiclk); +@@ -840,14 +857,9 @@ static int rockchip_spi_probe(struct platform_device *pdev) + if (!rs->fifo_len) { + dev_err(&pdev->dev, "Failed to get fifo length\n"); + ret = -EINVAL; +- goto err_disable_spiclk; ++ goto err_disable_clks; + } + +- pm_runtime_set_autosuspend_delay(&pdev->dev, ROCKCHIP_AUTOSUSPEND_TIMEOUT); +- pm_runtime_use_autosuspend(&pdev->dev); +- pm_runtime_set_active(&pdev->dev); +- pm_runtime_enable(&pdev->dev); +- + ctlr->auto_runtime_pm = true; + ctlr->bus_num = pdev->id; + ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_LOOP | SPI_LSB_FIRST; +@@ -882,7 +894,7 @@ static int rockchip_spi_probe(struct platform_device *pdev) + /* Check tx to see if we need defer probing driver */ + if (PTR_ERR(ctlr->dma_tx) == -EPROBE_DEFER) { + ret = -EPROBE_DEFER; +- goto err_disable_pm_runtime; ++ goto err_disable_clks; + } + dev_warn(rs->dev, "Failed to request TX DMA channel\n"); + ctlr->dma_tx = NULL; +@@ -918,28 +930,29 @@ static int rockchip_spi_probe(struct platform_device *pdev) + break; + } + ++ pm_runtime_set_autosuspend_delay(&pdev->dev, ROCKCHIP_AUTOSUSPEND_TIMEOUT); ++ pm_runtime_use_autosuspend(&pdev->dev); ++ pm_runtime_set_active(&pdev->dev); ++ pm_runtime_enable(&pdev->dev); ++ + ret = devm_spi_register_controller(&pdev->dev, ctlr); + if (ret < 0) { + dev_err(&pdev->dev, "Failed to register controller\n"); +- goto err_free_dma_rx; ++ goto err_pm_disable; + } + + return 0; + +-err_free_dma_rx: ++err_pm_disable: ++ pm_runtime_dont_use_autosuspend(&pdev->dev); ++ pm_runtime_disable(&pdev->dev); + if (ctlr->dma_rx) + dma_release_channel(ctlr->dma_rx); + err_free_dma_tx: + if (ctlr->dma_tx) + dma_release_channel(ctlr->dma_tx); +-err_disable_pm_runtime: +- pm_runtime_disable(&pdev->dev); +-err_disable_spiclk: +- clk_disable_unprepare(rs->spiclk); +-err_disable_apbclk: +- clk_disable_unprepare(rs->apb_pclk); +-err_put_ctlr: +- spi_controller_put(ctlr); ++err_disable_clks: ++ rockchip_spi_enable_clocks(rs, false); + + return ret; + } +@@ -949,21 +962,15 @@ static int rockchip_spi_remove(struct platform_device *pdev) + struct spi_controller *ctlr = spi_controller_get(platform_get_drvdata(pdev)); + struct rockchip_spi *rs = spi_controller_get_devdata(ctlr); + +- pm_runtime_get_sync(&pdev->dev); +- +- clk_disable_unprepare(rs->spiclk); +- clk_disable_unprepare(rs->apb_pclk); +- +- pm_runtime_put_noidle(&pdev->dev); +- pm_runtime_disable(&pdev->dev); +- pm_runtime_set_suspended(&pdev->dev); +- + if (ctlr->dma_tx) + dma_release_channel(ctlr->dma_tx); + if (ctlr->dma_rx) + dma_release_channel(ctlr->dma_rx); + +- spi_controller_put(ctlr); ++ pm_runtime_dont_use_autosuspend(&pdev->dev); ++ pm_runtime_disable(&pdev->dev); ++ ++ rockchip_spi_enable_clocks(rs, false); + + return 0; + } +@@ -979,8 +986,8 @@ static int rockchip_spi_suspend(struct device *dev) + if (ret < 0) + return ret; + +- clk_disable_unprepare(rs->spiclk); +- clk_disable_unprepare(rs->apb_pclk); ++ pm_runtime_disable(dev); ++ rockchip_spi_enable_clocks(rs, false); + + pinctrl_pm_select_sleep_state(dev); + +@@ -995,19 +1002,17 @@ static int rockchip_spi_resume(struct device *dev) + + pinctrl_pm_select_default_state(dev); + +- ret = clk_prepare_enable(rs->apb_pclk); +- if (ret < 0) +- return ret; ++ if (!pm_runtime_status_suspended(dev)) { ++ ret = rockchip_spi_enable_clocks(rs, true); ++ if (ret < 0) ++ return ret; ++ } + +- ret = clk_prepare_enable(rs->spiclk); +- if (ret < 0) +- clk_disable_unprepare(rs->apb_pclk); ++ pm_runtime_enable(dev); + + ret = spi_controller_resume(ctlr); +- if (ret < 0) { +- clk_disable_unprepare(rs->spiclk); +- clk_disable_unprepare(rs->apb_pclk); +- } ++ if (ret < 0) ++ return ret; + + return 0; + } +@@ -1019,27 +1024,17 @@ static int rockchip_spi_runtime_suspend(struct device *dev) + struct spi_controller *ctlr = dev_get_drvdata(dev); + struct rockchip_spi *rs = spi_controller_get_devdata(ctlr); + +- clk_disable_unprepare(rs->spiclk); +- clk_disable_unprepare(rs->apb_pclk); ++ rockchip_spi_enable_clocks(rs, false); + + return 0; + } + + static int rockchip_spi_runtime_resume(struct device *dev) + { +- int ret; + struct spi_controller *ctlr = dev_get_drvdata(dev); + struct rockchip_spi *rs = spi_controller_get_devdata(ctlr); + +- ret = clk_prepare_enable(rs->apb_pclk); +- if (ret < 0) +- return ret; +- +- ret = clk_prepare_enable(rs->spiclk); +- if (ret < 0) +- clk_disable_unprepare(rs->apb_pclk); +- +- return 0; ++ return rockchip_spi_enable_clocks(rs, true); + } + #endif /* CONFIG_PM */ + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch new file mode 100644 index 000000000..a8d8a0b06 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch @@ -0,0 +1,264 @@ +From 24e5d76d022f287700590d04b9bef73681eaad5c Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 18:43:47 +0200 +Subject: [PATCH 546/548] usb: dwc3: Add support for snps,usb3-phy-reset-quirk + +RK3399 TypeC PHY needs to be powered off and powered on again +for it to apply the correct Type-C plug orientation setting from +extcon and reconfigure itself while the USB controller is held +in reset. (It can not just reconfigure itself without USB controller +driver cooperation due to this requirement.) + +Good place to perform the power cycle is in __dwc3_set_mode +when changing between device and host modes. The only problem +is that __dwc3_set_mode will not get called in case the port +stays in device mode between plugout/plugin cycle into the same +type of the USB host port. DWC3 will not see a change in dr_role +but the user may have changed the orientation of the Type-C plug, +so the PHY may need a power cycle, which we'd like to perform in +__dwc3_set_mode. + +We can make __dwc3_set_mode be called for plugout/plugin +events, when detected if we add a special value for dr_role +(DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED) that would express +the meaning of "nothing connected to the port". + +For that purpose we observe complete USB disconnect via +lack of extcon USB and USB_HOST connector types in drd.c +and pass this state as DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED +to dwc3_set_mode(). + +It's a bit unfortunate that dr_role contains a direct register +value, so any value we add will not be a real register value, +but such is life. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/dwc3/core.c | 40 ++++++++++++++++++++++++++++++++++++++-- + drivers/usb/dwc3/core.h | 12 ++++++++++++ + drivers/usb/dwc3/drd.c | 34 ++++++++++++++++++++++------------ + 3 files changed, 72 insertions(+), 14 deletions(-) + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index 821887b97b7a..cd9fa25118a0 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -109,7 +109,7 @@ void dwc3_set_prtcap(struct dwc3 *dwc, u32 mode) + + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg &= ~(DWC3_GCTL_PRTCAPDIR(DWC3_GCTL_PRTCAP_OTG)); +- reg |= DWC3_GCTL_PRTCAPDIR(mode); ++ reg |= DWC3_GCTL_PRTCAPDIR(mode & DWC3_GCTL_PRTCAP_OTG); + dwc3_writel(dwc->regs, DWC3_GCTL, reg); + + dwc->current_dr_role = mode; +@@ -151,6 +151,7 @@ static void __dwc3_set_mode(struct work_struct *work) + dwc3_host_exit(dwc); + break; + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + dwc3_gadget_exit(dwc); + dwc3_event_buffers_cleanup(dwc); + break; +@@ -167,10 +168,37 @@ static void __dwc3_set_mode(struct work_struct *work) + + /* For DRD host or device mode only */ + if (desired_dr_role != DWC3_GCTL_PRTCAP_OTG) { ++ /* ++ * RK3399 TypeC PHY needs to be powered off and powered on again ++ * for it to apply the correct Type-C plug orientation setting ++ * and reconfigure itself. ++ * ++ * For that purpose we observe complete USB disconnect via ++ * extcon in drd.c and pass it to __dwc3_set_mode as ++ * desired_dr_role == 0. ++ * ++ * We thus handle transitions between three states of ++ * desired_dr_role here: ++ * ++ * - DWC3_GCTL_PRTCAP_HOST ++ * - DWC3_GCTL_PRTCAP_DEVICE ++ * - DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED - almost equivalent to ++ * DWC3_GCTL_PRTCAP_DEVICE, present only to distinguish ++ * disconnected state, and so that set_mode is called when ++ * user plugs in the device to the host. ++ */ ++ if (dwc->usb3_phy_powered && dwc->usb3_phy_reset_quirk) ++ phy_power_off(dwc->usb3_generic_phy); ++ + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg |= DWC3_GCTL_CORESOFTRESET; + dwc3_writel(dwc->regs, DWC3_GCTL, reg); + ++ if (dwc->usb3_phy_reset_quirk) { ++ ret = phy_power_on(dwc->usb3_generic_phy); ++ dwc->usb3_phy_powered = ret >= 0; ++ } ++ + /* + * Wait for internal clocks to synchronized. DWC_usb31 and + * DWC_usb32 may need at least 50ms (less for DWC_usb3). To +@@ -208,6 +236,7 @@ static void __dwc3_set_mode(struct work_struct *work) + } + break; + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + dwc3_core_soft_reset(dwc); + + dwc3_event_buffers_setup(dwc); +@@ -1520,6 +1549,8 @@ static void dwc3_get_properties(struct dwc3 *dwc) + + dwc->dis_split_quirk = device_property_read_bool(dev, + "snps,dis-split-quirk"); ++ dwc->usb3_phy_reset_quirk = device_property_read_bool(dev, ++ "snps,usb3-phy-reset-quirk"); + + dwc->lpm_nyet_threshold = lpm_nyet_threshold; + dwc->tx_de_emphasis = tx_de_emphasis; +@@ -1905,6 +1936,7 @@ static int dwc3_suspend_common(struct dwc3 *dwc, pm_message_t msg) + + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + if (pm_runtime_suspended(dwc->dev)) + break; + spin_lock_irqsave(&dwc->lock, flags); +@@ -1965,11 +1997,12 @@ static int dwc3_resume_common(struct dwc3 *dwc, pm_message_t msg) + + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + ret = dwc3_core_init_for_resume(dwc); + if (ret) + return ret; + +- dwc3_set_prtcap(dwc, DWC3_GCTL_PRTCAP_DEVICE); ++ dwc3_set_prtcap(dwc, dwc->current_dr_role); + spin_lock_irqsave(&dwc->lock, flags); + dwc3_gadget_resume(dwc); + spin_unlock_irqrestore(&dwc->lock, flags); +@@ -2028,6 +2061,7 @@ static int dwc3_runtime_checks(struct dwc3 *dwc) + { + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + if (dwc->connected) + return -EBUSY; + break; +@@ -2070,6 +2104,7 @@ static int dwc3_runtime_resume(struct device *dev) + + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + dwc3_gadget_process_pending_events(dwc); + break; + case DWC3_GCTL_PRTCAP_HOST: +@@ -2089,6 +2124,7 @@ static int dwc3_runtime_idle(struct device *dev) + + switch (dwc->current_dr_role) { + case DWC3_GCTL_PRTCAP_DEVICE: ++ case DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED: + if (dwc3_runtime_checks(dwc)) + return -EBUSY; + break; +diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h +index 6b060c7e8d44..bf3205aa99f2 100644 +--- a/drivers/usb/dwc3/core.h ++++ b/drivers/usb/dwc3/core.h +@@ -243,6 +243,12 @@ + #define DWC3_GCTL_PRTCAP_HOST 1 + #define DWC3_GCTL_PRTCAP_DEVICE 2 + #define DWC3_GCTL_PRTCAP_OTG 3 ++/* This is not a real register value, but a special state used for ++ * current_dr_role to mean DWC3_GCTL_PRTCAP_DEVICE in disconnected ++ * state. Value is chosen so that masking with register width ++ * produces DWC3_GCTL_PRTCAP_DEVICE value. ++ */ ++#define DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED 6 + + #define DWC3_GCTL_CORESOFTRESET BIT(11) + #define DWC3_GCTL_SOFITPSYNC BIT(10) +@@ -1102,6 +1108,10 @@ struct dwc3_scratchpad_array { + * 3 - Reserved + * @dis_metastability_quirk: set to disable metastability quirk. + * @dis_split_quirk: set to disable split boundary. ++ * @usb3_phy_reset_quirk: set to power cycle the USB3 PHY during mode ++ * changes. Useful on RK3399 that needs this ++ * to apply Type-C orientation changes in ++ * Type-C phy driver. + * @imod_interval: set the interrupt moderation interval in 250ns + * increments or 0 to disable. + * @max_cfg_eps: current max number of IN eps used across all USB configs. +@@ -1317,6 +1327,8 @@ struct dwc3 { + unsigned dis_split_quirk:1; + unsigned async_callbacks:1; + ++ unsigned usb3_phy_reset_quirk:1; ++ + u16 imod_interval; + + int max_cfg_eps; +diff --git a/drivers/usb/dwc3/drd.c b/drivers/usb/dwc3/drd.c +index 4982edd13047..5f5fe92aac93 100644 +--- a/drivers/usb/dwc3/drd.c ++++ b/drivers/usb/dwc3/drd.c +@@ -415,15 +415,28 @@ void dwc3_otg_update(struct dwc3 *dwc, bool ignore_idstatus) + + static void dwc3_drd_update(struct dwc3 *dwc) + { +- int id; ++ u32 mode = DWC3_GCTL_PRTCAP_DEVICE_DISCONNECTED; ++ int ret; + + if (dwc->edev) { +- id = extcon_get_state(dwc->edev, EXTCON_USB_HOST); +- if (id < 0) +- id = 0; +- dwc3_set_mode(dwc, id ? +- DWC3_GCTL_PRTCAP_HOST : +- DWC3_GCTL_PRTCAP_DEVICE); ++ ret = extcon_get_state(dwc->edev, EXTCON_USB_HOST); ++ if (ret > 0) ++ mode = DWC3_GCTL_PRTCAP_HOST; ++ ++ if (dwc->usb3_phy_reset_quirk) { ++ /* ++ * With this quirk enabled, we want to pass 0 ++ * to dwc3_set_mode to signal no USB connection ++ * state. ++ */ ++ ret = extcon_get_state(dwc->edev, EXTCON_USB); ++ if (ret > 0) ++ mode = DWC3_GCTL_PRTCAP_DEVICE; ++ } else { ++ mode = DWC3_GCTL_PRTCAP_DEVICE; ++ } ++ ++ dwc3_set_mode(dwc, mode); + } + } + +@@ -432,9 +445,7 @@ static int dwc3_drd_notifier(struct notifier_block *nb, + { + struct dwc3 *dwc = container_of(nb, struct dwc3, edev_nb); + +- dwc3_set_mode(dwc, event ? +- DWC3_GCTL_PRTCAP_HOST : +- DWC3_GCTL_PRTCAP_DEVICE); ++ dwc3_drd_update(dwc); + + return NOTIFY_DONE; + } +@@ -589,8 +600,7 @@ int dwc3_drd_init(struct dwc3 *dwc) + + if (dwc->edev) { + dwc->edev_nb.notifier_call = dwc3_drd_notifier; +- ret = extcon_register_notifier(dwc->edev, EXTCON_USB_HOST, +- &dwc->edev_nb); ++ ret = extcon_register_notifier_all(dwc->edev, &dwc->edev_nb); + if (ret < 0) { + dev_err(dwc->dev, "couldn't register cable notifier\n"); + return ret; +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch new file mode 100644 index 000000000..53fa6e02b --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch @@ -0,0 +1,83 @@ +From 140193dc7b81be0b2cb54fb11f75056c18a5f9f8 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 18:01:12 +0200 +Subject: [PATCH 545/548] usb: dwc3: Save desired_dr_role on stack during + set_mode processing + +While __dwc3_set_mode runs, the new call may come to dwc3_set_mode() +which would change desired_dr_role at inappropriate time and +potentially confuse the driver. + +Solve this by storing the copy of the desired_dr_role on stack. +If the new call to dwc3_set_mode happens before __dwc3_set_mode +is finished, the new mode will be correctly applied afterwards. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/dwc3/core.c | 22 +++++++++++++++------- + 1 file changed, 15 insertions(+), 7 deletions(-) + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index d881edddbc97..821887b97b7a 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -120,7 +120,15 @@ static void __dwc3_set_mode(struct work_struct *work) + struct dwc3 *dwc = work_to_dwc(work); + unsigned long flags; + int ret; +- u32 reg; ++ u32 reg, desired_dr_role; ++ ++ /* ++ * Copy desired_dr_role because it can be changed again by ++ * dwc3_set_mode while this function is running. ++ */ ++ spin_lock_irqsave(&dwc->lock, flags); ++ desired_dr_role = dwc->desired_dr_role; ++ spin_unlock_irqrestore(&dwc->lock, flags); + + mutex_lock(&dwc->mutex); + +@@ -129,13 +137,13 @@ static void __dwc3_set_mode(struct work_struct *work) + if (dwc->current_dr_role == DWC3_GCTL_PRTCAP_OTG) + dwc3_otg_update(dwc, 0); + +- if (!dwc->desired_dr_role) ++ if (!desired_dr_role) + goto out; + +- if (dwc->desired_dr_role == dwc->current_dr_role) ++ if (desired_dr_role == dwc->current_dr_role) + goto out; + +- if (dwc->desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev) ++ if (desired_dr_role == DWC3_GCTL_PRTCAP_OTG && dwc->edev) + goto out; + + switch (dwc->current_dr_role) { +@@ -158,7 +166,7 @@ static void __dwc3_set_mode(struct work_struct *work) + } + + /* For DRD host or device mode only */ +- if (dwc->desired_dr_role != DWC3_GCTL_PRTCAP_OTG) { ++ if (desired_dr_role != DWC3_GCTL_PRTCAP_OTG) { + reg = dwc3_readl(dwc->regs, DWC3_GCTL); + reg |= DWC3_GCTL_CORESOFTRESET; + dwc3_writel(dwc->regs, DWC3_GCTL, reg); +@@ -178,11 +186,11 @@ static void __dwc3_set_mode(struct work_struct *work) + + spin_lock_irqsave(&dwc->lock, flags); + +- dwc3_set_prtcap(dwc, dwc->desired_dr_role); ++ dwc3_set_prtcap(dwc, desired_dr_role); + + spin_unlock_irqrestore(&dwc->lock, flags); + +- switch (dwc->desired_dr_role) { ++ switch (desired_dr_role) { + case DWC3_GCTL_PRTCAP_HOST: + ret = dwc3_host_init(dwc); + if (ret) { +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch new file mode 100644 index 000000000..c8077cc15 --- /dev/null +++ b/patch/kernel/archive/sunxi-5.18/patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch @@ -0,0 +1,63 @@ +From b01bae017ee319db09098ba72cffeb49c06c12a7 Mon Sep 17 00:00:00 2001 +From: Ondrej Jirman +Date: Mon, 27 Jun 2022 16:27:11 +0200 +Subject: [PATCH 544/548] usb: dwc3: Track the power state of usb3_generic_phy + +We will need to manage power state of this phy inisde set_mode work, +without any ability to perform recovery if power on fails, so we'll +need to track result of power on separately, to be able to balance +the phy on/off calls. + +Signed-off-by: Ondrej Jirman +--- + drivers/usb/dwc3/core.c | 7 ++++++- + drivers/usb/dwc3/core.h | 1 + + 2 files changed, 7 insertions(+), 1 deletion(-) + +diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c +index d28cd1a6709b..d881edddbc97 100644 +--- a/drivers/usb/dwc3/core.c ++++ b/drivers/usb/dwc3/core.c +@@ -835,7 +835,9 @@ static void dwc3_core_exit(struct dwc3 *dwc) + usb_phy_set_suspend(dwc->usb2_phy, 1); + usb_phy_set_suspend(dwc->usb3_phy, 1); + phy_power_off(dwc->usb2_generic_phy); +- phy_power_off(dwc->usb3_generic_phy); ++ if (dwc->usb3_phy_powered) ++ phy_power_off(dwc->usb3_generic_phy); ++ dwc->usb3_phy_powered = false; + dwc3_clk_disable(dwc); + reset_control_assert(dwc->reset); + } +@@ -1124,6 +1126,8 @@ static int dwc3_core_init(struct dwc3 *dwc) + if (ret < 0) + goto err3; + ++ dwc->usb3_phy_powered = true; ++ + ret = dwc3_event_buffers_setup(dwc); + if (ret) { + dev_err(dwc->dev, "failed to setup event buffers\n"); +@@ -1231,6 +1235,7 @@ static int dwc3_core_init(struct dwc3 *dwc) + + err4: + phy_power_off(dwc->usb3_generic_phy); ++ dwc->usb3_phy_powered = false; + + err3: + phy_power_off(dwc->usb2_generic_phy); +diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h +index 5c9d467195a6..6b060c7e8d44 100644 +--- a/drivers/usb/dwc3/core.h ++++ b/drivers/usb/dwc3/core.h +@@ -1151,6 +1151,7 @@ struct dwc3 { + + struct phy *usb2_generic_phy; + struct phy *usb3_generic_phy; ++ bool usb3_phy_powered; + + bool phys_ready; + +-- +2.35.3 + diff --git a/patch/kernel/archive/sunxi-5.18/series.armbian b/patch/kernel/archive/sunxi-5.18/series.armbian index e08c892bc..47e6ad5be 100644 --- a/patch/kernel/archive/sunxi-5.18/series.armbian +++ b/patch/kernel/archive/sunxi-5.18/series.armbian @@ -4,11 +4,11 @@ # ############################################################################ patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch - patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch - patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch + patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch + patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch - patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch + patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch patches.armbian/drv-mfd-Add-support-for-AC200.patch patches.armbian/drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode.patch @@ -17,15 +17,15 @@ patches.armbian/drv-gpu-drm-gem-cma-Export-with-handle-allocator.patch patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch + patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch patches.armbian/drv-phy-sun4i-usb-Allow-reset-line-to-be-shared.patch patches.armbian/drv-phy-sun4i-usb-Introduce-port2-SIDDQ-quirk.patch patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-clocks-and-reset.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-multible-sensors-support.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-interrupt-support.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-H3-thermal-sensor.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-A83T-thermal-sensor.patch @@ -43,9 +43,9 @@ patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch patches.armbian/drv-media-cedrus-10-bit-HEVC-support.patch patches.armbian/drv-media-dvb-frontends-si2168-fix-cmd-timeout.patch - patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch + patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch patches.armbian/drv-clk-sunxi-ng-ccu-add-min-max-rate-sun50i-a64.patch - patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch + patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-enable-sound.patch @@ -72,14 +72,14 @@ patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch patches.armbian/arm-dts-sun9i-a80-add-thermal-sensor.patch patches.armbian/arm-dts-sun9i-a80-add-thermal-zone.patch - patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch + patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch patches.armbian/arm-dts-a20-orangepi-and-mini-fix-phy-mode-hdmi.patch patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch - patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch + patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch - patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch + patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch patches.armbian/arm-dts-sun7i-a20-cubietruck-add-alias-uart2.patch @@ -95,7 +95,7 @@ patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-allwinner-Add-sun50i-h616.dtsi-file.patch patches.armbian/arm64-dts-Add-sun50i-h616-orangepi-zero2-device.patch - patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch + patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch @@ -103,26 +103,26 @@ patches.armbian/arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch patches.armbian/arm64-dts-sun50i-a64-pine64-enable-Bluetooth.patch - patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch + patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch patches.armbian/arm64-dts-nanopi-a64-set-right-phy-mode-to-rgmii-id.patch patches.armbian/arm64-dts-a64-olinuxino-add-regulator-audio-mmc.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-k1-plus-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-neo-core2-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-neo2-v1.1-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-m1-plus2-device.patch - patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch + patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-regulator.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus-add-regulator.patch - patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch + patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-3-delete-node-spi0.patch - patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch + patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch patches.armbian/arm64-dts-sun50i-h6-pine-h64-add-wifi-rtl8723cs.patch patches.armbian/arm64-dts-sun50i-h6-pine-h64-add-dwc3-usb3phy.patch patches.armbian/arm64-dts-sun50i-a64-pine64-add-spi0.patch patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch - patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch + patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch patches.armbian/scripts-add-overlay-compilation-support.patch @@ -160,21 +160,21 @@ patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch patches.armbian/arm-dts-sun8i-h3-orangepi-pc-plus-add-wifi_pwrseq.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-rtl8723cs.patch - patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch + patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch patches.armbian/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch patches.armbian/Fix-include-uapi-spi-spidev-module.patch patches.armbian/fix-cpu-opp-table-sun8i-a83t.patch - patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch - patches.armbian/0002-compile-the-pwm-overlay.patch - patches.armbian/0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch - patches.armbian/0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch - patches.armbian/0005-net-phy-support-yt8531c.patch - patches.armbian/0007-wireless-add-uwe5622-driver.patch - patches.armbian/0009-allwinner-h6-support-ac200-audio-codec.patch - patches.armbian/0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch - patches.armbian/0011-add-initial-support-for-orangepi3-lts.patch - patches.armbian/0012-fix-h6-emmc.patch - patches.armbian/0013-x-fix-h6-emmc-dts.patch - patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch - patches.armbian/999-rollback-rsb.patch + patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch + patches.armbian/Compile-the-pwm-overlay.patch + patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch + patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch + patches.armbian/net-phy-Support-yt8531c.patch + patches.armbian/wireless-Add-uwe5622-driver.patch + patches.armbian/allwinner-h6-Support-ac200-audio-codec.patch + patches.armbian/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch + patches.armbian/add-initial-support-for-orangepi3-lts.patch + patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch + patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch + patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch + patches.armbian/Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.18/series.conf b/patch/kernel/archive/sunxi-5.18/series.conf index ea4f659ae..f250926c2 100644 --- a/patch/kernel/archive/sunxi-5.18/series.conf +++ b/patch/kernel/archive/sunxi-5.18/series.conf @@ -541,17 +541,28 @@ patches.megous/Revert-rtw89-8852c-add-trigger-frame-counter.patch patches.megous/Revert-rtw89-add-new-state-to-CFO-state-machine-for-UL-OFDMA.patch + patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch + patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch + patches.megous/media-rkisp1-Allow-higher-input-resolution.patch + patches.megous/media-imx258-Fix-4208x3120-mode.patch + patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch + patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch + patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch + patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch + patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch + patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch +# tag orange-pi-5.18-20220627-1924 ############################################################################ # # Armbian patches # ############################################################################ patches.armbian/drv-bluetooth-btrtl-Add-rtl8822cs-hci-ver-0008.patch - patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-hea.patch - patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-s.patch + patches.armbian/Revert-net-Remove-net-ipx.h-and-uapi-linux-ipx.h-header-files.patch + patches.armbian/Doc-dt-bindings-net-sun8i-emac-Add-H616-compatible-string.patch patches.armbian/Doc-dt-bindings-arm-sunxi-Add-OrangePi-Zero2-binding.patch patches.armbian/Doc-u-api-media-v4l-Add-scaling-matrix-control.patch - patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-.patch + patches.armbian/Doc-dt-bindings-usb-add-binding-for-DWC3-controller-on-Allwinne.patch patches.armbian/Doc-dt-bindings-arm-sunxi-Add-two-H616-board-compatible-strings.patch patches.armbian/drv-mfd-Add-support-for-AC200.patch patches.armbian/drv-pinctrl-pinctrl-sun50i-a64-disable_strict_mode.patch @@ -560,15 +571,15 @@ patches.armbian/drv-gpu-drm-gem-cma-Export-with-handle-allocator.patch patches.armbian/drv-gpu-drm-sun4i-Add-GEM-allocator.patch patches.armbian/drv-gpu-drm-sun4i-Add-HDMI-audio-sun4i-hdmi-encoder.patch - patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-registe.patch + patches.armbian/drv-net-stmmac-dwmac-sun8i-second-EMAC-clock-register.patch patches.armbian/drv-phy-sun4i-usb-Allow-reset-line-to-be-shared.patch patches.armbian/drv-phy-sun4i-usb-Introduce-port2-SIDDQ-quirk.patch patches.armbian/drv-phy-sun4i-usb-Add-support-for-the-H616-USB-PHY.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-reg.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-rename-A33-specified-registers-to-c.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-sampling-start-end-code-readout-reg.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-clocks-and-reset.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-multible-sensors-support.patch - patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibratio.patch + patches.armbian/drv-iio-adc-sun4i-gpadc-iio-support-nvmem-calibration-data.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-interrupt-support.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-H3-thermal-sensor.patch patches.armbian/drv-iio-adc-sun4i-gpadc-iio-add-A83T-thermal-sensor.patch @@ -586,9 +597,9 @@ patches.armbian/HACK-media-uapi-hevc-tiles-and-num_slices.patch patches.armbian/drv-media-cedrus-10-bit-HEVC-support.patch patches.armbian/drv-media-dvb-frontends-si2168-fix-cmd-timeout.patch - patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifie.patch + patches.armbian/include-uapi-drm_fourcc-add-ARM-tiled-format-modifier.patch patches.armbian/drv-clk-sunxi-ng-ccu-add-min-max-rate-sun50i-a64.patch - patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-.patch + patches.armbian/drv-clk-sunxi-ng-ccu-sun50i-a64-revert-ccu-Pinebook-A64.patch patches.armbian/drv-clocksource-arm_arch_timer-fix-a64-timejump.patch patches.armbian/sound-soc-sunxi-sun4i-spdif-add-mclk_multiplier.patch patches.armbian/sound-soc-sunxi-sun8i-codec-analog-enable-sound.patch @@ -615,14 +626,14 @@ patches.armbian/arm-arm64-dts-Add-leds-axp20x-charger.patch patches.armbian/arm-dts-sun9i-a80-add-thermal-sensor.patch patches.armbian/arm-dts-sun9i-a80-add-thermal-zone.patch - patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-C.patch + patches.armbian/arm-dts-sun7i-a20-Disable-OOB-IRQ-for-brcm-wifi-on-Cubietruck-a.patch patches.armbian/arm-dts-a20-orangepi-and-mini-fix-phy-mode-hdmi.patch patches.armbian/arm-dts-sun8i-h3-nanopi-add-leds-pio-pins.patch - patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-.patch + patches.armbian/arm-dts-a10-cubiebord-a20-cubietruck-green-LED-mmc0-default-tri.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-nanopi-duo-device.patch patches.armbian/arm-dts-Add-sun8i-h2-plus-sunvell-r69-device.patch patches.armbian/arm-dts-h3-nanopi-neo-Add-regulator-leds-mmc2.patch - patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-.patch + patches.armbian/arm-dts-h3-nanopi-neo-air-Add-regulator-camera-wifi-bluetooth-o.patch patches.armbian/arm-dts-h3-orangepi-2-Add-regulator-vdd-cpu.patch patches.armbian/arm-dts-sun8i-r40-bananapi-m2-ultra-add-codec-analog.patch patches.armbian/arm-dts-sun7i-a20-cubietruck-add-alias-uart2.patch @@ -638,7 +649,7 @@ patches.armbian/arm64-dts-sun50i-h6-Add-r_uart-uart2-3-pins.patch patches.armbian/arm64-dts-allwinner-Add-sun50i-h616.dtsi-file.patch patches.armbian/arm64-dts-Add-sun50i-h616-orangepi-zero2-device.patch - patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-sup.patch + patches.armbian/arm64-dts-Add-sun50i-h616-x96-mate-TV-box-device-support.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-GPU-node.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-Enable-GPU-mali.patch patches.armbian/arm64-dts-allwinner-sun50i-h616-Add-VPU-node.patch @@ -646,26 +657,26 @@ patches.armbian/arm64-dts-sun50i-h616-x96-mate-add-hdmi.patch patches.armbian/arm64-dts-sun50i-a64-pinebook-enable-Bluetooth.patch patches.armbian/arm64-dts-sun50i-a64-pine64-enable-Bluetooth.patch - patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetoo.patch + patches.armbian/arm64-dts-sun50i-a64-sopine-baseboard-enable-Bluetooth.patch patches.armbian/arm64-dts-nanopi-a64-set-right-phy-mode-to-rgmii-id.patch patches.armbian/arm64-dts-a64-olinuxino-add-regulator-audio-mmc.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-k1-plus-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-neo-core2-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-neo2-v1.1-device.patch patches.armbian/arm64-dts-Add-sun50i-h5-nanopi-m1-plus2-device.patch - patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-tr.patch + patches.armbian/arm64-dts-sun50i-h5-nanopi-neo2-add-regulator-led-triger.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-pc2-add-spi-flash.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-regulator.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus-add-regulator.patch - patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gp.patch + patches.armbian/arm64-dts-sun50i-h5-orangepi-zero-plus2-regulator-gpio-fix.patch patches.armbian/arm64-dts-sun50i-h6.dtsi-improve-thermals.patch patches.armbian/arm64-dts-sun50i-h6-orangepi-3-delete-node-spi0.patch - patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3.patch + patches.armbian/arm64-dts-sun50i-h6-orangepi-lite2-spi0-usb3phy-dwc3-enable.patch patches.armbian/arm64-dts-sun50i-h6-pine-h64-add-wifi-rtl8723cs.patch patches.armbian/arm64-dts-sun50i-h6-pine-h64-add-dwc3-usb3phy.patch patches.armbian/arm64-dts-sun50i-a64-pine64-add-spi0.patch patches.armbian/arm64-dts-sun50i-h6.dtsi-add-pinctrl-pins-for-spi.patch - patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-etherne.patch + patches.armbian/arm64-dts-sun50i-a64-orangepi-win-add-aliase-ethernet1.patch patches.armbian/arm64-dts-sun50i-a64-force-mmc0-bus-width.patch patches.armbian/scripts-add-overlay-compilation-support.patch @@ -703,21 +714,21 @@ patches.armbian/drv-staging-rtl8723bs-AP-bugfix.patch patches.armbian/arm-dts-sun8i-h3-orangepi-pc-plus-add-wifi_pwrseq.patch patches.armbian/arm64-dts-sun50i-h5-orangepi-prime-add-rtl8723cs.patch - patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-inter.patch + patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-xradio-interrupt.patch patches.armbian/Fix-duplicate-nodes-for-sun50i-h5-orangepi-pc2.patch patches.armbian/Fix-include-uapi-spi-spidev-module.patch patches.armbian/fix-cpu-opp-table-sun8i-a83t.patch - patches.armbian/0001-move-sun50i-h6-pwm-settings-to-its-own-overlay.patch - patches.armbian/0002-compile-the-pwm-overlay.patch - patches.armbian/0003-add-dump_reg-and-sunxi-sysinfo-drivers.patch - patches.armbian/0004-add-sunxi-addr-driver-used-to-fix-uwe5622-bluetooth-.patch - patches.armbian/0005-net-phy-support-yt8531c.patch - patches.armbian/0007-wireless-add-uwe5622-driver.patch - patches.armbian/0009-allwinner-h6-support-ac200-audio-codec.patch - patches.armbian/0010-allwinner-add-sunxi_get_soc_chipid-and-sunxi_get_ser.patch - patches.armbian/0011-add-initial-support-for-orangepi3-lts.patch - patches.armbian/0012-fix-h6-emmc.patch - patches.armbian/0013-x-fix-h6-emmc-dts.patch - patches.armbian/0014-add-uwe-bsp-to-orangepi3-lts-dts-file.patch - patches.armbian/999-rollback-rsb.patch + patches.armbian/Move-sun50i-h6-pwm-settings-to-its-own-overlay.patch + patches.armbian/Compile-the-pwm-overlay.patch + patches.armbian/Add-dump_reg-and-sunxi-sysinfo-drivers.patch + patches.armbian/Add-sunxi-addr-driver-Used-to-fix-uwe5622-bluetooth-MAC-address.patch + patches.armbian/net-phy-Support-yt8531c.patch + patches.armbian/wireless-Add-uwe5622-driver.patch + patches.armbian/allwinner-h6-Support-ac200-audio-codec.patch + patches.armbian/nvmem-sunxi_sid-add-sunxi_get_soc_chipid-sunxi_get_serial.patch + patches.armbian/add-initial-support-for-orangepi3-lts.patch + patches.armbian/mmc-host-sunxi-mmc-Fix-H6-emmc.patch + patches.armbian/arm64-dts-allwinner-sun50i-h6-Fix-H6-emmc.patch + patches.armbian/add-uwe-bsp-to-OPi3-LTS-dts-file.patch + patches.armbian/Rollback-r_rsb-to-r_i2c.patch diff --git a/patch/kernel/archive/sunxi-5.18/series.megous b/patch/kernel/archive/sunxi-5.18/series.megous index 8793eed9b..e081a9df8 100644 --- a/patch/kernel/archive/sunxi-5.18/series.megous +++ b/patch/kernel/archive/sunxi-5.18/series.megous @@ -540,3 +540,15 @@ patches.megous/rtw89-add-new-state-to-CFO-state-machine-for-UL-OFDMA.patch patches.megous/Revert-rtw89-8852c-add-trigger-frame-counter.patch patches.megous/Revert-rtw89-add-new-state-to-CFO-state-machine-for-UL-OFDMA.patch + + patches.megous/spi-rockchip-Fix-runtime-PM-and-other-issues.patch + patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Cleanup-regulator-sleep.patch + patches.megous/media-rkisp1-Allow-higher-input-resolution.patch + patches.megous/media-imx258-Fix-4208x3120-mode.patch + patches.megous/Revert-phy-rockchip-typec-Make-sure-the-plug-orientation-is-res.patch + patches.megous/usb-dwc3-Track-the-power-state-of-usb3_generic_phy.patch + patches.megous/usb-dwc3-Save-desired_dr_role-on-stack-during-set_mode-processi.patch + patches.megous/usb-dwc3-Add-support-for-snps-usb3-phy-reset-quirk.patch + patches.megous/arm64-dts-rockchip-rk3399-pinebook-pro-Support-both-Type-C-plug.patch + patches.megous/arm64-dts-rockchip-rk3399-pinephone-pro-Support-both-Type-C-plu.patch +# tag orange-pi-5.18-20220627-1924 diff --git a/tools/mk_format_patch b/tools/mk_format_patch index 6596a182f..b963db0bc 100755 --- a/tools/mk_format_patch +++ b/tools/mk_format_patch @@ -29,6 +29,7 @@ ii_cp() --ignore-matching-lines="^From [0-9a-f]\{40\}" \ --ignore-matching-lines="^index [0-9a-f]\{7\}" \ --ignore-matching-lines="^Subject:" \ + --ignore-matching-lines="^[2-3].[1-9][0-9]" \ $old_p $new_p 2>/dev/null)" != "" ] then cp --backup=none -f $new_p $old_p