diff --git a/recipes-kernel/linux/linux-mainline/0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch b/recipes-kernel/linux/linux-mainline/0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch deleted file mode 100644 index 5b7052c..0000000 --- a/recipes-kernel/linux/linux-mainline/0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1596e282f52c8f43fd1cc4a39096f28563558a5c Mon Sep 17 00:00:00 2001 -From: Sergey Matyukevich -Date: Fri, 3 Nov 2017 22:12:43 +0300 -Subject: [PATCH 1/2] arm64: dts: orange-pi-zero-plus2: fix sdcard detect - -The sdcard detect pin on orange-pi-zero-plus2 is pulled up. -Fix cd-gpio description to enable sdcard detect. - -Signed-off-by: Sergey Matyukevich ---- - arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -index b6b7a561df8c..a42fd79a62a3 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-zero-plus2.dts -@@ -71,7 +71,7 @@ - pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; - vmmc-supply = <®_vcc3v3>; - bus-width = <4>; -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_HIGH>; -+ cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; - status = "okay"; - }; - --- -2.11.0 - diff --git a/recipes-kernel/linux/linux-mainline_4.14.15.bb b/recipes-kernel/linux/linux-mainline_4.15.bb similarity index 79% rename from recipes-kernel/linux/linux-mainline_4.14.15.bb rename to recipes-kernel/linux/linux-mainline_4.15.bb index 2c0b383..7943e7e 100644 --- a/recipes-kernel/linux/linux-mainline_4.14.15.bb +++ b/recipes-kernel/linux/linux-mainline_4.15.bb @@ -19,11 +19,10 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}" S = "${WORKDIR}/linux-${PV}" -SRC_URI[md5sum] = "e1051f6b15d6399a5de2441dd4e15537" -SRC_URI[sha256sum] = "ffc393a0c66f80375eacd3fb177b92e5c9daa07de0dcf947e925e049352e6142" +SRC_URI[md5sum] = "0d701ac1e2a67d47ce7127432df2c32b" +SRC_URI[sha256sum] = "5a26478906d5005f4f809402e981518d2b8844949199f60c4b6e1f986ca2a769" SRC_URI = "https://www.kernel.org/pub/linux/kernel/v4.x/linux-${PV}.tar.xz \ - file://0001-arm64-dts-orange-pi-zero-plus2-fix-sdcard-detect.patch \ file://0002-arm64-dts-orange-pi-zero-plus2-enable-AP6212a-WiFi-B.patch \ file://0003-ARM-dts-nanopi-neo-air-Add-WiFi-eMMC.patch \ file://defconfig \