diff options
| author | Tom Rini <trini@konsulko.com> | 2021-09-22 11:43:12 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-09-22 11:43:12 -0400 |
| commit | a49930f4c6ed5dcbf5127f7bf6d189afa92bffb3 (patch) | |
| tree | 9cad29b15e4e13fe5fc44d5bff728079e876f3b2 | |
| parent | cfb573d22dac1089b5c792bc8529dd76acfa68fc (diff) | |
| parent | 57e2c0a86fe48194c9407d36d60f9ab033b4460e (diff) | |
| download | u-boot-a49930f4c6ed5dcbf5127f7bf6d189afa92bffb3.zip u-boot-a49930f4c6ed5dcbf5127f7bf6d189afa92bffb3.tar.gz u-boot-a49930f4c6ed5dcbf5127f7bf6d189afa92bffb3.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-x86
- Small fixes to eMMC and SDHCI for Intel Edison
| -rw-r--r-- | arch/x86/dts/edison.dts | 1 | ||||
| -rw-r--r-- | arch/x86/include/asm/arch-tangier/acpi/southcluster.asl | 32 |
2 files changed, 33 insertions, 0 deletions
diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index 64b6228..2c8cf6c 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 { diff --git a/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl b/arch/x86/include/asm/arch-tangier/acpi/southcluster.asl index df66625..a8852f8 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) |