From 1b940d17a898aab3f5891c2c5c94d5881108ba07 Mon Sep 17 00:00:00 2001 From: Daniel Kang Date: Mon, 26 Oct 2020 12:43:52 -0700 Subject: mb/google/volteer: Remove RIPTO support for camera GPIO D4 was used for camera reset for both front and rear cameras (RCAM_RST_L/FCAM_RST_L) in RIPTO. For later volteer versions, GPIO F15 is dedicated to the rear camera reset (RCAM_RST_L). Before, BOARD_GOOGLE_VOLTEER flag was used for setting the right RCAM_RST_L per volteer version. However, we don't support RIPTO anymore. Also using flags for different volteer version support can be error-prone. Removing RIPTO support. BUG=b:171726823 BRANCH=none TEST=Build and boot volteer proto2 or later version. Camera should work without an issue. Signed-off-by: Daniel Kang Change-Id: I961fc17092887b4807c12c95f7139bb7e7b33e91 Reviewed-on: https://review.coreboot.org/c/coreboot/+/46826 Reviewed-by: Angel Pons Reviewed-by: Tim Wawrzynczak Tested-by: build bot (Jenkins) --- .../baseboard/include/baseboard/acpi/mipi_camera.asl | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl index 38cf14a80d..d0d1c2862a 100644 --- a/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl +++ b/src/mainboard/google/volteer/variants/baseboard/include/baseboard/acpi/mipi_camera.asl @@ -157,11 +157,7 @@ Scope (\_SB.PCI0.I2C3) MCON(3,1) /* Clock 3, 19.2MHz */ /* Pull RST low */ -#if CONFIG(BOARD_GOOGLE_VOLTEER) CTXS(GPP_F15) -#else - CTXS(GPP_D4) -#endif /* Pull SNRPWR_EN high */ STXS(GPP_H14) @@ -176,11 +172,8 @@ Scope (\_SB.PCI0.I2C3) REFC++ /* Pull RST high */ -#if CONFIG(BOARD_GOOGLE_VOLTEER) STXS(GPP_F15) -#else - STXS(GPP_D4) -#endif + Sleep(1) /* t2 */ STA = 1 @@ -192,11 +185,7 @@ Scope (\_SB.PCI0.I2C3) MCOF(3) /* Clock 3 */ /* Pull RST low */ -#if CONFIG(BOARD_GOOGLE_VOLTEER) CTXS(GPP_F15) -#else - CTXS(GPP_D4) -#endif If (REFC == 1) { -- cgit v1.2.3