From 6d0c7bc77a7aa7693ece6b44fc41dbae08a12881 Mon Sep 17 00:00:00 2001 From: Furquan Shaikh Date: Tue, 21 Nov 2017 22:25:14 -0800 Subject: [PATCH] mb/google/poppy: Add variant support for camera asl This change adds infrastructure to allow variants to define their own camera.asl file. - Poppy and soraka use the one provided by baseboard. - Dummy file is added for nautilus since it does not have camera support enabled yet. TEST=Verified that DSDT table remains the same with and without this change. Change-Id: I0f0b489e74739aa4708283d58d8b7626b77a89a3 Signed-off-by: Furquan Shaikh Reviewed-on: https://review.coreboot.org/22558 Tested-by: build bot (Jenkins) Reviewed-by: shkim Reviewed-by: Aaron Durbin --- src/mainboard/google/poppy/dsdt.asl | 5 ++--- .../baseboard/include/baseboard/acpi/camera.asl | 17 +++++++++++++++++ .../include/baseboard}/acpi/ipu_mainboard.asl | 0 .../include/baseboard}/acpi/mipi_camera.asl | 0 .../nautilus/include/variant/acpi/camera.asl | 16 ++++++++++++++++ .../poppy/include/variant/acpi/camera.asl | 16 ++++++++++++++++ .../soraka/include/variant/acpi/camera.asl | 16 ++++++++++++++++ 7 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl rename src/mainboard/google/poppy/{ => variants/baseboard/include/baseboard}/acpi/ipu_mainboard.asl (100%) rename src/mainboard/google/poppy/{ => variants/baseboard/include/baseboard}/acpi/mipi_camera.asl (100%) create mode 100644 src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl create mode 100644 src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl create mode 100644 src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl diff --git a/src/mainboard/google/poppy/dsdt.asl b/src/mainboard/google/poppy/dsdt.asl index b7a8c94bb4..ec45247b08 100644 --- a/src/mainboard/google/poppy/dsdt.asl +++ b/src/mainboard/google/poppy/dsdt.asl @@ -49,9 +49,8 @@ DefinitionBlock( } } - /* MIPI camera */ - #include "acpi/ipu_mainboard.asl" - #include "acpi/mipi_camera.asl" + /* Camera */ + #include /* Chrome OS specific */ #include diff --git a/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl new file mode 100644 index 0000000000..78f91080fc --- /dev/null +++ b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/camera.asl @@ -0,0 +1,17 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2017 Google Inc. + * + * 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. + */ + +#include "ipu_mainboard.asl" +#include "mipi_camera.asl" diff --git a/src/mainboard/google/poppy/acpi/ipu_mainboard.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/ipu_mainboard.asl similarity index 100% rename from src/mainboard/google/poppy/acpi/ipu_mainboard.asl rename to src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/ipu_mainboard.asl diff --git a/src/mainboard/google/poppy/acpi/mipi_camera.asl b/src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/mipi_camera.asl similarity index 100% rename from src/mainboard/google/poppy/acpi/mipi_camera.asl rename to src/mainboard/google/poppy/variants/baseboard/include/baseboard/acpi/mipi_camera.asl diff --git a/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl new file mode 100644 index 0000000000..cc0c56c75f --- /dev/null +++ b/src/mainboard/google/poppy/variants/nautilus/include/variant/acpi/camera.asl @@ -0,0 +1,16 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google Inc. + * + * 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. + */ + +/* Dummy file until camera support is added. */ diff --git a/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl new file mode 100644 index 0000000000..45522f98c1 --- /dev/null +++ b/src/mainboard/google/poppy/variants/poppy/include/variant/acpi/camera.asl @@ -0,0 +1,16 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google Inc. + * + * 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. + */ + +#include diff --git a/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl new file mode 100644 index 0000000000..45522f98c1 --- /dev/null +++ b/src/mainboard/google/poppy/variants/soraka/include/variant/acpi/camera.asl @@ -0,0 +1,16 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2017 Google Inc. + * + * 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. + */ + +#include