UPSTREAM: mb/google/puff/var/dooly: Update devicetree for audio and display configuration
1. Add speaker amplifier ALC1015
2. Enable dmic+ssp registers for speaker and camera DMIC
3. Correct I2C#2 to LVDS, I2C#3 to Touchscreen
BUG=b:170273526
BRANCH=puff
TEST=Build and check DUT function status
Change-Id: I5041ece33931e53d79a35f250abc70ac763497c6
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: f60ce24ad0fe54566759a433cab1a0564fa40f07
Original-Change-Id: I5f6f19b40c6fcce8dca9b010ae97ea6e3eeb1473
Original-Signed-off-by: Tony Huang <tony-huang@quanta.corp-partner.google.com>
Original-Reviewed-on: https://review.coreboot.org/c/coreboot/+/46289
Original-Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/coreboot/+/2467518
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
Commit-Queue: Patrick Georgi <pgeorgi@chromium.org>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
diff --git a/src/mainboard/google/hatch/variants/dooly/overridetree.cb b/src/mainboard/google/hatch/variants/dooly/overridetree.cb
index 21bbc3c..ee91dd3 100644
--- a/src/mainboard/google/hatch/variants/dooly/overridetree.cb
+++ b/src/mainboard/google/hatch/variants/dooly/overridetree.cb
@@ -105,10 +105,6 @@
# [6:0] Rx Strobe Delay DLL 2(HS400 Mode), each 125ps, range: 0 - 39.
register "common_soc_config.emmc_dll.emmc_rx_strobe_cntl" = "0x1515"
- # Intel HDA - disable I2S Audio SSP1 and DMIC0 as puff variant does not have them.
- register "PchHdaAudioLinkSsp1" = "0"
- register "PchHdaAudioLinkDmic0" = "0"
-
# Intel Common SoC Config
#+-------------------+---------------------------+
#| Field | Value |
@@ -117,10 +113,10 @@
#| | required to set up a BAR |
#| | for TPM communication |
#| | before memory is up |
- #| I2C0 | RFU |
- #| I2C2 | PS175 |
- #| I2C3 | MST |
- #| I2C4 | Audio |
+ #| I2C0 | ALC 1015 |
+ #| I2C2 | Lvds |
+ #| I2C3 | Touchscreen |
+ #| I2C4 | RT5682 |
#+-------------------+---------------------------+
register "common_soc_config" = "{
.gspi[0] = {
@@ -299,27 +295,24 @@
end
end # USB xHCI
device pci 14.5 off end # SDCard
- device pci 15.0 off
- # RFU - Reserved for Future Use.
- end # I2C #0
+ device pci 15.0 on
+ chip drivers/i2c/generic
+ register "hid" = ""10EC1015""
+ register "desc" = ""Realtek SPK AMP L""
+ register "uid" = "0"
+ device i2c 28 on end
+ end
+ chip drivers/i2c/generic
+ register "hid" = ""10EC1015""
+ register "desc" = ""Realtek SPK AMP R""
+ register "uid" = "1"
+ device i2c 29 on end
+ end
+ end # I2C #0 ALC1015
device pci 15.1 off end # I2C #1
- device pci 15.2 on
- chip drivers/i2c/generic
- register "hid" = ""1AF80175""
- register "name" = ""PS17""
- register "desc" = ""Parade PS175""
- device i2c 4a on end
- end
- end # I2C #2, PCON PS175.
- device pci 15.3 on
- chip drivers/i2c/generic
- register "hid" = ""10EC2142""
- register "name" = ""RTD2""
- register "desc" = ""Realtek RTD2142""
- device i2c 4a on end
- end
- end # I2C #3, Realtek RTD2142.
- device pci 16.0 on end # Management Engine Interface 1
+ device pci 15.2 on end # I2C #2 LVDS
+ device pci 15.3 on end # I2C #3 Touchscreen
+ device pci 16.0 on end # Management Engine Interface 1
device pci 19.0 on
chip drivers/i2c/generic
register "hid" = ""10EC5682""
