From b550a12744ad4ef4dfdfaa5a613adc005011096f Mon Sep 17 00:00:00 2001 From: heitbaum Date: Mon, 26 Apr 2021 13:39:43 +0000 Subject: [PATCH] linux (Allwinner): drop 5.10.33 incorporate patch - Revert-SD-card-CD-GPIO-for-Pine64-LTS --- ...evert-SD-card-CD-GPIO-for-Pine64-LTS.patch | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch diff --git a/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch b/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch deleted file mode 100644 index 2ac870e000..0000000000 --- a/projects/Allwinner/patches/linux/0062-arm64-dts-allwinner-Revert-SD-card-CD-GPIO-for-Pine64-LTS.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Andre Przywara -Subject: [PATCH v2] arm64: dts: allwinner: Revert SD card CD GPIO for - Pine64-LTS -Date: Wed, 14 Apr 2021 11:47:40 +0100 - -Commit 941432d00768 ("arm64: dts: allwinner: Drop non-removable from -SoPine/LTS SD card") enabled the card detect GPIO for the SOPine module, -along the way with the Pine64-LTS, which share the same base .dtsi. - -This was based on the observation that the Pine64-LTS has as "push-push" -SD card socket, and that the schematic mentions the card detect GPIO. - -After having received two reports about failing SD card access with that -patch, some more research and polls on that subject revealed that there -are at least two different versions of the Pine64-LTS out there: -- On some boards (including mine) the card detect pin is "stuck" at - high, regardless of an microSD card being inserted or not. -- On other boards the card-detect is working, but is active-high, by - virtue of an explicit inverter circuit, as shown in the schematic. - -To cover all versions of the board out there, and don't take any chances, -let's revert the introduction of the active-low CD GPIO, but let's use -the broken-cd property for the Pine64-LTS this time. That should avoid -regressions and should work for everyone, even allowing SD card changes -now. -The SOPine card detect has proven to be working, so let's keep that -GPIO in place. - -Fixes: 941432d00768 ("arm64: dts: allwinner: Drop non-removable from SoPine/LTS SD card") -Reported-by: Michael Weiser -Reported-by: Daniel Kulesz -Suggested-by: Chen-Yu Tsai -Signed-off-by: Andre Przywara ---- - arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -index e79ce49e7e6a..596a25907432 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64-lts.dts -@@ -21,5 +21,5 @@ - }; - - &mmc0 { -- cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 push-push switch */ -+ broken-cd; /* card detect is broken on *some* boards */ - };