diff options
| author | Tom Rini <trini@konsulko.com> | 2019-08-09 23:27:15 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2019-08-09 23:27:15 -0400 |
| commit | 9fd8b2c8c714b383b6768d53d7b46682fdf87013 (patch) | |
| tree | 47d9b59ac1129e9bf71a065d5f3c526d1ada15a5 /arch/x86/dts/edison.dts | |
| parent | 188f0109055300a099f90bedd96b0e93d28acfbd (diff) | |
| parent | dbaec467671fd5b56cf380121340844863f5472d (diff) | |
Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86
- Enable SD slot on Intel Edison
- Populate CSRT ACPI table for shared DMA controller on Intel Tangier
- Convert Intel ICH-SPI driver to use new spi-mem ops
- Enable config_distro_bootcmd for QEMU x86
- Support U-Boot as a payload for Intel Slim Bootloader
- Avoid writing temporary asl files into the source tree which fixes the
parallel build issue occasionally seen
Diffstat (limited to 'arch/x86/dts/edison.dts')
| -rw-r--r-- | arch/x86/dts/edison.dts | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/x86/dts/edison.dts b/arch/x86/dts/edison.dts index c0487656d3..df24aa0d26 100644 --- a/arch/x86/dts/edison.dts +++ b/arch/x86/dts/edison.dts @@ -84,15 +84,10 @@ reg = <0xff3fc000 0x1000>; }; -/* - * FIXME: For now U-Boot DM model doesn't allow to power up this controller. - * Enabling it will make U-Boot hang. - * sdcard: mmc@ff3fa000 { compatible = "intel,sdhci-tangier"; reg = <0xff3fa000 0x1000>; }; - */ pmu: power@ff00b000 { compatible = "intel,pmu-mid"; |