projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot
[platform/kernel/u-boot.git]
/
arch
/
x86
/
cpu
/
queensbay
/
tnc.c
diff --git
a/arch/x86/cpu/queensbay/tnc.c
b/arch/x86/cpu/queensbay/tnc.c
index
d27b2d9
..
0c02a44
100644
(file)
--- a/
arch/x86/cpu/queensbay/tnc.c
+++ b/
arch/x86/cpu/queensbay/tnc.c
@@
-23,9
+23,18
@@
static void unprotect_spi_flash(void)
x86_pci_write_config32(TNC_LPC, 0xd8, bc);
}
x86_pci_write_config32(TNC_LPC, 0xd8, bc);
}
+static void __maybe_unused disable_igd(void)
+{
+ u32 gc;
+
+ gc = x86_pci_read_config32(TNC_IGD, IGD_GC);
+ gc &= ~GMS_MASK;
+ gc |= VGA_DISABLE;
+ x86_pci_write_config32(TNC_IGD, IGD_GC, gc);
+}
+
int arch_cpu_init(void)
{
int arch_cpu_init(void)
{
- struct pci_controller *hose;
int ret;
post_code(POST_CPU_INIT);
int ret;
post_code(POST_CPU_INIT);
@@
-37,11
+46,14
@@
int arch_cpu_init(void)
if (ret)
return ret;
if (ret)
return ret;
- ret = pci_early_init_hose(&hose);
- if (ret)
- return ret;
+ return 0;
+}
- unprotect_spi_flash();
+int arch_early_init_r(void)
+{
+#ifdef CONFIG_DISABLE_IGD
+ disable_igd();
+#endif
return 0;
}
return 0;
}
@@
-85,7
+97,7
@@
void cpu_irq_init(void)
int arch_misc_init(void)
{
int arch_misc_init(void)
{
-
pirq_init
();
+
unprotect_spi_flash
();
- return
0
;
+ return
pirq_init()
;
}
}