[coreboot-gerrit] [XS] Change in coreboot[main]: drivers/intel/mipi_camera: Only generate ADR if no HID supplied

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/87248?usp=email )

Change subject: drivers/intel/mipi_camera: Only generate ADR if no HID supplied
......................................................................

drivers/intel/mipi_camera: Only generate ADR if no HID supplied

It's an ACPI spec violation for a device to have both an _ADR and
a _HID method, so prefer the latter if a HID value is specified
via the chip registers.

Change-Id: I5d84dbea52595e61df56a5ff779d5e0ee0d84bdf
Signed-off-by: Matt DeVillier 
---
M src/drivers/intel/mipi_camera/camera.c
1 file changed, 2 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/48/87248/1

diff --git a/src/drivers/intel/mipi_camera/camera.c b/src/drivers/intel/mipi_camera/camera.c
index 63a409a..bf457f5 100644
--- a/src/drivers/intel/mipi_camera/camera.c
+++ b/src/drivers/intel/mipi_camera/camera.c
@@ -844,14 +844,13 @@
    	acpigen_pop_len(); /* Power Resource */
    }

-	if (config->device_type == INTEL_ACPI_CAMERA_SENSOR)
-		acpigen_write_name_integer("_ADR", 0);
-
    if (config->acpi_hid)
    	acpigen_write_name_string("_HID", config->acpi_hid);
    else if (config->device_type == INTEL_ACPI_CAMERA_VCM ||
    	 config->device_type == INTEL_ACPI_CAMERA_NVM)
    	acpigen_write_name_string("_HID", ACPI_DT_NAMESPACE_HID);
+	else if (config->device_type == INTEL_ACPI_CAMERA_SENSOR)
+		acpigen_write_name_integer("_ADR", 0);

acpigen_write_name_integer("_UID", config->acpi_uid);
    acpigen_write_name_string("_DDN", config->chip_name);