From 1c43d92efc004795e4f2198d19414b07c082ccd1 Mon Sep 17 00:00:00 2001
From: Zanxi Chen <chenzanxi@huaqin.corp-partner.google.com>
Date: Thu, 10 Jun 2021 20:29:05 +0800
Subject: [PATCH] mb/google/dedede/var/blipper: Update devicetree and gpio
 setting

To reduce power load, set unused GPIOs to NC and close
unused interface in devicetree. GPIOs and
interfaces are as below:
GPIO: GPP_C18/C19/D12/D14/D15/D19/D20/D21/E00/E02/H06/H07
Interface: I2C1/I2C3/I2C5
USB: port2_3/2_4/2_6

BUG=b:185044041
BRANCH=dedede
TEST=Built bios and test, it reduces power load without affecting
device function.

Change-Id: Ib5999f0e129bf3e660fe293eda7af3e8e1426151
Signed-off-by: Zanxi Chen <chenzanxi@huaqin.corp-partner.google.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/55385
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
Reviewed-by: Karthik Ramasubramanian <kramasub@google.com>
Reviewed-by: Ben Kao <ben.kao@intel.com>
---
 .../google/dedede/variants/blipper/gpio.c     | 27 +++++++++++++++++++
 .../dedede/variants/blipper/overridetree.cb   | 25 ++++++++++-------
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/mainboard/google/dedede/variants/blipper/gpio.c b/src/mainboard/google/dedede/variants/blipper/gpio.c
index 8c13c76a89..2244557010 100644
--- a/src/mainboard/google/dedede/variants/blipper/gpio.c
+++ b/src/mainboard/google/dedede/variants/blipper/gpio.c
@@ -7,8 +7,35 @@
 
 /* Pad configuration in ramstage*/
 static const struct pad_config gpio_table[] = {
+	/* C18 : AP_I2C_EMR_SDA */
+	PAD_NC(GPP_C18, NONE),
+	/* C19 : AP_I2C_EMR_SCL */
+	PAD_NC(GPP_C19, NONE),
+
+	/* D12 : WCAM_RST_L */
+	PAD_NC(GPP_D12, NONE),
 	/* D13 : EN_PP2800_CAMERA */
 	PAD_CFG_GPO(GPP_D13, 1, PLTRST),
+	/* D14 : EN_PP1200_CAMERA */
+	PAD_NC(GPP_D14, NONE),
+	/* D15 : UCAM_RST_L */
+	PAD_NC(GPP_D15, NONE),
+	/* D19 : WWAN_WLAN_COEX1 */
+	PAD_NC(GPP_D19, NONE),
+	/* D20 : WWAN_WLAN_COEX2 */
+	PAD_NC(GPP_D20, NONE),
+	/* D21 : WWAN_WLAN_COEX3 */
+	PAD_NC(GPP_D21, NONE),
+
+	/* E0  : CLK_24M_UCAM */
+	PAD_NC(GPP_E0, NONE),
+	/* E2  : CLK_24M_WCAM */
+	PAD_NC(GPP_E2, NONE),
+
+	/* H6  : AP_I2C_CAM_SDA */
+	PAD_NC(GPP_H6, NONE),
+	/* H7  : AP_I2C_CAM_SCL */
+	PAD_NC(GPP_H7, NONE),
 };
 
 const struct pad_config *variant_override_gpio_table(size_t *num)
diff --git a/src/mainboard/google/dedede/variants/blipper/overridetree.cb b/src/mainboard/google/dedede/variants/blipper/overridetree.cb
index 48dd2e77ff..7c4c83dff6 100644
--- a/src/mainboard/google/dedede/variants/blipper/overridetree.cb
+++ b/src/mainboard/google/dedede/variants/blipper/overridetree.cb
@@ -9,9 +9,9 @@ chip soc/intel/jasperlake
 	#|                   | for TPM communication     |
 	#|                   | before memory is up       |
 	#| I2C0              | Trackpad                  |
-	#| I2C1              | Digitizer                 |
+	#| I2C1              |                           |
 	#| I2C2              | Touchscreen               |
-	#| I2C3              | Camera                    |
+	#| I2C3              |                           |
 	#| I2C4              | Audio                     |
 	#+-------------------+---------------------------+
 	register "common_soc_config" = "{
@@ -24,17 +24,11 @@ chip soc/intel/jasperlake
 			.rise_time_ns = 247,
 			.fall_time_ns = 11,
 		},
-		.i2c[1] = {
-			.speed = I2C_SPEED_FAST,
-		},
 		.i2c[2] = {
 			.speed = I2C_SPEED_FAST,
 			.rise_time_ns = 175,
 			.fall_time_ns = 20,
 		},
-		.i2c[3] = {
-			.speed = I2C_SPEED_FAST,
-		},
 		.i2c[4] = {
 			.speed = I2C_SPEED_FAST,
 			.rise_time_ns = 99,
@@ -43,7 +37,19 @@ chip soc/intel/jasperlake
 	}"
 
 	# USB Port Configuration
+	register "usb2_ports[3]" = "USB2_PORT_EMPTY"	# Not Used
+	register "usb2_ports[4]" = "USB2_PORT_EMPTY"	# Not Used
 	register "usb2_ports[5]" = "USB2_PORT_MID(OC_SKIP)"	# UF Camera
+	register "usb2_ports[6]" = "USB2_PORT_EMPTY"	# Not Used
+
+	register "SerialIoI2cMode" = "{
+		[PchSerialIoIndexI2C0]  = PchSerialIoPci,
+		[PchSerialIoIndexI2C1]  = PchSerialIoDisabled,
+		[PchSerialIoIndexI2C2]  = PchSerialIoPci,
+		[PchSerialIoIndexI2C3]  = PchSerialIoDisabled,
+		[PchSerialIoIndexI2C4]  = PchSerialIoPci,
+		[PchSerialIoIndexI2C5]  = PchSerialIoDisabled,
+	}"
 
 	register "power_limits_config" = "{
 			.tdp_pl1_override = 6,
@@ -92,7 +98,6 @@ chip soc/intel/jasperlake
 					chip drivers/usb/acpi
 						register "desc" = ""UFCamera""
 						register "type" = "UPC_TYPE_INTERNAL"
-						register "enable_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_HIGH(GPP_D13)"
 						device usb 2.5 on end
 					end
 				end
@@ -117,6 +122,7 @@ chip soc/intel/jasperlake
 				device i2c 0x2c on end
 			end
 		end # I2C 0
+		device pci 15.1 off  end # I2C 1
 		device pci 15.2 on
 			chip drivers/i2c/hid
 				register "generic.hid" = ""GTCH7503""
@@ -154,6 +160,7 @@ chip soc/intel/jasperlake
 				device i2c 10 on end
 			end
 		end # I2C 2
+		device pci 15.3 off  end # I2C 3
 		device pci 19.0 on
 			chip drivers/i2c/generic
 				register "hid" = ""10EC5682""