From patchwork Wed May 18 21:24:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102320 Delivered-To: patch@linaro.org Received: by 10.140.92.199 with SMTP id b65csp2858743qge; Wed, 18 May 2016 14:25:45 -0700 (PDT) X-Received: by 10.67.14.7 with SMTP id fc7mr13985434pad.1.1463606745385; Wed, 18 May 2016 14:25:45 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 192si788168pfw.92.2016.05.18.14.25.45; Wed, 18 May 2016 14:25:45 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754212AbcERVZn (ORCPT + 29 others); Wed, 18 May 2016 17:25:43 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:52974 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133AbcERVY4 (ORCPT ); Wed, 18 May 2016 17:24:56 -0400 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue004) with ESMTPA (Nemesis) id 0MV0jR-1b4S9t2Acn-00YUQM; Wed, 18 May 2016 23:24:40 +0200 From: Arnd Bergmann To: Felipe Balbi Cc: Arnd Bergmann , Andy Gross , David Brown , Peter Chen , Greg Kroah-Hartman , Alan Stern , Mark Brown , Bjorn Andersson , linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-usb@vger.kernel.org Subject: [RFC 5/8] usb: phy: msm: move register definitions into driver Date: Wed, 18 May 2016 23:24:10 +0200 Message-Id: <1463606653-325131-6-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1463606653-325131-1-git-send-email-arnd@arndb.de> References: <1463606653-325131-1-git-send-email-arnd@arndb.de> X-Provags-ID: V03:K0:MJ5EIgqaXNQ/9DP2pg3t/I0j9QsUg55t3V8i7W5bcgug1+4LQWZ P0r4pz9x/I0rchqvecL3dgIVbImajfNJFmyk6jLj+Fvz9DmuTQCG+KnDzDDhJVchIHQwWd6 CQ3Po9jArh0+jzKD6YZxPrHk3Zdn/vp3RLKTa+JLt6pETE7lWy250sFgqTWmi2Ub3+tvHww BfxtPYV7Sw3dSH44T+2wg== X-UI-Out-Filterresults: notjunk:1; V01:K0:gsXdwSPVck0=:mQdMEq1jMIchhJ/qLfsmDY G8VtPl/MR31XiwmhhnSostsMa58Lj2/5J2FHG1iOlY5/zI+q8bIF7zFSD3NLtKW5/K7/TXAwI 7AOmiBFzoGY8zCarV0P41VbES553k+DynQ/ArtTijfVCEmR2KrWXNtErG6sQclLcMNACQDjPL VQiMYPzNHBRweAYA/bS71/Xc75G2hWnYAhVZFQ768JuEs1ECDOupEXb8p83X5UMvp7miTIh/M GfWoQkRq9Xj7c4Gdwehr9lm1ijhYemBKIbVgMxxJJ/qusaNLg5OlcBF/2I0cBWVbs0Tm7RheE MGeqxHurWEOOcbumProsEwPnKBopx09AdLCHIg9Ru/nwA6STwlk5ozt9xh+rPRqc9kTQJWL4y yeHj3+gMYPhcmpBmnq2Vg6RrCUt7XvPT+GGjQhkzS4UqTbkOXyzDbE9w9E1JTtW3/wjhhziL8 Y+W4zpX4hnraIkOp0uFo1rbzfy8lHcRLmrA/mUEs4ssZaDWXFy+cGsFfzismN34GIASF7nVT3 hy2Dh99mRYPT1UbTP5k1Xrp26X7OH5yfI8//dKzvnTiP29gxSqJBet1IH/h/bQapGXAjjeqOU G3mwlUhZ/4o6FTBuo2QIInKZ2VmzSbdrkHE+zEP4wollRsFoV2n/GhT+30MimtYBnEfyO4o/i rjvZHVbOlnaaxnPV8K+XVbad0Sf0BaOLBDBItsPreUfsNULO68UoG9aOyPmVcm05KUBw= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The linux/usb/msm_hsusb_hw.h header is now only included by one file and can be merged into that for simplicity. Signed-off-by: Arnd Bergmann --- drivers/usb/phy/phy-msm-usb.c | 56 +++++++++++++++++++++++++++++- include/linux/usb/msm_hsusb_hw.h | 74 ---------------------------------------- 2 files changed, 55 insertions(+), 75 deletions(-) delete mode 100644 include/linux/usb/msm_hsusb_hw.h -- 2.7.0 diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c index f559d73fd7bc..ea4ed6c17b00 100644 --- a/drivers/usb/phy/phy-msm-usb.c +++ b/drivers/usb/phy/phy-msm-usb.c @@ -46,9 +46,63 @@ #include #include #include -#include #include +#define USB_AHBBURST (MSM_USB_BASE + 0x0090) +#define USB_AHBMODE (MSM_USB_BASE + 0x0098) +#define USB_GENCONFIG_2 (MSM_USB_BASE + 0x00a0) +#define ULPI_TX_PKT_EN_CLR_FIX BIT(19) + +#define USB_CAPLENGTH (MSM_USB_BASE + 0x0100) /* 8 bit */ + +#define USB_USBCMD (MSM_USB_BASE + 0x0140) +#define USB_PORTSC (MSM_USB_BASE + 0x0184) +#define USB_OTGSC (MSM_USB_BASE + 0x01A4) +#define USB_USBMODE (MSM_USB_BASE + 0x01A8) +#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240) +#define USB_PHY_CTRL2 (MSM_USB_BASE + 0x0278) + +#define GENCONFIG_2_SESS_VLD_CTRL_EN BIT(7) +#define USBCMD_SESS_VLD_CTRL BIT(25) + +#define USBCMD_RESET 2 +#define USB_USBINTR (MSM_USB_BASE + 0x0148) + +#define PORTSC_PHCD (1 << 23) /* phy suspend mode */ +#define PORTSC_PTS_MASK (3 << 30) +#define PORTSC_PTS_ULPI (2 << 30) +#define PORTSC_PTS_SERIAL (3 << 30) + +#define USB_ULPI_VIEWPORT (MSM_USB_BASE + 0x0170) +#define ULPI_RUN (1 << 30) +#define ULPI_WRITE (1 << 29) +#define ULPI_READ (0 << 29) +#define ULPI_ADDR(n) (((n) & 255) << 16) +#define ULPI_DATA(n) ((n) & 255) +#define ULPI_DATA_READ(n) (((n) >> 8) & 255) + +/* synopsys 28nm phy registers */ +#define ULPI_PWR_CLK_MNG_REG 0x88 +#define OTG_COMP_DISABLE BIT(0) + +#define ULPI_MISC_A 0x96 +#define ULPI_MISC_A_VBUSVLDEXTSEL BIT(1) +#define ULPI_MISC_A_VBUSVLDEXT BIT(0) + +#define ASYNC_INTR_CTRL (1 << 29) /* Enable async interrupt */ +#define ULPI_STP_CTRL (1 << 30) /* Block communication with PHY */ +#define PHY_RETEN (1 << 1) /* PHY retention enable/disable */ +#define PHY_POR_ASSERT (1 << 0) /* USB2 28nm PHY POR ASSERT */ + +/* OTG definitions */ +#define OTGSC_INTSTS_MASK (0x7f << 16) +#define OTGSC_ID (1 << 8) +#define OTGSC_BSV (1 << 11) +#define OTGSC_IDIS (1 << 16) +#define OTGSC_BSVIS (1 << 19) +#define OTGSC_IDIE (1 << 24) +#define OTGSC_BSVIE (1 << 27) + /** * OTG control * diff --git a/include/linux/usb/msm_hsusb_hw.h b/include/linux/usb/msm_hsusb_hw.h deleted file mode 100644 index 368e94389bf1..000000000000 --- a/include/linux/usb/msm_hsusb_hw.h +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2007 Google, Inc. - * Author: Brian Swetland - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - */ - -#ifndef __LINUX_USB_GADGET_MSM72K_UDC_H__ -#define __LINUX_USB_GADGET_MSM72K_UDC_H__ - -#define USB_AHBBURST (MSM_USB_BASE + 0x0090) -#define USB_AHBMODE (MSM_USB_BASE + 0x0098) -#define USB_GENCONFIG_2 (MSM_USB_BASE + 0x00a0) -#define ULPI_TX_PKT_EN_CLR_FIX BIT(19) - -#define USB_CAPLENGTH (MSM_USB_BASE + 0x0100) /* 8 bit */ - -#define USB_USBCMD (MSM_USB_BASE + 0x0140) -#define USB_PORTSC (MSM_USB_BASE + 0x0184) -#define USB_OTGSC (MSM_USB_BASE + 0x01A4) -#define USB_USBMODE (MSM_USB_BASE + 0x01A8) -#define USB_PHY_CTRL (MSM_USB_BASE + 0x0240) -#define USB_PHY_CTRL2 (MSM_USB_BASE + 0x0278) - -#define GENCONFIG_2_SESS_VLD_CTRL_EN BIT(7) -#define USBCMD_SESS_VLD_CTRL BIT(25) - -#define USBCMD_RESET 2 -#define USB_USBINTR (MSM_USB_BASE + 0x0148) - -#define PORTSC_PHCD (1 << 23) /* phy suspend mode */ -#define PORTSC_PTS_MASK (3 << 30) -#define PORTSC_PTS_ULPI (2 << 30) -#define PORTSC_PTS_SERIAL (3 << 30) - -#define USB_ULPI_VIEWPORT (MSM_USB_BASE + 0x0170) -#define ULPI_RUN (1 << 30) -#define ULPI_WRITE (1 << 29) -#define ULPI_READ (0 << 29) -#define ULPI_ADDR(n) (((n) & 255) << 16) -#define ULPI_DATA(n) ((n) & 255) -#define ULPI_DATA_READ(n) (((n) >> 8) & 255) - -/* synopsys 28nm phy registers */ -#define ULPI_PWR_CLK_MNG_REG 0x88 -#define OTG_COMP_DISABLE BIT(0) - -#define ULPI_MISC_A 0x96 -#define ULPI_MISC_A_VBUSVLDEXTSEL BIT(1) -#define ULPI_MISC_A_VBUSVLDEXT BIT(0) - -#define ASYNC_INTR_CTRL (1 << 29) /* Enable async interrupt */ -#define ULPI_STP_CTRL (1 << 30) /* Block communication with PHY */ -#define PHY_RETEN (1 << 1) /* PHY retention enable/disable */ -#define PHY_POR_ASSERT (1 << 0) /* USB2 28nm PHY POR ASSERT */ - -/* OTG definitions */ -#define OTGSC_INTSTS_MASK (0x7f << 16) -#define OTGSC_ID (1 << 8) -#define OTGSC_BSV (1 << 11) -#define OTGSC_IDIS (1 << 16) -#define OTGSC_BSVIS (1 << 19) -#define OTGSC_IDIE (1 << 24) -#define OTGSC_BSVIE (1 << 27) - -#endif /* __LINUX_USB_GADGET_MSM72K_UDC_H__ */