From e45066f48f07dd192cb763d9cc2ef115bc7cb814 Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Fri, 10 Sep 2021 10:59:27 +0300 Subject: [PATCH 1/2] x86: edison: Mark eMMC non-removable eMMC is non-removable on Intel Edison board. Fix the DTS accordingly. Signed-off-by: Andy Shevchenko Reviewed-by: Bin Meng --- arch/x86/dts/edison.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index 64b6228363..2c8cf6c071 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -88,6 +88,7 @@ emmc: mmc@ff3fc000 { compatible = "intel,sdhci-tangier"; reg = <0xff3fc000 0x1000>; + non-removable; }; sdcard: mmc@ff3fa000 { From 57e2c0a86fe48194c9407d36d60f9ab033b4460e Mon Sep 17 00:00:00 2001 From: Andy Shevchenko Date: Sat, 11 Sep 2021 21:27:42 +0300 Subject: [PATCH 2/2] x86: tangier: acpi: Add GPIO card detection to SDHCI #2 On Intel Tangier the SDHCI #2 provides SD card connection. Add GPIO card detection for it. Fixes: 39665beed6f7 ("x86: tangier: Enable ACPI support for Intel Tangier") BugLink: https://github.com/edison-fw/meta-intel-edison/issues/135 Signed-off-by: Andy Shevchenko Acked-by: Bin Meng --- .../asm/arch-tangier/acpi/southcluster.asl | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index df66625930..a8852f8202 100644 --- a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl +++ b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl @@ -97,6 +97,38 @@ Device (PCI0) } } + Device (SDHB) + { + Name (_ADR, 0x00010002) + Name (_DEP, Package () + { + GPIO + }) + + Name (RBUF, ResourceTemplate() + { + GpioInt(Edge, ActiveBoth, SharedAndWake, PullNone, 10000, + "\\_SB.PCI0.GPIO", 0, ResourceConsumer, , ) { 77 } + }) + + Method (_CRS, 0, Serialized) + { + Return (RBUF) + } + + Name (_DSD, Package () { + ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"), + Package () { + Package () { "cd-gpios", Package () { ^SDHB, 0, 0, 0 } }, + } + }) + + Method (_STA) + { + Return (STA_VISIBLE) + } + } + Device (SDHC) { Name (_ADR, 0x00010003)