From patchwork Mon Aug 6 15:35:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1280291 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id D4DCF3FC23 for ; Mon, 6 Aug 2012 15:38:38 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SyPKr-00043g-Sk; Mon, 06 Aug 2012 15:35:13 +0000 Received: from mail-ee0-f49.google.com ([74.125.83.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SyPKp-00043S-CW for linux-arm-kernel@lists.infradead.org; Mon, 06 Aug 2012 15:35:12 +0000 Received: by eekc13 with SMTP id c13so814502eek.36 for ; Mon, 06 Aug 2012 08:35:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent :x-gm-message-state; bh=j/losCr+FfutdCMQ7oa4QK8vimCA9qzEq6whbBZ1jss=; b=geHMqAhPAZtr5giXe/JpXQRmUPUnlQOipy0+7A91vCHRIGdB95X9xeiMT6rlQJmefB 8R8N8QCyD6xR1fd/rfhBN53R9HijxYbrFpimMdBNKXMM3JuLpIdQBRIhhbuy714yZ/zu vhHmwVoO15m04HdSQI0IX9pIUonclGcM3YZD9S7L1Q2FODaQ2y38sMG7E+6aIcS92etC A+2f+HJeb/c4DHLAJNYRONFVFGFxLxCm09T+O2s+MWoKMlLYNCUpvZ6Sf+CLLB18SJ2q JZoFaupgrbhUeZTUKhneih6L0ZMMq8YpVDDrJsZVsAC7Baid+jU18vTO1u22yFWkhOQI OTzg== Received: by 10.14.198.200 with SMTP id v48mr13718148een.3.1344267309671; Mon, 06 Aug 2012 08:35:09 -0700 (PDT) Received: from gmail.com (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id h2sm5733348eeo.3.2012.08.06.08.35.08 (version=SSLv3 cipher=OTHER); Mon, 06 Aug 2012 08:35:09 -0700 (PDT) Date: Mon, 6 Aug 2012 16:35:06 +0100 From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver. Message-ID: <20120806153503.GH10524@gmail.com> References: <1344266253-14050-1-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1344266253-14050-1-git-send-email-lee.jones@linaro.org> User-Agent: Mutt/1.5.21 (2010-09-15) X-Gm-Message-State: ALoCoQkjz0e7105q4cYQEYZEkQb1PpHk0Er16jht6jCchZbGuGkC50G+L1LFyylJY2IDb/ajfDIt X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.83.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, linux-i2c@vger.kernel.org, linus.walleij@stericsson.com, arnd@arndb.de, w.sang@pengutronix.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Looks like I introduced a merge error on the last patch. Trying again: From: Lee Jones Date: Mon, 6 Aug 2012 11:04:14 +0100 Subject: [PATCH 1/1 v2] i2c: Add default configuration into the Nomadik I2C driver. At this moment in time there is only one known configuration for the Nomadik I2C driver. By not holding that configuration in the driver adds some unnecessary overhead in platform code. The configuration as already been removed from platform code, this patch checks for any over-riding configurations. If there aren't any, the default is used. Cc: linux-i2c@vger.kernel.org Acked-by: srinidhi kasagar Acked-by: Linus Walleij Signed-off-by: Lee Jones --- .../mali/mali400ko/driver/src/devicedrv/mali/arch | 1 + drivers/i2c/busses/i2c-nomadik.c | 28 +++++++++++++------- 2 files changed, 19 insertions(+), 10 deletions(-) create mode 120000 drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch diff --git a/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch new file mode 120000 index 0000000..427334b --- /dev/null +++ b/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch @@ -0,0 +1 @@ +/home/ljkenny/projects/linaro/snowball/snowball/drivers/gpu/mali/mali400ko/driver/src/devicedrv/mali/arch-ux500 \ No newline at end of file diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c index 5e6f1ee..61b00ed 100644 --- a/drivers/i2c/busses/i2c-nomadik.c +++ b/drivers/i2c/busses/i2c-nomadik.c @@ -350,10 +350,6 @@ static void setup_i2c_controller(struct nmk_i2c_dev *dev) i2c_clk = clk_get_rate(dev->clk); - /* fallback to std. mode if machine has not provided it */ - if (dev->cfg.clk_freq == 0) - dev->cfg.clk_freq = 100000; - /* * The spec says, in case of std. mode the divider is * 2 whereas it is 3 for fast and fastplus mode of @@ -911,20 +907,32 @@ static const struct i2c_algorithm nmk_i2c_algo = { .functionality = nmk_i2c_functionality }; +static struct nmk_i2c_controller u8500_i2c = { + /* + * Slave data setup time; 250ns, 100ns, and 10ns, which + * is 14, 6 and 2 respectively for a 48Mhz i2c clock. + */ + .slsu = 0xe, + .tft = 1, /* Tx FIFO threshold */ + .rft = 8, /* Rx FIFO threshold */ + .clk_freq = 400000, /* fast mode operation */ + .timeout = 200, /* Slave response timeout(ms) */ + .sm = I2C_FREQ_MODE_FAST, +}; + static atomic_t adapter_id = ATOMIC_INIT(0); static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id) { int ret = 0; - struct nmk_i2c_controller *pdata = - adev->dev.platform_data; + struct nmk_i2c_controller *pdata = adev->dev.platform_data; struct nmk_i2c_dev *dev; struct i2c_adapter *adap; - if (!pdata) { - dev_warn(&adev->dev, "no platform data\n"); - return -ENODEV; - } + if (!pdata) + /* No i2c configuration found, using the default. */ + pdata = &u8500_i2c; + dev = kzalloc(sizeof(struct nmk_i2c_dev), GFP_KERNEL); if (!dev) { dev_err(&adev->dev, "cannot allocate memory\n");