From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753949Ab3JUPG3 (ORCPT ); Mon, 21 Oct 2013 11:06:29 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:36750 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753865Ab3JUPGC (ORCPT ); Mon, 21 Oct 2013 11:06:02 -0400 From: Benson Leung To: wsa@the-dreams.de, mika.westerberg@linux.intel.com, khali@linux-fr.org, andriy.shevchenko@linux.intel.com, jacmet@sunsite.dk, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Cc: dlaurie@chromium.org, bleung@chromium.org Subject: [PATCH v2 1/2] i2c-designware-pci: Add Haswell ULT device IDs Date: Mon, 21 Oct 2013 08:05:43 -0700 Message-Id: <1382367944-3005-2-git-send-email-bleung@chromium.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1382367944-3005-1-git-send-email-bleung@chromium.org> References: <1382326010-4554-1-git-send-email-bleung@chromium.org> <1382367944-3005-1-git-send-email-bleung@chromium.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Duncan Laurie Add the necessary PCI Device IDs to use the Haswell ULT I2C controller in PCI mode. Set the bus numbers to -1 so it will use dynamic assignment rather than hardcoded. Signed-off-by: Duncan Laurie Signed-off-by: Benson Leung --- v2: Changed Haswell bus_clk to 100Mhz, thanks Mika Westerberg. v1: Initial --- drivers/i2c/busses/i2c-designware-pcidrv.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index f6ed06c..816cbd1 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -54,6 +54,9 @@ enum dw_pci_ctl_id_t { medfield_3, medfield_4, medfield_5, + + haswell_0, + haswell_1, }; struct dw_pci_controller { @@ -132,6 +135,20 @@ static struct dw_pci_controller dw_pci_controllers[] = { .rx_fifo_depth = 32, .clk_khz = 25000, }, + [haswell_0] = { + .bus_num = -1, + .bus_cfg = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_STD, + .tx_fifo_depth = 32, + .rx_fifo_depth = 32, + .clk_khz = 100000, + }, + [haswell_1] = { + .bus_num = -1, + .bus_cfg = INTEL_MID_STD_CFG | DW_IC_CON_SPEED_STD, + .tx_fifo_depth = 32, + .rx_fifo_depth = 32, + .clk_khz = 100000, + }, }; static struct i2c_algorithm i2c_dw_algo = { .master_xfer = i2c_dw_xfer, @@ -321,6 +338,9 @@ static DEFINE_PCI_DEVICE_TABLE(i2_designware_pci_ids) = { { PCI_VDEVICE(INTEL, 0x082C), medfield_0 }, { PCI_VDEVICE(INTEL, 0x082D), medfield_1 }, { PCI_VDEVICE(INTEL, 0x082E), medfield_2 }, + /* Haswell ULT */ + { PCI_VDEVICE(INTEL, 0x9c61), haswell_0 }, + { PCI_VDEVICE(INTEL, 0x9c62), haswell_1 }, { 0,} }; MODULE_DEVICE_TABLE(pci, i2_designware_pci_ids); -- 1.8.3.2