<p>Maulik V Vaghela has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26729">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">intel/common/pch/i2c: Move i2c file to common PCH<br><br>i2c.c file is common across soc which uses common PCH base code.<br>Move i2c related files from cannonlake and skylake to PCH base code.<br><br>BUG=none<br>BRANCH=none<br>TEST= Check if code compiles with the patch and boot with SKL/CNL boards<br><br>Change-Id: I333ca3f3e96505993c81fd3113c68d1f92b8f1b8<br>Signed-off-by: Maulik V Vaghela <maulik.v.vaghela@intel.com><br>---<br>M src/soc/intel/cannonlake/Makefile.inc<br>M src/soc/intel/common/pch/Kconfig<br>A src/soc/intel/common/pch/i2c/Kconfig<br>A src/soc/intel/common/pch/i2c/Makefile.inc<br>R src/soc/intel/common/pch/i2c/i2c.c<br>M src/soc/intel/skylake/Makefile.inc<br>D src/soc/intel/skylake/i2c.c<br>7 files changed, 10 insertions(+), 66 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/29/26729/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/soc/intel/cannonlake/Makefile.inc b/src/soc/intel/cannonlake/Makefile.inc</span><br><span>index 4cce5c3..f070723 100644</span><br><span>--- a/src/soc/intel/cannonlake/Makefile.inc</span><br><span>+++ b/src/soc/intel/cannonlake/Makefile.inc</span><br><span>@@ -14,7 +14,6 @@</span><br><span> bootblock-y += pmutil.c</span><br><span> bootblock-y += bootblock/report_platform.c</span><br><span> bootblock-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-y += i2c.c</span><br><span> bootblock-y += memmap.c</span><br><span> bootblock-y += spi.c</span><br><span> bootblock-y += lpc.c</span><br><span>@@ -23,7 +22,6 @@</span><br><span> </span><br><span> romstage-$(CONFIG_SOC_INTEL_CANNONLAKE_LPDDR4_INIT) += cnl_lpddr4_init.c</span><br><span> romstage-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += i2c.c</span><br><span> romstage-y += lpc.c</span><br><span> romstage-y += memmap.c</span><br><span> romstage-y += pmutil.c</span><br><span>@@ -38,7 +36,6 @@</span><br><span> ramstage-y += gpio.c</span><br><span> ramstage-y += graphics.c</span><br><span> ramstage-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += i2c.c</span><br><span> ramstage-y += lockdown.c</span><br><span> ramstage-y += lpc.c</span><br><span> ramstage-y += memmap.c</span><br><span>@@ -64,7 +61,6 @@</span><br><span> postcar-y += pmutil.c</span><br><span> postcar-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-verstage-y += i2c.c</span><br><span> verstage-y += pmutil.c</span><br><span> verstage-y += spi.c</span><br><span> verstage-$(CONFIG_UART_DEBUG) += uart.c</span><br><span>diff --git a/src/soc/intel/common/pch/Kconfig b/src/soc/intel/common/pch/Kconfig</span><br><span>index 9014647..ff58524 100644</span><br><span>--- a/src/soc/intel/common/pch/Kconfig</span><br><span>+++ b/src/soc/intel/common/pch/Kconfig</span><br><span>@@ -45,4 +45,5 @@</span><br><span>         select SOC_INTEL_COMMON_BLOCK_XHCI</span><br><span>   select SOC_INTEL_COMMON_PCH_LOCKDOWN</span><br><span>         select SOC_INTEL_COMMON_PCH_GSPI</span><br><span style="color: hsl(120, 100%, 40%);">+      select SOC_INTEL_COMMON_PCH_I2C</span><br><span> endif</span><br><span>diff --git a/src/soc/intel/common/pch/i2c/Kconfig b/src/soc/intel/common/pch/i2c/Kconfig</span><br><span>new file mode 100644</span><br><span>index 0000000..1809cb6</span><br><span>--- /dev/null</span><br><span>+++ b/src/soc/intel/common/pch/i2c/Kconfig</span><br><span>@@ -0,0 +1,5 @@</span><br><span style="color: hsl(120, 100%, 40%);">+config SOC_INTEL_COMMON_PCH_I2C</span><br><span style="color: hsl(120, 100%, 40%);">+   bool</span><br><span style="color: hsl(120, 100%, 40%);">+  default n</span><br><span style="color: hsl(120, 100%, 40%);">+     help</span><br><span style="color: hsl(120, 100%, 40%);">+    This option allows to have i2c configuration for supported PCH.</span><br><span>diff --git a/src/soc/intel/common/pch/i2c/Makefile.inc b/src/soc/intel/common/pch/i2c/Makefile.inc</span><br><span>new file mode 100644</span><br><span>index 0000000..04328b7</span><br><span>--- /dev/null</span><br><span>+++ b/src/soc/intel/common/pch/i2c/Makefile.inc</span><br><span>@@ -0,0 +1,4 @@</span><br><span style="color: hsl(120, 100%, 40%);">+bootblock-$(CONFIG_SOC_INTEL_COMMON_PCH_I2C) += i2c.c</span><br><span style="color: hsl(120, 100%, 40%);">+verstage-$(CONFIG_SOC_INTEL_COMMON_PCH_I2C) += i2c.c</span><br><span style="color: hsl(120, 100%, 40%);">+romstage-$(CONFIG_SOC_INTEL_COMMON_PCH_I2C) += i2c.c</span><br><span style="color: hsl(120, 100%, 40%);">+ramstage-$(CONFIG_SOC_INTEL_COMMON_PCH_I2C) += i2c.c</span><br><span>diff --git a/src/soc/intel/cannonlake/i2c.c b/src/soc/intel/common/pch/i2c/i2c.c</span><br><span>similarity index 100%</span><br><span>rename from src/soc/intel/cannonlake/i2c.c</span><br><span>rename to src/soc/intel/common/pch/i2c/i2c.c</span><br><span>diff --git a/src/soc/intel/skylake/Makefile.inc b/src/soc/intel/skylake/Makefile.inc</span><br><span>index 8f673c3..03b293a 100644</span><br><span>--- a/src/soc/intel/skylake/Makefile.inc</span><br><span>+++ b/src/soc/intel/skylake/Makefile.inc</span><br><span>@@ -11,7 +11,6 @@</span><br><span> </span><br><span> bootblock-y += bootblock/bootblock.c</span><br><span> bootblock-y += bootblock/cpu.c</span><br><span style="color: hsl(0, 100%, 40%);">-bootblock-y += i2c.c</span><br><span> bootblock-y += bootblock/pch.c</span><br><span> bootblock-y += bootblock/report_platform.c</span><br><span> bootblock-y += gpio.c</span><br><span>@@ -22,12 +21,10 @@</span><br><span> bootblock-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> </span><br><span> verstage-y += pmutil.c</span><br><span style="color: hsl(0, 100%, 40%);">-verstage-y += i2c.c</span><br><span> verstage-y += spi.c</span><br><span> verstage-$(CONFIG_UART_DEBUG) += uart.c</span><br><span> </span><br><span> romstage-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-romstage-y += i2c.c</span><br><span> romstage-y += memmap.c</span><br><span> romstage-y += me.c</span><br><span> romstage-y += pei_data.c</span><br><span>@@ -44,7 +41,6 @@</span><br><span> ramstage-y += elog.c</span><br><span> ramstage-y += finalize.c</span><br><span> ramstage-y += gpio.c</span><br><span style="color: hsl(0, 100%, 40%);">-ramstage-y += i2c.c</span><br><span> ramstage-y += graphics.c</span><br><span> ramstage-y += irq.c</span><br><span> ramstage-y += lockdown.c</span><br><span>diff --git a/src/soc/intel/skylake/i2c.c b/src/soc/intel/skylake/i2c.c</span><br><span>deleted file mode 100644</span><br><span>index 9fd9bf3..0000000</span><br><span>--- a/src/soc/intel/skylake/i2c.c</span><br><span>+++ /dev/null</span><br><span>@@ -1,58 +0,0 @@</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * This file is part of the coreboot project.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright 2016 Google Inc.</span><br><span style="color: hsl(0, 100%, 40%);">- * Copyright (C) 2018 Intel Corporation.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is free software; you can redistribute it and/or modify</span><br><span style="color: hsl(0, 100%, 40%);">- * it under the terms of the GNU General Public License as published by</span><br><span style="color: hsl(0, 100%, 40%);">- * the Free Software Foundation; version 2 of the License.</span><br><span style="color: hsl(0, 100%, 40%);">- *</span><br><span style="color: hsl(0, 100%, 40%);">- * This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(0, 100%, 40%);">- * but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(0, 100%, 40%);">- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the</span><br><span style="color: hsl(0, 100%, 40%);">- * GNU General Public License for more details.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#include <device/device.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <intelblocks/chip.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <drivers/i2c/designware/dw_i2c.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <soc/pci_devs.h></span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int dw_i2c_soc_devfn_to_bus(unsigned int devfn)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-   switch (devfn) {</span><br><span style="color: hsl(0, 100%, 40%);">-        case PCH_DEVFN_I2C0:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-       case PCH_DEVFN_I2C1:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-       case PCH_DEVFN_I2C2:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 2;</span><br><span style="color: hsl(0, 100%, 40%);">-       case PCH_DEVFN_I2C3:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 3;</span><br><span style="color: hsl(0, 100%, 40%);">-       case PCH_DEVFN_I2C4:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 4;</span><br><span style="color: hsl(0, 100%, 40%);">-       case PCH_DEVFN_I2C5:</span><br><span style="color: hsl(0, 100%, 40%);">-            return 5;</span><br><span style="color: hsl(0, 100%, 40%);">-       }</span><br><span style="color: hsl(0, 100%, 40%);">-       return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int dw_i2c_soc_bus_to_devfn(unsigned int bus)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-       switch (bus) {</span><br><span style="color: hsl(0, 100%, 40%);">-  case 0:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C0;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 1:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C1;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 2:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C2;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 3:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C3;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 4:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C4;</span><br><span style="color: hsl(0, 100%, 40%);">-  case 5:</span><br><span style="color: hsl(0, 100%, 40%);">-         return PCH_DEVFN_I2C5;</span><br><span style="color: hsl(0, 100%, 40%);">-  }</span><br><span style="color: hsl(0, 100%, 40%);">-       return -1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26729">change 26729</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/26729"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I333ca3f3e96505993c81fd3113c68d1f92b8f1b8 </div>
<div style="display:none"> Gerrit-Change-Number: 26729 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Maulik V Vaghela <maulik.v.vaghela@intel.com> </div>