summaryrefslogtreecommitdiff
path: root/src/soc
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2016-07-02 19:56:06 -0700
committerMartin Roth <martinroth@google.com>2016-07-08 17:21:26 +0200
commitffc9990ece4c6a2148ba0a43de85f1b8ac9343ee (patch)
tree62472776e98aca78ef393348e61836e8fb1368e7 /src/soc
parent9217f9def0fa1282fc2b510ac143c751a055dee2 (diff)
acpi: Change device properties to work as a tree
There is a second ACPI _DSD document from the UEFI Forum that details how _DSD style tables can be nested, creating a tree of similarly formatted tables. This document is linked from acpi_device.h. In order to support this the device property interface needs to be more flexible and build up a tree of properties to write all entries at once instead of writing each entry as it is generated. In the end this is a more flexible solution that can support drivers that need child tables like the DA7219 codec, while only requiring minor changes to the existing drivers that use the device property interface. This was tested on reef (apollolake) and chell (skylake) boards to ensure that there was no change in the generated SSDT AML. Change-Id: Ia22e3a5fd3982ffa7c324bee1a8d190d49f853dd Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/15537 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
Diffstat (limited to 'src/soc')
-rw-r--r--src/soc/intel/skylake/sd.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/soc/intel/skylake/sd.c b/src/soc/intel/skylake/sd.c
index 80adb9c467..a75cf635d3 100644
--- a/src/soc/intel/skylake/sd.c
+++ b/src/soc/intel/skylake/sd.c
@@ -38,6 +38,7 @@ static void sd_fill_ssdt(struct device *dev)
.pin_count = 1,
.pins = { config->sdcard_cd_gpio_default }
};
+ struct acpi_dp *dp;
if (!dev->enabled)
return;
@@ -62,9 +63,9 @@ static void sd_fill_ssdt(struct device *dev)
acpigen_write_resourcetemplate_footer();
/* Bind the cd-gpio name to the GpioInt() resource */
- acpi_dp_write_header();
- acpi_dp_write_gpio("cd-gpio", path, 0, 0, 1);
- acpi_dp_write_footer();
+ dp = acpi_dp_new_table("_DSD");
+ acpi_dp_add_gpio(dp, "cd-gpio", path, 0, 0, 1);
+ acpi_dp_write(dp);
acpigen_pop_len();
}