From patchwork Tue May 10 23:50:29 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 1443 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:52:00 -0000 Delivered-To: patches@linaro.org Received: by 10.224.61.3 with SMTP id r3cs38997qah; Tue, 10 May 2011 16:50:30 -0700 (PDT) Received: by 10.43.55.84 with SMTP id vx20mr8347426icb.49.1305071429991; Tue, 10 May 2011 16:50:29 -0700 (PDT) Received: from mail-iw0-f178.google.com (mail-iw0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id xb20si21276796icb.46.2011.05.10.16.50.29 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 10 May 2011 16:50:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linus.ml.walleij@gmail.com designates 209.85.214.178 as permitted sender) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linus.ml.walleij@gmail.com designates 209.85.214.178 as permitted sender) smtp.mail=linus.ml.walleij@gmail.com; dkim=pass (test mode) header.i=@gmail.com Received: by iwn9 with SMTP id 9so7268759iwn.37 for ; Tue, 10 May 2011 16:50:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:in-reply-to:references:date :message-id:subject:from:to:content-type:content-transfer-encoding; bh=96A8eGSyGivetQxeK8cYln+RNDtIgt3qf3ssx4QLs7A=; b=LP8ACi4uuNf/DS3mNabdHrvQpHl7JIjAyN/0S0HEUdnNyYTv9w+uwMp4N7IZVoBorE gp8TxA5tNmgxUzawAZENXx99XFwC69SAaqefvdj5G2W2uZ/8pylDrjGZ/4ATu98VCbIG o5lPDth7wzHlMDjuCXDjRJQndiJB5pj5J3Mmo= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=wqeqsiQBlRoZXxdI1lSv+TqkwITJpRcz5ACfMCwpec2Fko/R7nQzm4ktlAJmf5RWYI /11tPevJO6LMuulzmAWFElx7q6bd4zUx8Xik0apnJk1JnT1FvRORNGCb8MSLQBHfv5Y1 Wd7klN1y2L9l1E4YdOVexX/N/a67/asUaMVfI= MIME-Version: 1.0 Received: by 10.231.30.136 with SMTP id u8mr6344678ibc.1.1305071429626; Tue, 10 May 2011 16:50:29 -0700 (PDT) Received: by 10.231.20.3 with HTTP; Tue, 10 May 2011 16:50:29 -0700 (PDT) In-Reply-To: <1304977174-31834-1-git-send-email-linus.walleij@linaro.org> References: <1304977174-31834-1-git-send-email-linus.walleij@linaro.org> Date: Wed, 11 May 2011 01:50:29 +0200 Message-ID: Subject: Fwd: [PATCH 13/13] mach-ux500: set proper I2C platform data from MOP500s From: Linus Walleij To: patches@linaro.org ---------- Forwarded message ---------- From: Linus Walleij Date: 2011/5/9 Subject: [PATCH 13/13] mach-ux500: set proper I2C platform data from MOP500s To: Ben Dooks , linux-i2c@vger.kernel.org Kopia: Linus Walleij This specifies the new per-platform timeout per I2C bus and switches the I2C buses to fast mode, and increase the FIFO depth to 8 for reads and writes. Signed-off-by: Linus Walleij ---  arch/arm/mach-ux500/board-mop500.c |   14 ++++++++------  1 files changed, 8 insertions(+), 6 deletions(-)         * slave data setup time, which is      \ @@ -219,19 +219,21 @@ static struct nmk_i2c_controller u8500_i2c##id##_data = { \        .rft            = _rft,         \        /* std. mode operation */       \        .clk_freq       = clk,          \ +       /* Slave response timeout(ms) */\ +       .timeout        = t_out,        \        .sm             = _sm,          \  }  /*  * The board uses 4 i2c controllers, initialize all of  * them with slave data setup time of 250 ns, - * Tx & Rx FIFO threshold values as 1 and standard + * Tx & Rx FIFO threshold values as 8 and standard  * mode of operation  */ -U8500_I2C_CONTROLLER(0, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD); -U8500_I2C_CONTROLLER(1, 0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD); -U8500_I2C_CONTROLLER(2,        0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD); -U8500_I2C_CONTROLLER(3,        0xe, 1, 1, 100000, I2C_FREQ_MODE_STANDARD); +U8500_I2C_CONTROLLER(0, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(1, 0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(2,        0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST); +U8500_I2C_CONTROLLER(3,        0xe, 1, 8, 100000, 200, I2C_FREQ_MODE_FAST);  static void __init mop500_i2c_init(void)  { -- 1.7.5.1 -- To unsubscribe from this list: send the line "unsubscribe linux-i2c" in the body of a message to majordomo@vger.kernel.org More majordomo info at  http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 6e1907fa..bb26f40 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -204,7 +204,7 @@ static struct i2c_board_info __initdata mop500_i2c2_devices[] = {        },  }; -#define U8500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, _sm) \ +#define U8500_I2C_CONTROLLER(id, _slsu, _tft, _rft, clk, t_out, _sm)   \  static struct nmk_i2c_controller u8500_i2c##id##_data = { \        /*                              \