From patchwork Wed Sep 18 12:51:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thierry Reding X-Patchwork-Id: 275704 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 8A61F2C00F3 for ; Wed, 18 Sep 2013 22:52:55 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752027Ab3IRMwy (ORCPT ); Wed, 18 Sep 2013 08:52:54 -0400 Received: from mail-bk0-f50.google.com ([209.85.214.50]:55588 "EHLO mail-bk0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751906Ab3IRMwx (ORCPT ); Wed, 18 Sep 2013 08:52:53 -0400 Received: by mail-bk0-f50.google.com with SMTP id mz11so2868126bkb.9 for ; Wed, 18 Sep 2013 05:52:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=XG+HO+/bg964bnme11VLdiIrKv/iOShY1zDKQ1g7OG8=; b=0Rz0Vq38CUsh387CVKAY3HvqmkWdGVG5BvEh6OnTwIsqWZ04kuSUc8O6K6OHcypnI0 VFLPoajcwxWkm/xV4t2MdYJSPaUOTrKm/yIzTu2/V8A6OMf34wkO9OwGH3bpfl+wgz82 erSnlSWax3vq/DJ57SUIUfttSmL9NZmAaHJZIoihMJ86u3PnLkgfLowcZ/yU/u9mI255 elQgXXCDV0EFQk3lI3Cl9F1pY7pz8XTwFT2I20/hoHS2ItGBELQYK0N1xrEneQ83nC3E MVJDckyOH5uBHBDbts6UiOk6S3GjkEcJVqAOW0C+18a1VZiKW3Z8zhZto6t+Mq115qeR V31w== X-Received: by 10.204.60.66 with SMTP id o2mr34562546bkh.22.1379508769977; Wed, 18 Sep 2013 05:52:49 -0700 (PDT) Received: from localhost (port-55509.pppoe.wtnet.de. [46.59.217.135]) by mx.google.com with ESMTPSA id kk2sm826630bkb.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:52:49 -0700 (PDT) From: Thierry Reding To: Wolfram Sang Cc: linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] i2c: mv64xxx: Do not use writel_relaxed() Date: Wed, 18 Sep 2013 14:51:40 +0200 Message-Id: <1379508700-30400-1-git-send-email-treding@nvidia.com> X-Mailer: git-send-email 1.8.4 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The driver is used on PowerPC which don't provide writel_relaxed(). This breaks the c2k and prpmc2800 default configurations. To fix the build, turn the calls to writel_relaxed() into writel(). The impacts for ARM should be minimal. Signed-off-by: Thierry Reding --- drivers/i2c/busses/i2c-mv64xxx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/i2c/busses/i2c-mv64xxx.c b/drivers/i2c/busses/i2c-mv64xxx.c index 7f3a474..5aead74 100644 --- a/drivers/i2c/busses/i2c-mv64xxx.c +++ b/drivers/i2c/busses/i2c-mv64xxx.c @@ -234,9 +234,9 @@ static int mv64xxx_i2c_offload_msg(struct mv64xxx_i2c_data *drv_data) ctrl_reg |= MV64XXX_I2C_BRIDGE_CONTROL_WR | (msg->len - 1) << MV64XXX_I2C_BRIDGE_CONTROL_TX_SIZE_SHIFT; - writel_relaxed(data_reg_lo, + writel(data_reg_lo, drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_LO); - writel_relaxed(data_reg_hi, + writel(data_reg_hi, drv_data->reg_base + MV64XXX_I2C_REG_TX_DATA_HI); } else {