From 25d5352c71dcc599030a4a764d8087185ed537d3 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 17 Jan 2016 16:11:59 -0700 Subject: x86: ivybridge: Use syscon for the GMA device Until we have a proper video uclass we can use syscon to handle the GMA device, and avoid the special device tree and PCI searching. Update the code to work this way. Signed-off-by: Simon Glass Reviewed-by: Bin Meng --- arch/x86/include/asm/arch-ivybridge/bd82x6x.h | 2 +- arch/x86/include/asm/cpu.h | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'arch/x86/include') diff --git a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h b/arch/x86/include/asm/arch-ivybridge/bd82x6x.h index 2607da63ea..e866580046 100644 --- a/arch/x86/include/asm/arch-ivybridge/bd82x6x.h +++ b/arch/x86/include/asm/arch-ivybridge/bd82x6x.h @@ -7,6 +7,6 @@ #ifndef _ASM_ARCH_BD82X6X_H #define _ASM_ARCH_BD82X6X_H -int gma_func0_init(struct udevice *dev, const void *blob, int node); +int gma_func0_init(struct udevice *dev); #endif diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index 76cdf47509..18b0345986 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h @@ -47,11 +47,13 @@ enum { /* * 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. + * use them on PCI. At some point these might have their own uclass (e.g. + * UCLASS_VIDEO for the GMA device). */ enum { X86_NONE, X86_SYSCON_ME, /* Intel Management Engine */ + X86_SYSCON_GMA, /* Intel Graphics Media Accelerator */ }; struct cpuid_result { -- cgit v1.2.1