From patchwork Fri Oct 20 17:20:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 116533 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1927582qgn; Fri, 20 Oct 2017 10:21:16 -0700 (PDT) X-Received: by 10.99.95.139 with SMTP id t133mr5021705pgb.448.1508520076086; Fri, 20 Oct 2017 10:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508520076; cv=none; d=google.com; s=arc-20160816; b=XOC7tDid6nJeg6opiwzhTM/+jz9T7DOxkOlInEoewhmjDMRlIotDHPe8FBhNprBNyo v4KJrrgB1Pk2BAqRhxQgq1q2eZlmrGO5sYrp1Zel9O5bf+0wCJW8tWiNjOkaHyI0K+qe fqfZS5oCKlMZLwShAohATu0w331Zv77H1uD9bLbHVlyAMQEqMUMCVrxs9gFZiw9jJ/q+ FWh0YJYe0kTw69xITKEGZjaO92yHz/nfainKw5YyRZQKmMQk6SGCpPeS7OlnkvakP2Ep eppVwPrzi5d8/qSrBrJsbc694Eao9C0M35xbLYxHBLNfv5mopRoHwWOMP4LnJy+Bv2AY HecQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=rD3mFVfIH42oM79f/V1uG26xeXN2lfTBmzVJJ8ZmmeI=; b=KOvIxU4bbJ877W7ARZ1ENv9DLNY2tZosLVaWMJ3vTNmhHKSfxFWKqH/axXiyPQ6BpI o2EelLP1QBL8oQ2Mo+TLUXTv9Z9VBXZ77GanvXWZKEtqBYkeEzw9SPHfuKOWzmb+iJpn DVUGtnB4awjq+sY1eCJ268VDrHVM5p0svrN+EMN1bLaoFpCsx8EhIVMI/0C/SP9bibXQ hrwXXT4mBaxDgrEeU3Ki755VOiz4zIQ454zvtB4HlYBcRQLtZiPayJbbEYB45F6EQRnO cbOSG6YUCnd4zKP+MVH/USV4syZYE7pwRxBYSalG6+c5BN8RrGBeTQs71g4xf/qCWUxb yUDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jY2rcgMX; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1si817516plu.200.2017.10.20.10.21.15; Fri, 20 Oct 2017 10:21:16 -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; dkim=pass header.i=@linaro.org header.s=google header.b=jY2rcgMX; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753539AbdJTRVO (ORCPT + 27 others); Fri, 20 Oct 2017 13:21:14 -0400 Received: from mail-it0-f65.google.com ([209.85.214.65]:45474 "EHLO mail-it0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753082AbdJTRUa (ORCPT ); Fri, 20 Oct 2017 13:20:30 -0400 Received: by mail-it0-f65.google.com with SMTP id n195so14802331itg.0 for ; Fri, 20 Oct 2017 10:20:30 -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=rD3mFVfIH42oM79f/V1uG26xeXN2lfTBmzVJJ8ZmmeI=; b=jY2rcgMXoIJedRiwA4jRyw095+iHzRgn7vE02a0vxrze6aodj+trIDx3FMGDws6m2m TxuJBzER5pZL3ACsRcefcEsUM1/jMSOlEQyV3YUnKa1XyoGMIxqLJR8x37fL0F1h+Dbs M+6wwiiPl5agpJqmekV1oK0IotwmwCW9QKCrE= 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=rD3mFVfIH42oM79f/V1uG26xeXN2lfTBmzVJJ8ZmmeI=; b=OMFSXKMC4Qj3WM2OxWn24/2TovO535AWlj22M1Qlp9WeRHyupsmDSprizKB5BRJiap mOQLEdC1un98nMl7hA1B4gbJJd/d7KZ6mWJVv2prFM5kVnUnCR+zr0qSGm0YGReHrYUr lJAmeQyPH0yRFB4KebAT1TKyUc02iWWObgn5ypq7PFpCsT/jPpttoGa8u8MOyorSyUnY MmtL0crxgxbSdK9dU1xtEhqkLFTay+WR0S4Y1dDonWP3c6lmJzie3HiVYOI58ErkeZhd sI0ZGN5AUL/3b1a/OP3Fq0g6Qs77u7MX/EsVQVaYiGxUOuwTPKhMJOWQlMNM+8WL+/rj eYZw== X-Gm-Message-State: AMCzsaVWYSJ76XNhlszz5WvTg1Jum4u+73n303hnoTSsQ7WQqJ7tfQxv /5FKVWghYHeDO4TD7wuuNsFd1w== X-Google-Smtp-Source: ABhQp+SJMr/+mUFQykRuuZ0anEFS7Nj8kRfUn+YU8+eNnvIgubVGKhZzDSgcnJXfJy5VG7Qp3trpTA== X-Received: by 10.36.36.9 with SMTP id f9mr3452600ita.11.1508520029875; Fri, 20 Oct 2017 10:20:29 -0700 (PDT) Received: from localhost.localdomain (c-24-245-18-91.hsd1.mn.comcast.net. [24.245.18.91]) by smtp.gmail.com with ESMTPSA id s81sm523997ioe.84.2017.10.20.10.20.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 20 Oct 2017 10:20:28 -0700 (PDT) From: Alex Elder To: andy.gross@linaro.org, catalin.marinas@arm.com, will.deacon@arm.com, arnd@arndb.de Cc: linux-arm-msm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/3] arm64: defconfig: remove CONFIG_USB_EHCI_MSM Date: Fri, 20 Oct 2017 12:20:19 -0500 Message-Id: <20171020172021.8119-2-elder@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171020172021.8119-1-elder@linaro.org> References: <20171020172021.8119-1-elder@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org No Qualcomm SoC requires the "ehci-msm.c" code any more. So remove the code, and remove the config option from the arm64 defconfig. Suggested-by: Stephen Boyd Signed-off-by: Alex Elder Acked-by: Bjorn Andersson --- arch/arm64/configs/defconfig | 1 - drivers/usb/host/Makefile | 1 - drivers/usb/host/ehci-msm.c | 265 ------------------------------------------- 3 files changed, 267 deletions(-) delete mode 100644 drivers/usb/host/ehci-msm.c -- 2.11.0 diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 34480e9af2e7..4d0b96bb340a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -410,7 +410,6 @@ CONFIG_USB_OTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_TEGRA=y CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_MSM=y CONFIG_USB_EHCI_EXYNOS=y CONFIG_USB_EHCI_HCD_PLATFORM=y CONFIG_USB_OHCI_HCD=y diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index cf2691fffcc0..1645c549bdb1 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -39,7 +39,6 @@ obj-$(CONFIG_USB_EHCI_HCD_SPEAR) += ehci-spear.o obj-$(CONFIG_USB_EHCI_HCD_STI) += ehci-st.o obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o -obj-$(CONFIG_USB_EHCI_MSM) += ehci-msm.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o diff --git a/drivers/usb/host/ehci-msm.c b/drivers/usb/host/ehci-msm.c deleted file mode 100644 index 2f8d3af811ce..000000000000 --- a/drivers/usb/host/ehci-msm.c +++ /dev/null @@ -1,265 +0,0 @@ -/* ehci-msm.c - HSUSB Host Controller Driver Implementation - * - * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved. - * - * Partly derived from ehci-fsl.c and ehci-hcd.c - * Copyright (c) 2000-2004 by David Brownell - * Copyright (c) 2005 MontaVista Software - * - * All source code in this file is licensed under the following license except - * where indicated. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - * - * 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. - * You should have received a copy of the GNU General Public License - * along with this program; if not, you can find it at http://www.fsf.org - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "ehci.h" - -#define MSM_USB_BASE (hcd->regs) - -#define DRIVER_DESC "Qualcomm On-Chip EHCI Host Controller" - -static const char hcd_name[] = "ehci-msm"; -static struct hc_driver __read_mostly msm_hc_driver; - -static int ehci_msm_reset(struct usb_hcd *hcd) -{ - struct ehci_hcd *ehci = hcd_to_ehci(hcd); - int retval; - - ehci->caps = USB_CAPLENGTH; - hcd->has_tt = 1; - - retval = ehci_setup(hcd); - if (retval) - return retval; - - /* select ULPI phy and clear other status/control bits in PORTSC */ - writel(PORTSC_PTS_ULPI, USB_PORTSC); - /* bursts of unspecified length. */ - writel(0, USB_AHBBURST); - /* Use the AHB transactor, allow posted data writes */ - writel(0x8, USB_AHBMODE); - /* Disable streaming mode and select host mode */ - writel(0x13, USB_USBMODE); - /* Disable ULPI_TX_PKT_EN_CLR_FIX which is valid only for HSIC */ - writel(readl(USB_GENCONFIG_2) & ~ULPI_TX_PKT_EN_CLR_FIX, USB_GENCONFIG_2); - - return 0; -} - -static int ehci_msm_probe(struct platform_device *pdev) -{ - struct usb_hcd *hcd; - struct resource *res; - struct usb_phy *phy; - int ret; - - dev_dbg(&pdev->dev, "ehci_msm proble\n"); - - hcd = usb_create_hcd(&msm_hc_driver, &pdev->dev, dev_name(&pdev->dev)); - if (!hcd) { - dev_err(&pdev->dev, "Unable to create HCD\n"); - return -ENOMEM; - } - - ret = platform_get_irq(pdev, 0); - if (ret < 0) { - dev_err(&pdev->dev, "Unable to get IRQ resource\n"); - goto put_hcd; - } - hcd->irq = ret; - - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!res) { - dev_err(&pdev->dev, "Unable to get memory resource\n"); - ret = -ENODEV; - goto put_hcd; - } - - hcd->rsrc_start = res->start; - hcd->rsrc_len = resource_size(res); - hcd->regs = devm_ioremap(&pdev->dev, hcd->rsrc_start, hcd->rsrc_len); - if (!hcd->regs) { - dev_err(&pdev->dev, "ioremap failed\n"); - ret = -ENOMEM; - goto put_hcd; - } - - /* - * If there is an OTG driver, let it take care of PHY initialization, - * clock management, powering up VBUS, mapping of registers address - * space and power management. - */ - if (pdev->dev.of_node) - phy = devm_usb_get_phy_by_phandle(&pdev->dev, "usb-phy", 0); - else - phy = devm_usb_get_phy(&pdev->dev, USB_PHY_TYPE_USB2); - - if (IS_ERR(phy)) { - if (PTR_ERR(phy) == -EPROBE_DEFER) { - dev_err(&pdev->dev, "unable to find transceiver\n"); - ret = -EPROBE_DEFER; - goto put_hcd; - } - phy = NULL; - } - - hcd->usb_phy = phy; - device_init_wakeup(&pdev->dev, 1); - - if (phy && phy->otg) { - /* - * MSM OTG driver takes care of adding the HCD and - * placing hardware into low power mode via runtime PM. - */ - ret = otg_set_host(phy->otg, &hcd->self); - if (ret < 0) { - dev_err(&pdev->dev, "unable to register with transceiver\n"); - goto put_hcd; - } - - pm_runtime_no_callbacks(&pdev->dev); - pm_runtime_enable(&pdev->dev); - } else { - ret = usb_add_hcd(hcd, hcd->irq, IRQF_SHARED); - if (ret) - goto put_hcd; - } - - return 0; - -put_hcd: - usb_put_hcd(hcd); - - return ret; -} - -static int ehci_msm_remove(struct platform_device *pdev) -{ - struct usb_hcd *hcd = platform_get_drvdata(pdev); - - device_init_wakeup(&pdev->dev, 0); - pm_runtime_disable(&pdev->dev); - pm_runtime_set_suspended(&pdev->dev); - - if (hcd->usb_phy && hcd->usb_phy->otg) - otg_set_host(hcd->usb_phy->otg, NULL); - else - usb_remove_hcd(hcd); - - usb_put_hcd(hcd); - - return 0; -} - -#ifdef CONFIG_PM -static int ehci_msm_pm_suspend(struct device *dev) -{ - struct usb_hcd *hcd = dev_get_drvdata(dev); - struct ehci_hcd *ehci = hcd_to_ehci(hcd); - bool do_wakeup = device_may_wakeup(dev); - - dev_dbg(dev, "ehci-msm PM suspend\n"); - - /* Only call ehci_suspend if ehci_setup has been done */ - if (ehci->sbrn) - return ehci_suspend(hcd, do_wakeup); - - return 0; -} - -static int ehci_msm_pm_resume(struct device *dev) -{ - struct usb_hcd *hcd = dev_get_drvdata(dev); - struct ehci_hcd *ehci = hcd_to_ehci(hcd); - - dev_dbg(dev, "ehci-msm PM resume\n"); - - /* Only call ehci_resume if ehci_setup has been done */ - if (ehci->sbrn) - ehci_resume(hcd, false); - - return 0; -} - -#else -#define ehci_msm_pm_suspend NULL -#define ehci_msm_pm_resume NULL -#endif - -static const struct dev_pm_ops ehci_msm_dev_pm_ops = { - .suspend = ehci_msm_pm_suspend, - .resume = ehci_msm_pm_resume, -}; - -static const struct acpi_device_id msm_ehci_acpi_ids[] = { - { "QCOM8040", 0 }, - { } -}; -MODULE_DEVICE_TABLE(acpi, msm_ehci_acpi_ids); - -static const struct of_device_id msm_ehci_dt_match[] = { - { .compatible = "qcom,ehci-host", }, - {} -}; -MODULE_DEVICE_TABLE(of, msm_ehci_dt_match); - -static struct platform_driver ehci_msm_driver = { - .probe = ehci_msm_probe, - .remove = ehci_msm_remove, - .shutdown = usb_hcd_platform_shutdown, - .driver = { - .name = "msm_hsusb_host", - .pm = &ehci_msm_dev_pm_ops, - .of_match_table = msm_ehci_dt_match, - .acpi_match_table = ACPI_PTR(msm_ehci_acpi_ids), - }, -}; - -static const struct ehci_driver_overrides msm_overrides __initconst = { - .reset = ehci_msm_reset, -}; - -static int __init ehci_msm_init(void) -{ - if (usb_disabled()) - return -ENODEV; - - pr_info("%s: " DRIVER_DESC "\n", hcd_name); - ehci_init_driver(&msm_hc_driver, &msm_overrides); - return platform_driver_register(&ehci_msm_driver); -} -module_init(ehci_msm_init); - -static void __exit ehci_msm_cleanup(void) -{ - platform_driver_unregister(&ehci_msm_driver); -} -module_exit(ehci_msm_cleanup); - -MODULE_DESCRIPTION(DRIVER_DESC); -MODULE_ALIAS("platform:msm-ehci"); -MODULE_LICENSE("GPL");