From patchwork Fri Dec 5 19:15:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Fainelli X-Patchwork-Id: 5445471 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 05041BEEA8 for ; Fri, 5 Dec 2014 19:18:10 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2DD9E201ED for ; Fri, 5 Dec 2014 19:18:09 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5E44D20145 for ; Fri, 5 Dec 2014 19:18:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XwyMW-0000Fi-0A; Fri, 05 Dec 2014 19:16:20 +0000 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XwyMS-0000BH-Lp for linux-arm-kernel@lists.infradead.org; Fri, 05 Dec 2014 19:16:17 +0000 Received: by mail-pa0-f53.google.com with SMTP id kq14so1211776pab.26 for ; Fri, 05 Dec 2014 11:15:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=7e3icYTp3ALvfPNp39MdcqJ95DviHChGQfmN/KnrW9E=; b=LMuBUY3Pwm+gDxcmOHC3f9EreppHW/X4e9KhQNVAcyIPCn/xJCilFoOlUixTXzopsc +sR/0OrgVCL4/oa/eRs0I18TluIp5WelD1GvlJHW4BnLChs0yRbiDZ7OdS+iTDET97hS 1hcinkW+m+I6Dkf2ZuwFP8p24gGQdeLgJ4778/QCSPK9h+RX8tQODhHZnbY3pWJoQTMo x4mdgT1D0iwzBO1I0g1QzypcwpW1j8uqCDasD2IQaNQtEzSOiTISV2iCqioSmtVv3RyQ SyWQQkQrwvqbdYYjxi42tLjs84A5+QLP6A3DZe3ASqxmG9kDE1PKL0M/ZSjEvILxjVd+ VThw== X-Received: by 10.69.14.33 with SMTP id fd1mr38656629pbd.90.1417806954792; Fri, 05 Dec 2014 11:15:54 -0800 (PST) Received: from fainelli-desktop.broadcom.com (5520-maca-inet1-outside.broadcom.com. [216.31.211.11]) by mx.google.com with ESMTPSA id yo1sm7492679pab.27.2014.12.05.11.15.53 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 05 Dec 2014 11:15:53 -0800 (PST) From: Florian Fainelli To: arm@kernel.org Subject: [PATCH for-next] bus: brcmstb_gisb: use gdev_{read, write} in suspend/resume paths Date: Fri, 5 Dec 2014 11:15:43 -0800 Message-Id: <1417806943-1200-1-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141205_111616_778969_7B57ECD3 X-CRM114-Status: GOOD ( 10.92 ) X-Spam-Score: -0.8 (/) Cc: olof@lixom.net, Florian Fainelli , cernekee@gmail.com, linux-arm-kernel@lists.infradead.org, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch fixes a small merge issue between: Commit 2b53eadcea05 ("bus: brcmstb_gisb: Introduce wrapper functions for MMIO accesses") and 203bb85ed605 ("bus: brcmstb_gisb: save and restore GISB timeout"), the former introducing wrapper I/O accessors to be decoupled from the register offsets and use table, while the latter had not been converted to using these wrapper. Signed-off-by: Florian Fainelli --- Arnd, Olof, This applies on top of your arm-soc/for-next branch as of 921caee4a849443bcda286f903b6ec01c5aa7fd8 ("arm-soc: document merges") Thanks! drivers/bus/brcmstb_gisb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/bus/brcmstb_gisb.c b/drivers/bus/brcmstb_gisb.c index fa7b3cd09fc0..46de8dc39eb4 100644 --- a/drivers/bus/brcmstb_gisb.c +++ b/drivers/bus/brcmstb_gisb.c @@ -359,7 +359,7 @@ static int brcmstb_gisb_arb_suspend(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); - gdev->saved_timeout = ioread32(gdev->base + ARB_TIMER); + gdev->saved_timeout = gisb_read(gdev, ARB_TIMER); return 0; } @@ -372,7 +372,7 @@ static int brcmstb_gisb_arb_resume_noirq(struct device *dev) struct platform_device *pdev = to_platform_device(dev); struct brcmstb_gisb_arb_device *gdev = platform_get_drvdata(pdev); - iowrite32(gdev->saved_timeout, gdev->base + ARB_TIMER); + gisb_write(gdev, gdev->saved_timeout, ARB_TIMER); return 0; }