From patchwork Wed Sep 7 21:35:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 75708 Delivered-To: patch@linaro.org Received: by 10.140.106.11 with SMTP id d11csp526461qgf; Wed, 7 Sep 2016 14:37:24 -0700 (PDT) X-Received: by 10.66.82.42 with SMTP id f10mr86655563pay.17.1473284240382; Wed, 07 Sep 2016 14:37:20 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id lo4si43010147pab.269.2016.09.07.14.37.20; Wed, 07 Sep 2016 14:37:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935768AbcIGVhJ (ORCPT + 4 others); Wed, 7 Sep 2016 17:37:09 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:36457 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757385AbcIGVfi (ORCPT ); Wed, 7 Sep 2016 17:35:38 -0400 Received: by mail-pa0-f51.google.com with SMTP id id6so9963516pad.3 for ; Wed, 07 Sep 2016 14:35: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=ZWlnQpqx2W99HerlDGOjGtRvadVnsArswzngB2fHxFHPXERfcpOnotvnXFgaqmKyNE jvTEy02wKM113a4X+ryXywJ/A43T1TgaLRr2WQEjkL0ych7wt7eabtrFxlaLe9tyAFKG EgdbtXj/oA7Qcdn8F6kQANSdXRIzNSBzpXOsQ= 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=ERHgNYyzuH3+UVmROJfEOxbPuyo/2YCEOyPKeX+O9wHoNCWZ8XhcYCOEmxxEPvqLNG S/95evaEhzvgbyWXRUMHyoLiLYVWJeyA/erbj4fcdKWsFWdaWJKfauW1FzqIz3Txl5VW FVu0qEmDpIt1URbXn4oTyjHmouCsxcQQLiuCVWwbna9rXeun+ma7BOfzZOegvO012zvX tl+ASMe3xzzavIXVksoRy0b1EdelaIUCO/e1qFdMrFxvzHGOFR9SzEBvfyh46gAmZhtY RBZZ/qkXRFV8J9XrBSliIB6ebmAJASflc5giOJtEs85DyUEe9anAfTcHoGOpskDiHiwZ OCVg== X-Gm-Message-State: AE9vXwNoOG9yJRUX62embsXtZOf/SVicPFfcLm4DR7sFgIc4P28YTShC4b1V68Z1HAAv6gEg X-Received: by 10.66.155.129 with SMTP id vw1mr85842229pab.148.1473284138106; Wed, 07 Sep 2016 14:35:38 -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 75sm51015417pfw.92.2016.09.07.14.35.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 Sep 2016 14:35:37 -0700 (PDT) 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 v4 13/22] usb: chipidea: msm: Use hw_write_id_reg() instead of writel Date: Wed, 7 Sep 2016 14:35:10 -0700 Message-Id: <20160907213519.27340-14-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160907213519.27340-1-stephen.boyd@linaro.org> References: <20160907213519.27340-1-stephen.boyd@linaro.org> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org 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(-) -- 2.9.0.rc2.8.ga28705d -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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: