From patchwork Thu Jul 7 22:21:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9219755 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id E1537607D9 for ; Thu, 7 Jul 2016 22:26:00 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D258F28488 for ; Thu, 7 Jul 2016 22:26:00 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C52AF283F5; Thu, 7 Jul 2016 22:26:00 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5260F283F5 for ; Thu, 7 Jul 2016 22:26:00 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bLHiD-0001YN-8x; Thu, 07 Jul 2016 22:24:01 +0000 Received: from mail-pa0-x235.google.com ([2607:f8b0:400e:c03::235]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bLHgD-0007fO-OZ for linux-arm-kernel@lists.infradead.org; Thu, 07 Jul 2016 22:21:59 +0000 Received: by mail-pa0-x235.google.com with SMTP id b13so9533912pat.0 for ; Thu, 07 Jul 2016 15:21:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XMlwgRKfa9b5rDN0l0bSBaQXIHXQvpOK7c7qjHHLFdM=; b=PbLBG3X4PrY7BTmfkTk3v8f0JsQfJDdhxTaBKbGeXc2OTz3o2qSfGlSlM250HdVkSy x4zxbEQfl1AwtEGJ0yVIfibR4t/oQJkecPE5JlhK969opvfTR9Ctv1jtM7/kM85wqTUe +d7yfYkGPPgqE+tc1kCQgrA1YVwOivRc8n8ls= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XMlwgRKfa9b5rDN0l0bSBaQXIHXQvpOK7c7qjHHLFdM=; b=jFLGJ7u03aDGmtBcUj5kkCcbSZewPZJiHRnRbFxzvETvEDRXwyByXE+0naucljhiln LHxE0Gom1vGKYvudgcWdW/QUSVyvPAq8w5yFnlxs9AyZhfJNRD0YUPnxpU08D3eOtYhn 0NKvaOJzD9LBaRIP3l6MnuaZ0mZK/Xq1p3xpfJPWubnKR9ElAbQuVD23HMAaob2VWNsY BUjkKXOCc1c5YSqIfM7HIvDfC3A9JKmlJ0qMbkNI567lzbIP4Sv7f0q506aUO+dOlHWs 0oDFErO9OAb7oduzsIWNS6sCY3uri1UCdjoHLIqUPmHnLmi+9cIfftL+mU64ZIuRVvJ2 EvNQ== X-Gm-Message-State: ALyK8tJMkLE8lK0OP2vDD+hDaxRqCnpmiHXlL0Spe2a9GeWLtp1imF8GyuQZRliHVzbmaKqk X-Received: by 10.66.62.226 with SMTP id b2mr4200661pas.119.1467930097969; Thu, 07 Jul 2016 15:21:37 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id j8sm6781807paj.22.2016.07.07.15.21.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 07 Jul 2016 15:21:37 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Subject: [PATCH v2 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Date: Thu, 7 Jul 2016 15:21:04 -0700 Message-Id: <20160707222114.1673-14-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160707222114.1673-1-stephen.boyd@linaro.org> References: <20160707222114.1673-1-stephen.boyd@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160707_152157_972503_A887A8AA X-CRM114-Status: GOOD ( 13.86 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , Arnd Bergmann , Neil Armstrong , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Bjorn Andersson , Greg Kroah-Hartman , Andy Gross , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The MSM_USB_BASE macro trick is not very clear, and we're using it for only one register write so let's just move to using hw_write_id_reg() and passing the ci pointer instead. That clearly shows what offset we're using and avoids needing to include the msm_hsusb_hw.h file when we're going to delete that file soon. Acked-by: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- drivers/usb/chipidea/ci_hdrc_msm.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/usb/chipidea/ci_hdrc_msm.c b/drivers/usb/chipidea/ci_hdrc_msm.c index 719b20caf88e..b282a717bf8c 100644 --- a/drivers/usb/chipidea/ci_hdrc_msm.c +++ b/drivers/usb/chipidea/ci_hdrc_msm.c @@ -8,14 +8,12 @@ #include #include #include -#include -#include #include #include #include "ci.h" -#define MSM_USB_BASE (ci->hw_bank.abs) +#define HS_PHY_AHB_MODE 0x0098 static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) { @@ -25,7 +23,7 @@ static void ci_hdrc_msm_notify_event(struct ci_hdrc *ci, unsigned event) case CI_HDRC_CONTROLLER_RESET_EVENT: dev_dbg(dev, "CI_HDRC_CONTROLLER_RESET_EVENT received\n"); /* use AHB transactor, allow posted data writes */ - writel(0x8, USB_AHBMODE); + hw_write_id_reg(ci, HS_PHY_AHB_MODE, 0xffffffff, 0x8); usb_phy_init(ci->usb_phy); break; case CI_HDRC_CONTROLLER_STOPPED_EVENT: