gma: Consolidate Intel IGD ACPI code some more
Consolidate some common (and mostly broken) code. Will try to fix things
in separate commits.
Maybe, igd.asl taken from gm45 (the non-PCH case) could also be used for
i945 and sch. But this needs further investigation.
Change-Id: Id3663bf588458e1e71920b96a3149f96947921e9
Signed-off-by: Nico Huber <nico.huber@secunet.com>
Reviewed-on: http://review.coreboot.org/11702
Reviewed-by: Vladimir Serbinenko <phcoder@gmail.com>
Tested-by: build bot (Jenkins)
diff --git a/src/drivers/intel/gma/igd.asl b/src/drivers/intel/gma/acpi/common.asl
similarity index 100%
rename from src/drivers/intel/gma/igd.asl
rename to src/drivers/intel/gma/acpi/common.asl
diff --git a/src/northbridge/intel/gm45/acpi/igd.asl b/src/drivers/intel/gma/acpi/non-pch.asl
similarity index 96%
rename from src/northbridge/intel/gm45/acpi/igd.asl
rename to src/drivers/intel/gma/acpi/non-pch.asl
index 696cc2b..4c9e1ed 100644
--- a/src/northbridge/intel/gm45/acpi/igd.asl
+++ b/src/drivers/intel/gma/acpi/non-pch.asl
@@ -73,5 +73,5 @@
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
-#include <drivers/intel/gma/igd.asl>
+#include "common.asl"
}
diff --git a/src/northbridge/intel/sandybridge/acpi/igd.asl b/src/drivers/intel/gma/acpi/pch.asl
similarity index 96%
rename from src/northbridge/intel/sandybridge/acpi/igd.asl
rename to src/drivers/intel/gma/acpi/pch.asl
index 6b02765..70ab6f6 100644
--- a/src/northbridge/intel/sandybridge/acpi/igd.asl
+++ b/src/drivers/intel/gma/acpi/pch.asl
@@ -74,5 +74,5 @@
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
-#include <drivers/intel/gma/igd.asl>
+#include "common.asl"
}
diff --git a/src/northbridge/intel/gm45/acpi/gm45.asl b/src/northbridge/intel/gm45/acpi/gm45.asl
index 5181866..8885f0e 100644
--- a/src/northbridge/intel/gm45/acpi/gm45.asl
+++ b/src/northbridge/intel/gm45/acpi/gm45.asl
@@ -79,4 +79,4 @@
#include "peg.asl"
// Integrated graphics 0:2.0
-#include "igd.asl"
+#include <drivers/intel/gma/acpi/non-pch.asl>
diff --git a/src/northbridge/intel/haswell/acpi/haswell.asl b/src/northbridge/intel/haswell/acpi/haswell.asl
index b9e2c8a..0d4f923 100644
--- a/src/northbridge/intel/haswell/acpi/haswell.asl
+++ b/src/northbridge/intel/haswell/acpi/haswell.asl
@@ -51,4 +51,4 @@
}
// Integrated graphics 0:2.0
-#include "igd.asl"
+#include <drivers/intel/gma/acpi/pch.asl>
diff --git a/src/northbridge/intel/haswell/acpi/igd.asl b/src/northbridge/intel/haswell/acpi/igd.asl
deleted file mode 100644
index df8a389..0000000
--- a/src/northbridge/intel/haswell/acpi/igd.asl
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-Device (GFX0)
-{
- Name (_ADR, 0x00020000)
-
- OperationRegion (GFXC, PCI_Config, 0x00, 0x0100)
- Field (GFXC, DWordAcc, NoLock, Preserve)
- {
- Offset (0x10),
- BAR0, 64
- }
-
- OperationRegion (GFRG, SystemMemory, And(BAR0, 0xfffffffffffffff0), 0x400000)
- Field (GFRG, DWordAcc, NoLock, Preserve)
- {
- Offset (0x48254),
- BCLV, 16,
- Offset (0xc8250),
- CR1, 32,
- CR2, 32
- }
-
- Name (BRIG, Package (0x12)
- {
- 0x61,
- 0x61,
- 0x2,
- 0x4,
- 0x5,
- 0x7,
- 0x9,
- 0xb,
- 0xd,
- 0x11,
- 0x14,
- 0x17,
- 0x1c,
- 0x20,
- 0x27,
- 0x31,
- 0x41,
- 0x61,
- })
-
- Method (XBCM, 1, NotSerialized)
- {
- Store (ShiftLeft (Arg0, 4), BCLV)
- Store (0x80000000, CR1)
- Store (0x061a061a, CR2)
- }
-
- Method (XBQC, 0, NotSerialized)
- {
- Store (BCLV, Local0)
- ShiftRight (Local0, 4, Local0)
- Return (Local0)
- }
-#include <drivers/intel/gma/igd.asl>
-}
diff --git a/src/northbridge/intel/i945/acpi/igd.asl b/src/northbridge/intel/i945/acpi/igd.asl
index fb89e55..079d3ab 100644
--- a/src/northbridge/intel/i945/acpi/igd.asl
+++ b/src/northbridge/intel/i945/acpi/igd.asl
@@ -58,7 +58,7 @@
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
-#include <drivers/intel/gma/igd.asl>
+#include <drivers/intel/gma/acpi/common.asl>
}
Device (DSPC)
@@ -70,4 +70,4 @@
Offset (0xf4),
BRTC, 8
}
-}
\ No newline at end of file
+}
diff --git a/src/northbridge/intel/nehalem/acpi/igd.asl b/src/northbridge/intel/nehalem/acpi/igd.asl
deleted file mode 100644
index df8a389..0000000
--- a/src/northbridge/intel/nehalem/acpi/igd.asl
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * This file is part of the coreboot project.
- *
- * Copyright (C) 2007-2009 coresystems GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc.
- */
-
-Device (GFX0)
-{
- Name (_ADR, 0x00020000)
-
- OperationRegion (GFXC, PCI_Config, 0x00, 0x0100)
- Field (GFXC, DWordAcc, NoLock, Preserve)
- {
- Offset (0x10),
- BAR0, 64
- }
-
- OperationRegion (GFRG, SystemMemory, And(BAR0, 0xfffffffffffffff0), 0x400000)
- Field (GFRG, DWordAcc, NoLock, Preserve)
- {
- Offset (0x48254),
- BCLV, 16,
- Offset (0xc8250),
- CR1, 32,
- CR2, 32
- }
-
- Name (BRIG, Package (0x12)
- {
- 0x61,
- 0x61,
- 0x2,
- 0x4,
- 0x5,
- 0x7,
- 0x9,
- 0xb,
- 0xd,
- 0x11,
- 0x14,
- 0x17,
- 0x1c,
- 0x20,
- 0x27,
- 0x31,
- 0x41,
- 0x61,
- })
-
- Method (XBCM, 1, NotSerialized)
- {
- Store (ShiftLeft (Arg0, 4), BCLV)
- Store (0x80000000, CR1)
- Store (0x061a061a, CR2)
- }
-
- Method (XBQC, 0, NotSerialized)
- {
- Store (BCLV, Local0)
- ShiftRight (Local0, 4, Local0)
- Return (Local0)
- }
-#include <drivers/intel/gma/igd.asl>
-}
diff --git a/src/northbridge/intel/nehalem/acpi/nehalem.asl b/src/northbridge/intel/nehalem/acpi/nehalem.asl
index 4e1a593..bb9d78d 100644
--- a/src/northbridge/intel/nehalem/acpi/nehalem.asl
+++ b/src/northbridge/intel/nehalem/acpi/nehalem.asl
@@ -55,4 +55,4 @@
}
// Integrated graphics 0:2.0
-#include "igd.asl"
+#include <drivers/intel/gma/acpi/pch.asl>
diff --git a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
index 742b0f1..5aafcc1 100644
--- a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
+++ b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl
@@ -55,4 +55,4 @@
}
// Integrated graphics 0:2.0
-#include "igd.asl"
+#include <drivers/intel/gma/acpi/pch.asl>
diff --git a/src/northbridge/intel/sch/acpi/igd.asl b/src/northbridge/intel/sch/acpi/igd.asl
index 696cc2b..dfb567b 100644
--- a/src/northbridge/intel/sch/acpi/igd.asl
+++ b/src/northbridge/intel/sch/acpi/igd.asl
@@ -73,5 +73,5 @@
ShiftRight (Local0, 4, Local0)
Return (Local0)
}
-#include <drivers/intel/gma/igd.asl>
+#include <drivers/intel/gma/acpi/common.asl>
}