diff options
| author | Matt DeVillier <matt.devillier@gmail.com> | 2020-03-27 12:13:41 -0500 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2020-03-31 10:51:33 +0000 |
| commit | 6343cd846a55b228f08843e07c75f48aeadede0a (patch) | |
| tree | b932c992f7e1f69074cbc9b48d9a8eaf4cea534b /src | |
| parent | 14cf3245fe0a3ff362712527492328a9fe055c6f (diff) | |
drivers/intel/gma: fold gma.asl into default_brightness_levels.asl
Including gma.asl at the platform level (vs the board level)
means that even desktop boards need to include the default
brightness levels, which makes no sense. To begin to clean this up,
include gma.asl in default_brightness_levels.asl (as well as
the handful of board-specific brightness files) and remove it
from the various platforms.
A follow-on commit will remove default_brightness_levels.asl
from all boards which lack an internal display.
Change-Id: I8063deeef4ab6d6ab34ed9b0be5b1d541d6e9b6b
Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/39878
Reviewed-by: Benjamin Doron <benjamin.doron00@gmail.com>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src')
8 files changed, 6 insertions, 15 deletions
diff --git a/src/drivers/intel/gma/acpi/default_brightness_levels.asl b/src/drivers/intel/gma/acpi/default_brightness_levels.asl index 6c6f35ee28..b584c0925a 100644 --- a/src/drivers/intel/gma/acpi/default_brightness_levels.asl +++ b/src/drivers/intel/gma/acpi/default_brightness_levels.asl @@ -1,3 +1,5 @@ +#include "gma.asl" + Scope (GFX0) { Name (BRIG, Package (0x12) diff --git a/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl b/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl index 70732c8d6e..b92589a075 100644 --- a/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl +++ b/src/mainboard/roda/rv11/variants/rv11/include/acpi/brightness_levels.asl @@ -11,6 +11,8 @@ * GNU General Public License for more details. */ +#include <drivers/intel/gma/acpi/gma.asl> + Scope (GFX0) { Name (BRIG, Package (13) diff --git a/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl b/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl index 52a456815a..506de019a5 100644 --- a/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl +++ b/src/mainboard/roda/rv11/variants/rw11/include/acpi/brightness_levels.asl @@ -11,6 +11,8 @@ * GNU General Public License for more details. */ +#include <drivers/intel/gma/acpi/gma.asl> + Scope (GFX0) { Name (BRIG, Package (13) diff --git a/src/northbridge/intel/gm45/acpi/gm45.asl b/src/northbridge/intel/gm45/acpi/gm45.asl index 8a30212d1d..576ab96bb6 100644 --- a/src/northbridge/intel/gm45/acpi/gm45.asl +++ b/src/northbridge/intel/gm45/acpi/gm45.asl @@ -73,6 +73,3 @@ Device (PDRC) // PCIe graphics port 0:1.0 #include "peg.asl" - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/haswell/acpi/haswell.asl b/src/northbridge/intel/haswell/acpi/haswell.asl index 900c6c3396..03b17ab6da 100644 --- a/src/northbridge/intel/haswell/acpi/haswell.asl +++ b/src/northbridge/intel/haswell/acpi/haswell.asl @@ -46,6 +46,3 @@ Device (PDRC) Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/ironlake/acpi/ironlake.asl b/src/northbridge/intel/ironlake/acpi/ironlake.asl index 2997dea951..61db605698 100644 --- a/src/northbridge/intel/ironlake/acpi/ironlake.asl +++ b/src/northbridge/intel/ironlake/acpi/ironlake.asl @@ -49,6 +49,3 @@ Device (PDRC) Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl index 202671a3e5..2dd5c00f31 100644 --- a/src/northbridge/intel/sandybridge/acpi/sandybridge.asl +++ b/src/northbridge/intel/sandybridge/acpi/sandybridge.asl @@ -53,6 +53,3 @@ Device (PDRC) Return(PDRS) } } - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> diff --git a/src/northbridge/intel/x4x/acpi/x4x.asl b/src/northbridge/intel/x4x/acpi/x4x.asl index 09849e3b17..947b67865b 100644 --- a/src/northbridge/intel/x4x/acpi/x4x.asl +++ b/src/northbridge/intel/x4x/acpi/x4x.asl @@ -43,6 +43,3 @@ Device (PDRC) // PCIe graphics port 0:1.0 #include "peg.asl" - -// Integrated graphics 0:2.0 -#include <drivers/intel/gma/acpi/gma.asl> |