summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/generic/max98357a/max98357a.c9
-rw-r--r--src/drivers/i2c/nau8825/nau8825.c14
2 files changed, 13 insertions, 10 deletions
diff --git a/src/drivers/generic/max98357a/max98357a.c b/src/drivers/generic/max98357a/max98357a.c
index 0d522d45c0..25e5104129 100644
--- a/src/drivers/generic/max98357a/max98357a.c
+++ b/src/drivers/generic/max98357a/max98357a.c
@@ -32,6 +32,7 @@ static void max98357a_fill_ssdt(struct device *dev)
{
struct drivers_generic_max98357a_config *config = dev->chip_info;
const char *path;
+ struct acpi_dp *dp;
if (!dev->enabled || !config)
return;
@@ -51,12 +52,12 @@ static void max98357a_fill_ssdt(struct device *dev)
acpigen_write_resourcetemplate_footer();
/* _DSD for devicetree properties */
- acpi_dp_write_header();
/* This points to the first pin in the first gpio entry in _CRS */
path = acpi_device_path(dev);
- acpi_dp_write_gpio("sdmode-gpio", path, 0, 0, 0);
- acpi_dp_write_integer("sdmode-delay", config->sdmode_delay);
- acpi_dp_write_footer();
+ dp = acpi_dp_new_table("_DSD");
+ acpi_dp_add_gpio(dp, "sdmode-gpio", path, 0, 0, 0);
+ acpi_dp_add_integer(dp, "sdmode-delay", config->sdmode_delay);
+ acpi_dp_write(dp);
acpigen_pop_len(); /* Device */
acpigen_pop_len(); /* Scope */
diff --git a/src/drivers/i2c/nau8825/nau8825.c b/src/drivers/i2c/nau8825/nau8825.c
index 71aaceaf15..a86eff41f3 100644
--- a/src/drivers/i2c/nau8825/nau8825.c
+++ b/src/drivers/i2c/nau8825/nau8825.c
@@ -28,7 +28,9 @@
#define NAU8825_ACPI_NAME "NAU8"
#define NAU8825_ACPI_HID "10508825"
-#define NAU8825_DP_INT(key,val) acpi_dp_write_integer("nuvoton," key, (val))
+
+#define NAU8825_DP_INT(key,val) \
+ acpi_dp_add_integer(dp, "nuvoton," key, (val))
static void nau8825_fill_ssdt(struct device *dev)
{
@@ -40,6 +42,7 @@ static void nau8825_fill_ssdt(struct device *dev)
.speed = config->bus_speed ? : I2C_SPEED_FAST,
.resource = scope,
};
+ struct acpi_dp *dp = NULL;
if (!dev->enabled || !scope)
return;
@@ -62,7 +65,7 @@ static void nau8825_fill_ssdt(struct device *dev)
acpigen_write_resourcetemplate_footer();
/* Device Properties */
- acpi_dp_write_header();
+ dp = acpi_dp_new_table("_DSD");
NAU8825_DP_INT("jkdet-enable", config->jkdet_enable);
NAU8825_DP_INT("jkdet-pull-enable", config->jkdet_pull_enable);
NAU8825_DP_INT("jkdet-pull-up", config->jkdet_pull_up);
@@ -77,10 +80,9 @@ static void nau8825_fill_ssdt(struct device *dev)
NAU8825_DP_INT("jack-insert-debounce", config->jack_insert_debounce);
NAU8825_DP_INT("jack-eject-deboune", config->jack_eject_debounce);
NAU8825_DP_INT("sar-threshold-num", config->sar_threshold_num);
- acpi_dp_write_integer_array("nuvoton,sar-threshold",
- config->sar_threshold,
- config->sar_threshold_num);
- acpi_dp_write_footer();
+ acpi_dp_add_integer_array(dp, "nuvoton,sar-threshold",
+ config->sar_threshold, config->sar_threshold_num);
+ acpi_dp_write(dp);
acpigen_pop_len(); /* Device */
acpigen_pop_len(); /* Scope */