diff options
Diffstat (limited to 'arch/x86/cpu/ivybridge')
| -rw-r--r-- | arch/x86/cpu/ivybridge/early_me.c | 3 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/sdram.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index 612c910..f0d6899 100644 --- a/arch/x86/cpu/ivybridge/early_me.c +++ b/arch/x86/cpu/ivybridge/early_me.c @@ -10,6 +10,7 @@ #include <dm.h> #include <errno.h> #include <asm/pci.h> +#include <asm/cpu.h> #include <asm/processor.h> #include <asm/arch/me.h> #include <asm/arch/pch.h> @@ -189,7 +190,7 @@ int intel_early_me_init_done(struct udevice *dev, struct udevice *me_dev, } static const struct udevice_id ivybridge_syscon_ids[] = { - { .compatible = "intel,me", }, + { .compatible = "intel,me", .data = X86_SYSCON_ME }, { } }; diff --git a/arch/x86/cpu/ivybridge/sdram.c b/arch/x86/cpu/ivybridge/sdram.c index 3e5be4e..e23c422 100644 --- a/arch/x86/cpu/ivybridge/sdram.c +++ b/arch/x86/cpu/ivybridge/sdram.c @@ -18,6 +18,8 @@ #include <rtc.h> #include <spi.h> #include <spi_flash.h> +#include <syscon.h> +#include <asm/cpu.h> #include <asm/processor.h> #include <asm/gpio.h> #include <asm/global_data.h> @@ -739,11 +741,9 @@ int dram_init(void) return ret; if (!dev) return -ENODEV; - ret = uclass_first_device(UCLASS_SYSCON, &me_dev); + ret = syscon_get_by_driver_data(X86_SYSCON_ME, &me_dev); if (ret) return ret; - if (!me_dev) - return -ENODEV; debug("Boot mode %d\n", gd->arch.pei_boot_mode); debug("mrc_input %p\n", pei_data.mrc_input); pei_data.boot_mode = gd->arch.pei_boot_mode; |