Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

x86: ivybridge: Use syscon for the GMA device

Browse source 
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 <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
This commit is contained in:
Simon Glass 2016-01-17 16:11:59 -07:00 committed by Bin Meng
parent 98655f3a8d
commit 25d5352c71
6 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/x86/cpu/ivybridge/bd82x6x.c
View file

@ -9,6 +9,8 @@
#include <fdtdec.h>
#include <malloc.h>
#include <pch.h>
#include <syscon.h>
#include <asm/cpu.h>
#include <asm/io.h>
#include <asm/lapic.h>
#include <asm/pci.h>
@ -149,8 +151,7 @@ void pch_iobp_update(struct udevice *dev, u32 address, u32 andvalue,
static int bd82x6x_probe(struct udevice *dev)
{
const void *blob = gd->fdt_blob;
int gma_node;
struct udevice *gma_dev;
int ret;
if (!(gd->flags & GD_FLG_RELOC))
@ -159,15 +160,10 @@ static int bd82x6x_probe(struct udevice *dev)
/* Cause the SATA device to do its init */
uclass_first_device(UCLASS_DISK, &dev);
gma_node = fdtdec_next_compatible(blob, 0, COMPAT_INTEL_GMA);
if (gma_node < 0) {
debug("%s: Cannot find GMA node\n", __func__);
return -EINVAL;
}
ret = dm_pci_bus_find_bdf(PCH_VIDEO_DEV, &dev);
ret = syscon_get_by_driver_data(X86_SYSCON_GMA, &gma_dev);
if (ret)
return ret;
ret = gma_func0_init(dev, blob, gma_node);
ret = gma_func0_init(gma_dev);
if (ret)
return ret;

1
arch/x86/cpu/ivybridge/early_me.c
View file

@ -191,6 +191,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", .data = X86_SYSCON_ME },
{ .compatible = "intel,gma", .data = X86_SYSCON_GMA },
{ }
};

8
arch/x86/cpu/ivybridge/gma.c
View file

@ -538,8 +538,10 @@ static int gma_pm_init_pre_vbios(void *gtt_bar, int rev)
return 0;
}
int gma_pm_init_post_vbios(int rev, void *gtt_bar, const void *blob, int node)
int gma_pm_init_post_vbios(struct udevice *dev, int rev, void *gtt_bar)
{
const void *blob = gd->fdt_blob;
int node = dev->of_offset;
u32 reg32, cycle_delay;
debug("GT Power Management Init (post VBIOS)\n");
@ -794,7 +796,7 @@ void sandybridge_setup_graphics(struct udevice *dev, struct udevice *video_dev)
writel(reg32, MCHBAR_REG(0x5418));
}
int gma_func0_init(struct udevice *dev, const void *blob, int node)
int gma_func0_init(struct udevice *dev)
{
#ifdef CONFIG_VIDEO
ulong start;
@ -839,7 +841,7 @@ int gma_func0_init(struct udevice *dev, const void *blob, int node)
debug("BIOS ran in %lums\n", get_timer(start));
#endif
/* Post VBIOS init */
ret = gma_pm_init_post_vbios(rev, gtt_bar, blob, node);
ret = gma_pm_init_post_vbios(dev, rev, gtt_bar);
if (ret)
return ret;

3
arch/x86/dts/chromebook_link.dts
View file

@ -209,7 +209,8 @@
u-boot,dm-pre-reloc;
};
gma {
gma@2,0 {
reg = <0x00001000 0 0 0 0>;
compatible = "intel,gma";
intel,dp_hotplug = <0 0 0x06>;
intel,panel-port-select = <1>;

2
arch/x86/include/asm/arch-ivybridge/bd82x6x.h
View file

@ -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

4
arch/x86/include/asm/cpu.h
View file

@ -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 {