Change in coreboot[master]: google/caroline: ACPI fixes

[Matt DeVillier (Code Review)]

Matt DeVillier has uploaded this change for review. ( https://review.coreboot.org/27624

Change subject: google/caroline: ACPI fixes
......................................................................

google/caroline: ACPI fixes

- remove duplicate FMCN package for I2C2, since already generated by devicetree-linked driver
- add audio codec definitions in devicetree, which were accidentally dropped when upstreaming

Test: build/boot Caroline with GalliumOS 3.0a2, verify touchpad, touchscreen, and audio all
functioning properly, no ACPI errors in dmesg.

Change-Id: I68315daf087aef0fc51411605b054e6322d5d7f8
Signed-off-by: Matt DeVillier 
---
M src/mainboard/google/glados/variants/caroline/devicetree.cb
M src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
2 files changed, 35 insertions(+), 3 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/24/27624/1

diff --git a/src/mainboard/google/glados/variants/caroline/devicetree.cb b/src/mainboard/google/glados/variants/caroline/devicetree.cb
index 9ada5c5..a040714 100644
--- a/src/mainboard/google/glados/variants/caroline/devicetree.cb
+++ b/src/mainboard/google/glados/variants/caroline/devicetree.cb
@@ -226,7 +226,41 @@
    	device pci 17.0 off end # SATA
    	device pci 19.0 on  end # UART #2
    	device pci 19.1 off end # I2C #5
-		device pci 19.2 on  end # I2C #4
+		device pci 19.2 on
+			chip drivers/i2c/nau8825
+				register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_F10_IRQ)"
+				register "jkdet_enable" = "1"
+				register "jkdet_pull_enable" = "0"   # R389
+				register "jkdet_polarity" = "1"      # ActiveLow
+				register "vref_impedance" = "2"      # 125kOhm
+				register "micbias_voltage" = "6"     # 2.754
+				register "sar_threshold_num" = "4"
+				register "sar_threshold[0]" = "0x0c"
+				register "sar_threshold[1]" = "0x1c"
+				register "sar_threshold[2]" = "0x38"
+				register "sar_threshold[3]" = "0x60"
+				register "sar_hysteresis" = "1"
+				register "sar_voltage" = "0"          # VDDA
+				register "sar_compare_time" = "0"     # 500ns
+				register "sar_sampling_time" = "0"    # 2us
+				register "short_key_debounce" = "2"   # 100ms
+				register "jack_insert_debounce" = "7" # 512ms
+				register "jack_eject_debounce" = "7"  # 512ms
+				device i2c 1a on end
+			end
+			chip drivers/i2c/generic
+				register "hid" = ""INT343B""
+				register "desc" = ""SSM4567 Left Speaker Amp""
+				register "uid" = "0"
+				device i2c 34 on end
+			end
+			chip drivers/i2c/generic
+				register "hid" = ""INT343B""
+				register "desc" = ""SSM4567 Right Speaker Amp""
+				register "uid" = "1"
+				device i2c 35 on end
+			end
+		end # I2C #4
    	device pci 1c.0 on
    		chip drivers/intel/wifi
    			register "wake" = "GPE0_DW0_16"
diff --git a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
index 19c8834..d0324cf 100644
--- a/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
+++ b/src/mainboard/google/glados/variants/caroline/include/variant/acpi/mainboard.asl
@@ -66,8 +66,6 @@

Scope (_SB.PCI0.I2C2)
 {
-	Name (FMCN, Package () { 87, 197, 26 })
-
    Device (DIGI)
    {
    	Name (_HID, "ACPI0C50")