From patchwork Fri Oct 9 08:47:06 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangxfdu@gmail.com X-Patchwork-Id: 528133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E82181409B7 for ; Fri, 9 Oct 2015 19:47:07 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933401AbbJIIqW (ORCPT ); Fri, 9 Oct 2015 04:46:22 -0400 Received: from mga02.intel.com ([134.134.136.20]:32261 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934321AbbJIIp5 (ORCPT ); Fri, 9 Oct 2015 04:45:57 -0400 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 09 Oct 2015 01:45:56 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.17,657,1437462000"; d="scan'208";a="788346843" Received: from wangxia2-desktop.sh.intel.com ([10.239.153.70]) by orsmga001.jf.intel.com with ESMTP; 09 Oct 2015 01:45:32 -0700 From: wangxfdu@gmail.com To: wangxfdu@gmail.com, xiang.a.wang@intel.com, wsa@the-dreams.de, andriy.shevchenko@linux.intel.com, jarkko.nikula@linux.intel.com, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] i2c: designware: enable High-speed mode for pcidrv Date: Fri, 9 Oct 2015 16:47:06 +0800 Message-Id: <1444380426-17953-2-git-send-email-wangxfdu@gmail.com> X-Mailer: git-send-email 2.5.3 In-Reply-To: <1444380426-17953-1-git-send-email-wangxfdu@gmail.com> References: <1444380426-17953-1-git-send-email-wangxfdu@gmail.com> Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org From: Xiang Wang 1. Support setting hs_hcnt and hs_lcnt 2. Get bus speed mode from ACPI companion of the i2c controller. Signed-off-by: Xiang Wang --- drivers/i2c/busses/i2c-designware-pcidrv.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c index 6643d2d..0f4c0c4 100644 --- a/drivers/i2c/busses/i2c-designware-pcidrv.c +++ b/drivers/i2c/busses/i2c-designware-pcidrv.c @@ -54,8 +54,10 @@ enum dw_pci_ctl_id_t { struct dw_scl_sda_cfg { u32 ss_hcnt; u32 fs_hcnt; + u32 hs_hcnt; u32 ss_lcnt; u32 fs_lcnt; + u32 hs_lcnt; u32 sda_hold; }; @@ -237,8 +239,10 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, cfg = controller->scl_sda_cfg; dev->ss_hcnt = cfg->ss_hcnt; dev->fs_hcnt = cfg->fs_hcnt; + dev->hs_hcnt = cfg->hs_hcnt; dev->ss_lcnt = cfg->ss_lcnt; dev->fs_lcnt = cfg->fs_lcnt; + dev->hs_lcnt = cfg->hs_lcnt; dev->sda_hold_time = cfg->sda_hold; } @@ -246,6 +250,9 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev, dev->tx_fifo_depth = controller->tx_fifo_depth; dev->rx_fifo_depth = controller->rx_fifo_depth; + + i2c_dw_acpi_setup_speed(&pdev->dev, dev); + r = i2c_dw_init(dev); if (r) return r;