From 5e74f7e4d7e28534adc52ac84db02e0505c1424c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20K=C3=A4stner?= Date: Mon, 24 Mar 2025 16:34:14 +0100 Subject: [PATCH] chore: drop linux-mainline pre-v6.5 patches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Oliver Kästner --- recipes-kernel/linux/linux-mainline.inc | 25 ++--- ...-dts-orange-pi-zero-Add-wifi-support.patch | 87 --------------- .../0002-dts-nanopi-neo-air-add-camera.patch | 101 ------------------ ...nanapi-m2-zreo-Enforce-consistent-MM.patch | 28 ----- ...m64-Consistent-nodes-for-mmc-devices.patch | 27 ----- ...1-dts-orangepi-zero-Add-wifi-support.patch | 0 ...ts-nanopi-neo-air-Add-camera-support.patch | 0 ...nanapi-m2-zero-Enforce-consistent-MM.patch | 0 ...m64-Consistent-nodes-for-mmc-devices.patch | 0 ...d-MMC-alias-for-consistent-enumerati.patch | 0 ...angepi-zero-mmc-aliases-for-consiste.patch | 0 11 files changed, 8 insertions(+), 260 deletions(-) delete mode 100644 recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch delete mode 100644 recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch delete mode 100644 recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch delete mode 100644 recipes-kernel/linux/linux-mainline/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0001-dts-orangepi-zero-Add-wifi-support.patch (100%) rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0002-dts-nanopi-neo-air-Add-camera-support.patch (100%) rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch (100%) rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch (100%) rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch (100%) rename recipes-kernel/linux/linux-mainline/{6.5 => patches}/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch (100%) diff --git a/recipes-kernel/linux/linux-mainline.inc b/recipes-kernel/linux/linux-mainline.inc index f7d24a6..3d6db8d 100644 --- a/recipes-kernel/linux/linux-mainline.inc +++ b/recipes-kernel/linux/linux-mainline.inc @@ -48,23 +48,14 @@ SRC_URI = "https://www.kernel.org/pub/linux/kernel/v${KRELEASE}.x/linux-${PV}.ta file://sunxi-kmeta;type=kmeta;name=sunxi-kmeta;destsuffix=sunxi-kmeta \ " -# append patches for kernels before 6.5 and after based on version -SRC_URI += "${@oe.utils.ifelse(d.getVar('KERNEL_DTB_PREFIX') == '1', d.getVar('SOURCES_K65'), d.getVar('SOURCES'))}" - -SOURCES_K65 = " \ - file://6.5/0001-dts-orangepi-zero-Add-wifi-support.patch \ - file://6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch \ - file://6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \ - file://6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \ - file://6.5/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch \ - file://6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch \ -" - -SOURCES = " \ - file://0001-dts-orange-pi-zero-Add-wifi-support.patch \ - file://0002-dts-nanopi-neo-air-add-camera.patch \ - file://0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch \ - file://0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \ +# patches +SRC_URI:append = " \ + file://patches/0001-dts-orangepi-zero-Add-wifi-support.patch \ + file://patches/0002-dts-nanopi-neo-air-Add-camera-support.patch \ + file://patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch \ + file://patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch \ + file://patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch \ + file://patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch \ " SRC_URI:append:use-mailine-graphics = " file://drm.cfg" diff --git a/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch b/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch deleted file mode 100644 index 4680a43..0000000 --- a/recipes-kernel/linux/linux-mainline/0001-dts-orange-pi-zero-Add-wifi-support.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -index 84cd9c061..917986cce 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts -@@ -80,13 +80,15 @@ - }; - }; - -- reg_vcc_wifi: reg_vcc_wifi { -+ vdd_wifi: vdd_wifi { - compatible = "regulator-fixed"; -- regulator-min-microvolt = <3300000>; -- regulator-max-microvolt = <3300000>; -- regulator-name = "vcc-wifi"; -- enable-active-high; -+ regulator-name = "wifi"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; - gpio = <&pio 0 20 GPIO_ACTIVE_HIGH>; -+ startup-delay-us = <70000>; -+ enable-active-high; -+ - }; - - reg_vdd_cpux: vdd-cpux-regulator { -@@ -106,10 +108,12 @@ - 1300000 1>; - }; - -- wifi_pwrseq: wifi_pwrseq { -+ pwrseq_wifi: pwrseq_wifi { - compatible = "mmc-pwrseq-simple"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_rst>; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; -- post-power-on-delay-ms = <200>; -+ post-power-on-delay-ms = <50>; - }; - }; - -@@ -140,9 +144,11 @@ - }; - - &mmc1 { -- vmmc-supply = <®_vcc_wifi>; -- mmc-pwrseq = <&wifi_pwrseq>; -+ vmmc-supply = <®_vcc3v3>; -+ vqmmc-supply = <&vdd_wifi>; -+ mmc-pwrseq = <&pwrseq_wifi>; - bus-width = <4>; -+ max-frequency = <16000000>; - non-removable; - status = "okay"; - -@@ -152,6 +158,13 @@ - */ - xr819: sdio_wifi@1 { - reg = <1>; -+ compatible = "xradio,xr819"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&wifi_wake>; -+ interrupt-parent = <&pio>; -+ interrupts = <6 10 IRQ_TYPE_EDGE_RISING>; -+ interrupt-names = "host-wake"; -+ local-mac-address = [dc 44 6d c0 ff ee]; - }; - }; - -@@ -208,3 +221,18 @@ - status = "okay"; - usb0_id_det-gpios = <&pio 6 12 GPIO_ACTIVE_HIGH>; /* PG12 */ - }; -+ -+&pio { -+ wifi_wake: wifi_wake { -+ pins = "PG10"; -+ function = "gpio_in"; -+ }; -+}; -+ -+&r_pio { -+ wifi_rst: wifi_rst { -+ pins = "PL7"; -+ function = "gpio_out"; -+ }; -+}; -+ diff --git a/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch b/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch deleted file mode 100644 index 837617f..0000000 --- a/recipes-kernel/linux/linux-mainline/0002-dts-nanopi-neo-air-add-camera.patch +++ /dev/null @@ -1,101 +0,0 @@ -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 cd3df12b65..33a161692f 100644 ---- a/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts -+++ b/arch/arm/boot/dts/sun8i-h3-nanopi-neo-air.dts -@@ -77,6 +77,39 @@ - compatible = "mmc-pwrseq-simple"; - reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */ - }; -+ -+ cam_xclk: cam-xclk { -+ #clock-cells = <0>; -+ compatible = "fixed-clock"; -+ clock-frequency = <24000000>; -+ clock-output-names = "cam-xclk"; -+ }; -+ -+ reg_cam_avdd: cam-avdd { -+ compatible = "regulator-fixed"; -+ regulator-name = "cam-avdd"; -+ regulator-min-microvolt = <2800000>; -+ regulator-max-microvolt = <2800000>; -+ vin-supply = <®_vcc3v3>; -+ }; -+ -+ reg_cam_dovdd: cam-dovdd { -+ compatible = "regulator-fixed"; -+ regulator-name = "cam-dovdd"; -+ regulator-min-microvolt = <1800000>; -+ regulator-max-microvolt = <1800000>; -+ vin-supply = <®_vcc3v3>; -+ }; -+ -+ reg_cam_dvdd: cam-dvdd { -+ compatible = "regulator-fixed"; -+ regulator-name = "cam-dvdd"; -+ regulator-min-microvolt = <1500000>; -+ regulator-max-microvolt = <1500000>; -+ vin-supply = <®_vcc3v3>; -+ }; -+ -+ - }; - - &mmc0 { -@@ -141,3 +174,55 @@ - /* USB VBUS is always on */ - status = "okay"; - }; -+ -+&csi { -+ status = "okay"; -+ -+ port { -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ /* Parallel bus endpoint */ -+ csi_from_ov5640: endpoint { -+ remote-endpoint = <&ov5640_to_csi>; -+ bus-width = <8>; -+ data-shift = <2>; -+ hsync-active = <1>; /* Active high */ -+ vsync-active = <0>; /* Active low */ -+ data-active = <1>; /* Active high */ -+ pclk-sample = <1>; /* Rising */ -+ }; -+ }; -+}; -+ -+&i2c2 { -+ status = "okay"; -+ -+ ov5640: camera@3c { -+ compatible = "ovti,ov5640"; -+ reg = <0x3c>; -+ clocks = <&cam_xclk>; -+ clock-names = "xclk"; -+ -+ reset-gpios = <&pio 4 14 GPIO_ACTIVE_LOW>; -+ powerdown-gpios = <&pio 4 15 GPIO_ACTIVE_HIGH>; -+ AVDD-supply = <®_cam_avdd>; -+ DOVDD-supply = <®_cam_dovdd>; -+ DVDD-supply = <®_cam_dvdd>; -+ -+ port { -+ ov5640_to_csi: endpoint { -+ remote-endpoint = <&csi_from_ov5640>; -+ bus-width = <8>; -+ data-shift = <2>; -+ hsync-active = <1>; /* Active high */ -+ vsync-active = <0>; /* Active low */ -+ data-active = <1>; /* Active high */ -+ pclk-sample = <1>; /* Rising */ -+ }; -+ }; -+ }; -+}; -+&i2c2_pins { -+ bias-pull-up; -+}; - diff --git a/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch b/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch deleted file mode 100644 index cbaf782..0000000 --- a/recipes-kernel/linux/linux-mainline/0003-dts-allwinner-bananapi-m2-zreo-Enforce-consistent-MM.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9b4baa9b5aab0511c46a1ae95485e1a3ea984352 Mon Sep 17 00:00:00 2001 -From: matteolel -Date: Fri, 9 Dec 2022 16:38:11 +0000 -Subject: [PATCH] dts: allwinner: bananapi-m2-zreo: Enforce consistent MMC - numbering - -Enforce MMC number (sometimes the order was wrong and the device does not boot). ---- - arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts -index 8e8634ff2..37a2ed937 100644 ---- a/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts -+++ b/arch/arm/boot/dts/sun8i-h2-plus-bananapi-m2-zero.dts -@@ -20,6 +20,9 @@ / { - aliases { - serial0 = &uart0; - serial1 = &uart1; -+ mmc0 = &mmc0; -+ mmc1 = &mmc1; -+ mmc2 = &mmc2; - }; - - chosen { --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-mainline/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch b/recipes-kernel/linux/linux-mainline/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch deleted file mode 100644 index 7b37762..0000000 --- a/recipes-kernel/linux/linux-mainline/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f487f62babb11d014da7a0b58a0fcdf6d217a812 Mon Sep 17 00:00:00 2001 -From: Marek Belisko -Date: Thu, 11 May 2023 11:18:33 +0200 -Subject: [PATCH] bananapi-m64: Consistent nodes for mmc devices - -Signed-off-by: Marek Belisko ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts -index e6d5bc0f7..39a28aad8 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts -@@ -16,6 +16,9 @@ aliases { - ethernet0 = &emac; - serial0 = &uart0; - serial1 = &uart1; -+ mmc0 = &mmc0; -+ mmc1 = &mmc1; -+ mmc2 = &mmc2; - }; - - chosen { --- -2.25.1 - diff --git a/recipes-kernel/linux/linux-mainline/6.5/0001-dts-orangepi-zero-Add-wifi-support.patch b/recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0001-dts-orangepi-zero-Add-wifi-support.patch rename to recipes-kernel/linux/linux-mainline/patches/0001-dts-orangepi-zero-Add-wifi-support.patch diff --git a/recipes-kernel/linux/linux-mainline/6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch b/recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0002-dts-nanopi-neo-air-Add-camera-support.patch rename to recipes-kernel/linux/linux-mainline/patches/0002-dts-nanopi-neo-air-Add-camera-support.patch diff --git a/recipes-kernel/linux/linux-mainline/6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch b/recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch rename to recipes-kernel/linux/linux-mainline/patches/0003-dts-allwinner-bananapi-m2-zero-Enforce-consistent-MM.patch diff --git a/recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch b/recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch rename to recipes-kernel/linux/linux-mainline/patches/0004-dts-allwinner-bananapi-m64-Consistent-nodes-for-mmc-devices.patch diff --git a/recipes-kernel/linux/linux-mainline/6.5/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch b/recipes-kernel/linux/linux-mainline/patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch rename to recipes-kernel/linux/linux-mainline/patches/0005-ARM-dts-sunxi-Add-MMC-alias-for-consistent-enumerati.patch diff --git a/recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch b/recipes-kernel/linux/linux-mainline/patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch similarity index 100% rename from recipes-kernel/linux/linux-mainline/6.5/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch rename to recipes-kernel/linux/linux-mainline/patches/0006-dts-allwinner-orangepi-zero-mmc-aliases-for-consiste.patch