Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/40476 )
Change subject: mb/google/dedede: Enable camera support for waddledoo ......................................................................
mb/google/dedede: Enable camera support for waddledoo
BUG=None BRANCH=None TEST=Build and Boot waddledoo board and able to capture image using world facing camera.
Change-Id: I51dcf96a82535fc1e0b9247fd52af919885575e5 Signed-off-by: Pandya, Varshit B varshit.b.pandya@intel.com Reviewed-on: https://review.coreboot.org/c/coreboot/+/40476 Tested-by: build bot (Jenkins) no-reply@coreboot.org Reviewed-by: Aamir Bohra aamir.bohra@intel.com Reviewed-by: Karthik Ramasubramanian kramasub@google.com --- M src/mainboard/google/dedede/Kconfig M src/mainboard/google/dedede/Kconfig.name M src/mainboard/google/dedede/dsdt.asl M src/mainboard/google/dedede/variants/baseboard/gpio.c A src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/camera.asl 5 files changed, 22 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Aamir Bohra: Looks good to me, but someone else must approve Karthik Ramasubramanian: Looks good to me, approved
diff --git a/src/mainboard/google/dedede/Kconfig b/src/mainboard/google/dedede/Kconfig index 3743908..85dbc38e 100644 --- a/src/mainboard/google/dedede/Kconfig +++ b/src/mainboard/google/dedede/Kconfig @@ -80,4 +80,10 @@ default "waddledee" if BOARD_GOOGLE_WADDLEDEE default "wheelie" if BOARD_GOOGLE_WHEELIE
+config VARIANT_HAS_CAMERA_ACPI + bool + default n + help + Select this option to enable camera ACPI support on the variant. + endif #BOARD_GOOGLE_BASEBOARD_DEDEDE diff --git a/src/mainboard/google/dedede/Kconfig.name b/src/mainboard/google/dedede/Kconfig.name index cf9298c..25ad61f 100644 --- a/src/mainboard/google/dedede/Kconfig.name +++ b/src/mainboard/google/dedede/Kconfig.name @@ -11,6 +11,7 @@ select BOARD_ROMSIZE_KB_32768 select DRIVERS_GENERIC_MAX98357A select DRIVERS_I2C_DA7219 + select VARIANT_HAS_CAMERA_ACPI
config BOARD_GOOGLE_WADDLEDEE bool "Waddledee" diff --git a/src/mainboard/google/dedede/dsdt.asl b/src/mainboard/google/dedede/dsdt.asl index 98ef6e4..f7bb6b9 100644 --- a/src/mainboard/google/dedede/dsdt.asl +++ b/src/mainboard/google/dedede/dsdt.asl @@ -34,6 +34,11 @@ } }
+#if CONFIG(VARIANT_HAS_CAMERA_ACPI) + /* Camera */ + #include <variant/acpi/camera.asl> +#endif + /* Chrome OS specific */ #include <vendorcode/google/chromeos/acpi/chromeos.asl>
diff --git a/src/mainboard/google/dedede/variants/baseboard/gpio.c b/src/mainboard/google/dedede/variants/baseboard/gpio.c index a4ce97d..b09d6c1 100644 --- a/src/mainboard/google/dedede/variants/baseboard/gpio.c +++ b/src/mainboard/google/dedede/variants/baseboard/gpio.c @@ -170,13 +170,13 @@ /* D11 : GPP_D11/GSPI2_MOSI/UART0A_CTSB */ PAD_NC(GPP_D11, NONE), /* D12 : WCAM_RST_L */ - PAD_NC(GPP_D12, NONE), + PAD_CFG_GPO(GPP_D12, 0, PLTRST), /* D13 : EN_PP2800_CAMERA */ - PAD_NC(GPP_D13, NONE), + PAD_CFG_GPO(GPP_D13, 0, PLTRST), /* D14 : EN_PP1200_CAMERA */ - PAD_NC(GPP_D14, NONE), + PAD_CFG_GPO(GPP_D14, 0, PLTRST), /* D15 : UCAM_RST_L */ - PAD_NC(GPP_D15, NONE), + PAD_CFG_GPO(GPP_D15, 0, PLTRST), /* D16 : HP_INT_ODL */ PAD_CFG_GPI_INT(GPP_D16, NONE, PLTRST, EDGE_BOTH), /* D17 : EN_SPK */ @@ -195,11 +195,11 @@ PAD_NC(GPP_D23, NONE),
/* E0 : CLK_24M_UCAM */ - PAD_NC(GPP_E0, NONE), + PAD_CFG_NF(GPP_E0, NONE, DEEP, NF2), /* E1 : EMR_RESET_L */ PAD_NC(GPP_E1, NONE), /* E2 : CLK_24M_WCAM */ - PAD_NC(GPP_E2, NONE), + PAD_CFG_NF(GPP_E2, NONE, DEEP, NF1), /* E3 : GPP_E3/SATA_0_DEVSLP */ PAD_NC(GPP_E3, NONE), /* E4 : IMGCLKOUT_2 */ diff --git a/src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/camera.asl b/src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/camera.asl new file mode 100644 index 0000000..304c0fe --- /dev/null +++ b/src/mainboard/google/dedede/variants/waddledoo/include/variant/acpi/camera.asl @@ -0,0 +1,4 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* This file is part of the coreboot project. */ + +#include <baseboard/acpi/camera.asl>