diff options
| author | Enrico Granata <egranata@chromium.org> | 2018-06-20 13:08:23 -0700 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2018-06-22 09:21:19 +0000 |
| commit | 95278a59bd1ca44d67a521764cb97a820d5e630c (patch) | |
| tree | 751876cd427462b2244f19a4c6b828cbfe74c864 /src/mainboard/google/poppy | |
| parent | 76a1f49f742df6d1bde38fa36f4b06a193e6e4f5 (diff) | |
mb/google/poppy/variants/nocturne: Hook up the SX9310 proximity sensor.
Change-Id: I7358ee34df873098a86d692cc8a909b0ec5023a8
Signed-off-by: Enrico Granata <egranata@chromium.org>
Reviewed-on: https://review.coreboot.org/27172
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Furquan Shaikh <furquan@google.com>
Diffstat (limited to 'src/mainboard/google/poppy')
| -rw-r--r-- | src/mainboard/google/poppy/Kconfig | 1 | ||||
| -rw-r--r-- | src/mainboard/google/poppy/variants/nocturne/devicetree.cb | 66 |
2 files changed, 65 insertions, 2 deletions
diff --git a/src/mainboard/google/poppy/Kconfig b/src/mainboard/google/poppy/Kconfig index 2d9c1873d4..c9a181227f 100644 --- a/src/mainboard/google/poppy/Kconfig +++ b/src/mainboard/google/poppy/Kconfig @@ -172,6 +172,7 @@ config VARIANT_SPECIFIC_OPTIONS_NAUTILUS config VARIANT_SPECIFIC_OPTIONS_NOCTURNE def_bool n select CHROMEOS_WIFI_SAR if CHROMEOS + select DRIVERS_I2C_SX9310 if CHROMEOS_WIFI_SAR select DRIVERS_I2C_MAX98373 select DRIVERS_I2C_DA7219 select DRIVERS_SPI_ACPI diff --git a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb index de9c91c420..0797f62ee5 100644 --- a/src/mainboard/google/poppy/variants/nocturne/devicetree.cb +++ b/src/mainboard/google/poppy/variants/nocturne/devicetree.cb @@ -299,7 +299,38 @@ chip soc/intel/skylake device i2c 0a on end end end # I2C #0 - Touchscreen - device pci 15.1 on end # I2C #1 - Trackpad + device pci 15.1 on + chip drivers/i2c/sx9310 + register "desc" = ""Left SAR Proximity Sensor"" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D9_IRQ)" + register "speed" = "I2C_SPEED_FAST_PLUS" + register "uid" = "1" + register "reg_prox_ctrl0" = "0x1A" + register "reg_prox_ctrl1" = "0x00" + register "reg_prox_ctrl2" = "0x84" + register "reg_prox_ctrl3" = "0x0E" + register "reg_prox_ctrl4" = "0x07" + register "reg_prox_ctrl5" = "0xC6" + register "reg_prox_ctrl6" = "0x20" + register "reg_prox_ctrl7" = "0x0D" + register "reg_prox_ctrl8" = "0x8D" + register "reg_prox_ctrl9" = "0x43" + register "reg_prox_ctrl10" = "0x11" + register "reg_prox_ctrl11" = "0x00" + register "reg_prox_ctrl12" = "0x00" + register "reg_prox_ctrl13" = "0x00" + register "reg_prox_ctrl14" = "0x00" + register "reg_prox_ctrl15" = "0x00" + register "reg_prox_ctrl16" = "0x00" + register "reg_prox_ctrl17" = "0x00" + register "reg_prox_ctrl18" = "0x00" + register "reg_prox_ctrl19" = "0x00" + register "reg_sar_ctrl0" = "0x50" + register "reg_sar_ctrl1" = "0x8A" + register "reg_sar_ctrl2" = "0x3C" + device i2c 28 on end + end + end # I2C #1 device pci 15.2 off end # I2C #2 device pci 15.3 on end # I2C #3 - Camera device pci 16.0 on end # Management Engine Interface 1 @@ -309,7 +340,38 @@ chip soc/intel/skylake device pci 16.4 off end # Management Engine Interface 3 device pci 17.0 off end # SATA device pci 19.0 on end # UART #2 - device pci 19.1 on end # I2C #5 + device pci 19.1 on + chip drivers/i2c/sx9310 + register "desc" = ""Left SAR Proximity Sensor"" + register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_D10_IRQ)" + register "speed" = "I2C_SPEED_FAST_PLUS" + register "uid" = "1" + register "reg_prox_ctrl0" = "0x1A" + register "reg_prox_ctrl1" = "0x00" + register "reg_prox_ctrl2" = "0x84" + register "reg_prox_ctrl3" = "0x0E" + register "reg_prox_ctrl4" = "0x07" + register "reg_prox_ctrl5" = "0xC6" + register "reg_prox_ctrl6" = "0x20" + register "reg_prox_ctrl7" = "0x0D" + register "reg_prox_ctrl8" = "0x8D" + register "reg_prox_ctrl9" = "0x43" + register "reg_prox_ctrl10" = "0x11" + register "reg_prox_ctrl11" = "0x00" + register "reg_prox_ctrl12" = "0x00" + register "reg_prox_ctrl13" = "0x00" + register "reg_prox_ctrl14" = "0x00" + register "reg_prox_ctrl15" = "0x00" + register "reg_prox_ctrl16" = "0x00" + register "reg_prox_ctrl17" = "0x00" + register "reg_prox_ctrl18" = "0x00" + register "reg_prox_ctrl19" = "0x00" + register "reg_sar_ctrl0" = "0x50" + register "reg_sar_ctrl1" = "0x8A" + register "reg_sar_ctrl2" = "0x3C" + device i2c 28 on end + end + end # I2C #5 device pci 19.2 on chip drivers/i2c/max98373 register "vmon_slot_no" = "4" |