[coreboot-gerrit] Change in ...coreboot[master]: kohaku: Update overridetree.cb

[Tim Wawrzynczak (Code Review)]

Tim Wawrzynczak has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/32405

Change subject: kohaku: Update overridetree.cb
......................................................................

kohaku: Update overridetree.cb

Add common SoC config.
Disable PCIe WiFi.
Add digitizer.
Turn off native SD card interface.
No WWAN.

Change-Id: I17d5ba6ce4ec412384e4a1678474b8d26499ba40
Signed-off-by: Tim Wawrzynczak 
---
M src/mainboard/google/hatch/variants/baseboard/devicetree.cb
M src/mainboard/google/hatch/variants/kohaku/overridetree.cb
2 files changed, 108 insertions(+), 8 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/05/32405/1

diff --git a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
index e39f140..e5d27af 100644
--- a/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
+++ b/src/mainboard/google/hatch/variants/baseboard/devicetree.cb
@@ -204,7 +204,7 @@
    	device pci 16.4 off end # Management Engine Interface 3
    	device pci 16.5 off end # Management Engine Interface 4
    	device pci 17.0 on  end # SATA
-		device pci 19.0 on  end #I2C #4
+		device pci 19.0 on  end # I2C #4
    	device pci 19.1 off end # I2C #5
    	device pci 19.2 off end # UART #2
    	device pci 1a.0 off end # eMMC
diff --git a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
index 6e6414e..9241644 100644
--- a/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/kohaku/overridetree.cb
@@ -1,12 +1,11 @@
 chip soc/intel/cannonlake
-
    register "SerialIoDevMode" = "{
-		[PchSerialIoIndexI2C0]  = PchSerialIoPci,
-		[PchSerialIoIndexI2C1]  = PchSerialIoPci,
-		[PchSerialIoIndexI2C2]  = PchSerialIoPci,
-		[PchSerialIoIndexI2C3]  = PchSerialIoPci,
-		[PchSerialIoIndexI2C4]  = PchSerialIoPci,
-		[PchSerialIoIndexI2C5]  = PchSerialIoPci,
+		[PchSerialIoIndexI2C0]	= PchSerialIoPci,
+		[PchSerialIoIndexI2C1]	= PchSerialIoPci,
+		[PchSerialIoIndexI2C2]	= PchSerialIoPci,
+		[PchSerialIoIndexI2C3]	= PchSerialIoPci,
+		[PchSerialIoIndexI2C4]	= PchSerialIoPci,
+		[PchSerialIoIndexI2C5]	= PchSerialIoPci,
    	[PchSerialIoIndexSPI0] = PchSerialIoPci,
    	[PchSerialIoIndexSPI1] = PchSerialIoPci,
    	[PchSerialIoIndexSPI2] = PchSerialIoDisabled,
@@ -15,4 +14,105 @@
    	[PchSerialIoIndexUART2] = PchSerialIoDisabled,
    }"

+	# No PCIe WiFi
+	register "PcieRpEnable[13]" = "0"
+
+	# Disable native SD detect
+	register "PcdSdDetectChk" = "0"
+	register "sd_acpi_mode" = "1"
+
+	# Intel Common SoC Config
+	#+-------------------+---------------------------+
+	#| Field	     |	Value			 |
+	#+-------------------+---------------------------+
+	#| I2C0		     | Trackpad			 |
+	#| I2C1		     | Touchscreen		 |
+	#| I2C2		     | Digitizer		 |
+	#| I2C4		     | Audio			 |
+	#+-------------------+---------------------------+
+	register "common_soc_config" = "{
+		.i2c[0] = {
+			.speed = I2C_SPEED_FAST,
+		}
+		.i2c[1] = {
+			.speed = I2C_SPEED_FAST,
+		}
+		.i2c[2] = {
+			.speed = I2C_SPEED_FAST,
+			.rise_time_ns = 152,
+			.fall_time_ns = 30,
+		},
+		.i2c[4] = {
+			.speed = I2C_SPEED_FAST,
+		}
+	        .gspi[0] = {
+		       .speed_mhz = 1,
+		       .early_init = 1,
+	        },
+	}"
+
+	device domain 0 on
+		device pci 14.0 on
+			chip drivers/usb/acpi
+				device usb 0.0 on
+					chip drivers/usb/acpi
+						device usb 2.5 off end
+					end
+					chip drivers/usb/acpi
+						device usb 3.4 off end
+					end
+				end
+			end
+		end
+		device pci 14.5 off end # SDCard
+
+		device pci 15.0 on
+			chip drivers/i2c/hid
+				register "generic.hid" = ""PNP0C50""
+				register "generic.desc" = ""Synaptics Touchpad""
+				register "generic.irq" = "ACPI_IRQ_WAKE_EDGE_LOW(GPIO_D21_IRQ)"
+				register "generic.wake" = "GPE0_DW2_27"
+				register "generic.probed" = "1"
+				register "hid_desc_reg_offset" = "0x20"
+				device i2c 0x2c on end
+			end
+		end # I2C 0
+
+		device pci 15.2 on
+			chip drivers/i2c/hid
+				register "generic.hid" = ""WCOM50C1""
+				register "generic.desc" = ""WCOM Digitizer""
+				register "generic.irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C7_IRQ)"
+				register "reset_gpio" = "ACPI_GPIO_OUTPUT_ACTIVE_LOW(GPP_A10)"
+				register "reset_delay_ms" = "1"
+				register "has_power_resource" = "1"
+				register "hid_desc_reg_offset" = "0x1"
+				device i2c 09 on end
+			end
+		end # I2C #2
+		device pci 19.0 on
+			chip drivers/i2c/da7219
+				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPIO_H0_IRQ)"
+				register "btn_cfg" = "50"
+				register "mic_det_thr" = "500"
+				register "jack_ins_deb" = "20"
+				register "jack_det_rate" = ""32ms_64ms""
+				register "jack_rem_deb" = "1"
+				register "a_d_btn_thr" = "0xa"
+				register "d_b_btn_thr" = "0x16"
+				register "b_c_btn_thr" = "0x21"
+				register "c_mic_btn_thr" = "0x3e"
+				register "btn_avg" = "4"
+				register "adc_1bit_rpt" = "1"
+				register "micbias_lvl" = "2600"
+				register "mic_amp_in_sel" = ""diff""
+				device i2c 1a on end
+			end
+		end
+		# No PCIe WiFi
+		device pci 1d.5 off end
+	end # domain
+
+	# no native SD support
+	register "sdcard_cd_gpio" = ""
 end