UPSTREAM: google: Use proper ACPI ID for Semtech chips: STH
BUG=none
BRANCH=none
TEST=none
Change-Id: I6146b9e25790bf08f67de1df776de3b29b6f9efb
Signed-off-by: Patrick Georgi <pgeorgi@google.com>
Original-Commit-Id: 145ef87b32324403d8a8372414d1d544527c129c
Original-Change-Id: I85cd567a923cccd2504f351aae276b5f0d9db4de
Original-Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Original-Reviewed-on: https://review.coreboot.org/27347
Original-Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Original-Reviewed-by: Matt Delco <delco@google.com>
Original-Reviewed-by: Seunghwan Kim <sh_.kim@samsung.com>
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/1127958
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Tested-by: Patrick Georgi <pgeorgi@chromium.org>
Reviewed-by: Patrick Georgi <pgeorgi@chromium.org>
(cherry picked from commit b97ab640ed803de02b52ed74024730a1eda13d47)
Reviewed-on: https://chromium-review.googlesource.com/1135731
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Commit-Queue: Gwendal Grignou <gwendal@chromium.org>
Tested-by: Gwendal Grignou <gwendal@chromium.org>
diff --git a/src/drivers/i2c/sx9310/sx9310.c b/src/drivers/i2c/sx9310/sx9310.c
index 5f63734..3443f5c 100644
--- a/src/drivers/i2c/sx9310/sx9310.c
+++ b/src/drivers/i2c/sx9310/sx9310.c
@@ -22,7 +22,7 @@
#include <string.h>
#include "chip.h"
-#define I2C_SX9310_ACPI_ID "SX9310"
+#define I2C_SX9310_ACPI_ID "STH9310"
#define I2C_SX9310_ACPI_NAME "Semtech SX9310"
#define REGISTER(NAME) acpi_dp_add_integer(dsd, \
diff --git a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
index 68246c6..b2617e5 100644
--- a/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
+++ b/src/mainboard/google/poppy/variants/nautilus/devicetree.cb
@@ -330,7 +330,7 @@
end # I2C #1
device pci 15.2 on
chip drivers/i2c/generic
- register "hid" = ""SX9321""
+ register "hid" = ""STH9321""
register "name" = ""SEMTECH SX9321""
register "desc" = ""SAR Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_A18_IRQ)"
diff --git a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
index adeedea..bbff695 100644
--- a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
+++ b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb
@@ -107,7 +107,7 @@
end # I2C #0
device pci 15.1 on
chip drivers/i2c/generic
- register "hid" = ""SX9310""
+ register "hid" = ""STH9310""
register "name" = ""SEMTECH SX9310""
register "desc" = ""Left SAR Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C3_IRQ)"
@@ -145,7 +145,7 @@
device pci 19.0 on end # I2C #4
device pci 19.1 on
chip drivers/i2c/generic
- register "hid" = ""SX9310""
+ register "hid" = ""STH9310""
register "name" = ""SEMTECH SX9310""
register "desc" = ""Right SAR Proximity Sensor""
register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C4_IRQ)"
