<p>Furquan Shaikh <strong>merged</strong> this change.</p><p><a href="https://review.coreboot.org/25062">View Change</a></p><div style="white-space:pre-wrap">Approvals:
build bot (Jenkins): Verified
Duncan Laurie: Looks good to me, approved
Furquan Shaikh: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">meowth: Add SAR Sensor in devicetree<br><br>Add left and right semtech SAR sensor.<br><br>BUG=b:74363445<br>TEST=Test on meowth, alongside 24962.<br>Check in sysfs that SX9310 is presented:<br>/sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:09/SX9310:00<br>/sys/devices/LNXSYSTM:00/LNXSYBUS:00/PNP0A08:00/device:0d/SX9310:01<br><br>Change-Id: I017db1105800003b312e75dc7e1e27be535a457a<br>Signed-off-by: Gwendal Grignou <gwendal@chromium.org><br>Reviewed-on: https://review.coreboot.org/25062<br>Tested-by: build bot (Jenkins) <no-reply@coreboot.org><br>Reviewed-by: Furquan Shaikh <furquan@google.com><br>Reviewed-by: Duncan Laurie <dlaurie@chromium.org><br>---<br>M src/mainboard/google/zoombini/variants/meowth/devicetree.cb<br>M src/mainboard/google/zoombini/variants/meowth/gpio.c<br>2 files changed, 26 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb</span><br><span>index 4250121..2d15c97 100644</span><br><span>--- a/src/mainboard/google/zoombini/variants/meowth/devicetree.cb</span><br><span>+++ b/src/mainboard/google/zoombini/variants/meowth/devicetree.cb</span><br><span>@@ -95,7 +95,17 @@</span><br><span> device i2c 0a on end</span><br><span> end</span><br><span> end # I2C #0</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 15.1 on end # I2C #1</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 15.1 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/generic</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid" = ""SX9310""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "name" = ""SEMTECH SX9310""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""Left SAR Proximity Sensor""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C3_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "speed" = "I2C_SPEED_FAST_PLUS"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "uid" = "1"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 28 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # I2C #1</span><br><span> device pci 15.2 on end # I2C #2</span><br><span> device pci 15.3 on</span><br><span> chip drivers/i2c/max98373</span><br><span>@@ -123,7 +133,17 @@</span><br><span> device pci 16.5 off end # Management Engine Interface 4</span><br><span> device pci 17.0 off end # SATA</span><br><span> device pci 19.0 on end # I2C #4</span><br><span style="color: hsl(0, 100%, 40%);">- device pci 19.1 on end # I2C #5</span><br><span style="color: hsl(120, 100%, 40%);">+ device pci 19.1 on</span><br><span style="color: hsl(120, 100%, 40%);">+ chip drivers/i2c/generic</span><br><span style="color: hsl(120, 100%, 40%);">+ register "hid" = ""SX9310""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "name" = ""SEMTECH SX9310""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "desc" = ""Right SAR Proximity Sensor""</span><br><span style="color: hsl(120, 100%, 40%);">+ register "irq" = "ACPI_IRQ_LEVEL_LOW(GPP_C4_IRQ)"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "speed" = "I2C_SPEED_FAST_PLUS"</span><br><span style="color: hsl(120, 100%, 40%);">+ register "uid" = "0"</span><br><span style="color: hsl(120, 100%, 40%);">+ device i2c 28 on end</span><br><span style="color: hsl(120, 100%, 40%);">+ end</span><br><span style="color: hsl(120, 100%, 40%);">+ end # I2C #5</span><br><span> device pci 19.2 on end # UART #2</span><br><span> device pci 1a.0 on end # eMMC</span><br><span> device pci 1c.0 on end # PCI Express Port 1 x4 SLOT1</span><br><span>diff --git a/src/mainboard/google/zoombini/variants/meowth/gpio.c b/src/mainboard/google/zoombini/variants/meowth/gpio.c</span><br><span>index 78cab5a..507e653 100644</span><br><span>--- a/src/mainboard/google/zoombini/variants/meowth/gpio.c</span><br><span>+++ b/src/mainboard/google/zoombini/variants/meowth/gpio.c</span><br><span>@@ -86,8 +86,10 @@</span><br><span> /* SMBCLK */ PAD_NC(GPP_C0, NONE),</span><br><span> /* SMBDATA */ PAD_NC(GPP_C1, NONE),</span><br><span> /* SMBALERT# */ PAD_CFG_GPI(GPP_C2, NONE, DEEP), /* GPP_C2_STRAP */</span><br><span style="color: hsl(0, 100%, 40%);">-/* SML0CLK */ PAD_CFG_GPI(GPP_C3, NONE, DEEP), /* PCH_SAR1_INT_L */</span><br><span style="color: hsl(0, 100%, 40%);">-/* SML0DATA */ PAD_CFG_GPI(GPP_C4, NONE, DEEP), /* PCH_SAR0_INT_L */</span><br><span style="color: hsl(120, 100%, 40%);">+/* SML0CLK */ PAD_CFG_GPI_APIC(GPP_C3, NONE, DEEP, LEVEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ NONE), /* PCH_SAR1_INT_L */</span><br><span style="color: hsl(120, 100%, 40%);">+/* SML0DATA */ PAD_CFG_GPI_APIC(GPP_C4, NONE, DEEP, LEVEL,</span><br><span style="color: hsl(120, 100%, 40%);">+ NONE), /* PCH_SAR0_INT_L */</span><br><span> /* SML0ALERT# */ PAD_CFG_GPI(GPP_C5, NONE, DEEP), /* GPP_C5_STRAP */</span><br><span> /* SM1CLK */ PAD_CFG_GPO(GPP_C6, 1, DEEP), /* PCH_SAR_PWR_EN */</span><br><span> /* SM1DATA */ PAD_NC(GPP_C7, NONE),</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/25062">change 25062</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/25062"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I017db1105800003b312e75dc7e1e27be535a457a </div>
<div style="display:none"> Gerrit-Change-Number: 25062 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Gwendal Grignou <gwendal@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Duncan Laurie <dlaurie@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Furquan Shaikh <furquan@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: Gwendal Grignou <gwendal@chromium.org> </div>
<div style="display:none"> Gerrit-Reviewer: Nick Vaccaro <nvaccaro@google.com> </div>
<div style="display:none"> Gerrit-Reviewer: build bot (Jenkins) <no-reply@coreboot.org> </div>