diff options
| author | Simon Glass <sjg@chromium.org> | 2016-01-17 16:11:58 -0700 |
|---|---|---|
| committer | Bin Meng <bmeng.cn@gmail.com> | 2016-01-24 12:09:42 +0800 |
| commit | 98655f3a8d23d322d91ebb1897ff02a6e8a46b10 (patch) | |
| tree | ba26c1eed1a948c4fc478f0622f52d4113435375 /arch | |
| parent | 67292e4c27de6cde4624ce03b47b2449a9ebc671 (diff) | |
| download | u-boot-98655f3a8d23d322d91ebb1897ff02a6e8a46b10.tar.gz u-boot-98655f3a8d23d322d91ebb1897ff02a6e8a46b10.tar.xz u-boot-98655f3a8d23d322d91ebb1897ff02a6e8a46b10.zip | |
x86: Set up a shared syscon numbering schema
Each system controller can have a number to identify it. It can then be
accessed using syscon_get_by_driver_data(). Put this in a shared header
file and update the only current user.
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/cpu/ivybridge/early_me.c | 3 | ||||
| -rw-r--r-- | arch/x86/cpu/ivybridge/sdram.c | 6 | ||||
| -rw-r--r-- | arch/x86/include/asm/cpu.h | 9 |
3 files changed, 14 insertions, 4 deletions
diff --git a/arch/x86/cpu/ivybridge/early_me.c b/arch/x86/cpu/ivybridge/early_me.c index 612c9103e3..f0d6899006 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 3e5be4e0a0..e23c422cd0 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; diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index c70183ccef..76cdf47509 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -45,6 +45,15 @@ enum { GDT_BASE_HIGH_MASK = 0xf, }; +/* + * System controllers in an x86 system. We mostly need to just find these and + * use them on PCI. At some point these might have their own uclass. + */ +enum { + X86_NONE, + X86_SYSCON_ME, /* Intel Management Engine */ +}; + struct cpuid_result { uint32_t eax; uint32_t ebx; |