From patchwork Wed Dec 28 22:57:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 9490747 X-Patchwork-Delegate: agross@codeaurora.org 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 D29D062AB0 for ; Wed, 28 Dec 2016 23:01:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BCCF626242 for ; Wed, 28 Dec 2016 23:01:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AF61126490; Wed, 28 Dec 2016 23:01:04 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5140726242 for ; Wed, 28 Dec 2016 23:01:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752245AbcL1XAp (ORCPT ); Wed, 28 Dec 2016 18:00:45 -0500 Received: from mail-pg0-f42.google.com ([74.125.83.42]:36087 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752247AbcL1W5a (ORCPT ); Wed, 28 Dec 2016 17:57:30 -0500 Received: by mail-pg0-f42.google.com with SMTP id f188so159839940pgc.3 for ; Wed, 28 Dec 2016 14:57:30 -0800 (PST) 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=7+cuLliKUNLr3GScCv9jqYqaJ+tfyproUSg4CDmwAYk=; b=IFJeohzYcFGfD0l7Zdxob6Nqqh4qKrGrEuj0UbRzEZc/8aqC+tzqKBLzKn66dcB6eZ vSOuYxBPIso2/VZCL3gEqvIhWxZEiLzn3DtcFWFEsi0WkeLyMN3+ieSey6v0nfxmK+E6 nYHqtnB+hshAE/RQqQYRSlZmPnYG4pc5MNDA8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=7+cuLliKUNLr3GScCv9jqYqaJ+tfyproUSg4CDmwAYk=; b=nBpZA4jFIFWD3jGe9bLE0C0qldT+TZv0Er7ISvTO3s0hrPg0xoQoitR9ny08Co4Elc O8ZtIPC3OqRo4l+ZaJMNktonAtNFX+pmrsqhhge7owDtx8mgAzUUilLYxvtDkIcB9QWt vYNaZKwMYPBLNZrjFXNkf9drP6qGS3x2po9ZFXvp4hPLquH3hdD3rVzBoIh2k+QE0NSK ffh63/IkThbRK8RRD8Oi4rCoO0l3Gi7dY7stAOtjQpg00tIZSSUNGsA1XbOyTyP9fYZn enOI79OdfUmHBRjYz9RHMCzy4MmGj0TsaYAXETpdZwyfAH3EECeDtbzvEN+u8KFV5tqw Ie+g== X-Gm-Message-State: AIkVDXJhs20jUdNLWV0t3yZvnj3Soj8c9QrhqEA4NgRXkljSAWflFlhvnCHgM/qERpOtB5F8 X-Received: by 10.84.212.144 with SMTP id e16mr82462787pli.140.1482965849941; Wed, 28 Dec 2016 14:57:29 -0800 (PST) Received: from localhost.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id x4sm100355741pgc.14.2016.12.28.14.57.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 28 Dec 2016 14:57:29 -0800 (PST) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, Andy Gross , Bjorn Andersson , Neil Armstrong , Arnd Bergmann , Felipe Balbi , Peter Chen , Greg Kroah-Hartman Subject: [PATCH v6 14/25] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Date: Wed, 28 Dec 2016 14:57:00 -0800 Message-Id: <20161228225711.698-15-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.10.0.297.gf6727b0 In-Reply-To: <20161228225711.698-1-stephen.boyd@linaro.org> References: <20161228225711.698-1-stephen.boyd@linaro.org> Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.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: