From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [V3,6/6] usb: host: Add ability to build new Broadcom STB USB drivers From: Alan Cooper Message-Id: <1541453493-34981-7-git-send-email-alcooperx@gmail.com> Date: Mon, 5 Nov 2018 16:31:33 -0500 To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Jianguo Sun , Johan Hovold , Kees Cook , linux-usb@vger.kernel.org, Lu Baolu , Mark Rutland , Martin Blumenstingl , Mathias Nyman , Mathias Nyman , Mauro Carvalho Chehab , Rishabh Bhatnagar , Rob Herring , Roger Quadros List-ID: QWRkIHRoZSBidWlsZCBzeXN0ZW0gY2hhbmdlcyBuZWVkZWQgdG8gZ2V0IHRoZSBCcm9hZGNvbSBT VEIgWEhDSSwKRUhDSSBhbmQgT0hDSSBmdW5jdGlvbmFsaXR5IHdvcmtpbmcuIFRoZSBsaW5rIG9y ZGVyIGZvciBYSENJIHdhcwpjaGFuZ2VkIGluIHRoZSBNYWtlZmlsZSBiZWNhdXNlIG9mIHRoZSB3 YXkgU1RCIFhIQ0ksIEVIQ0kgYW5kIE9IQ0kKY29udHJvbGxlcnMgc2hhcmUgYSBwb3J0IHdoaWNo IHJlcXVpcmVzIHRoYXQgdGhlIFhIQ0kgZHJpdmVyIGJlCmluaXRpYWxpemVkIGZpcnN0LiBBbHNv IHVwZGF0ZSBNQUlOVEFJTkVSUy4KClNpZ25lZC1vZmYtYnk6IEFsIENvb3BlciA8YWxjb29wZXJ4 QGdtYWlsLmNvbT4KLS0tCiBNQUlOVEFJTkVSUyAgICAgICAgICAgICAgIHwgIDkgKysrKysrKysr CiBkcml2ZXJzL3VzYi9ob3N0L0tjb25maWcgIHwgMjkgKysrKysrKysrKysrKysrKysrKysrKysr KysrKysKIGRyaXZlcnMvdXNiL2hvc3QvTWFrZWZpbGUgfCAxOCArKysrKysrKysrKystLS0tLS0K IDMgZmlsZXMgY2hhbmdlZCwgNTAgaW5zZXJ0aW9ucygrKSwgNiBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS9NQUlOVEFJTkVSUyBiL01BSU5UQUlORVJTCmluZGV4IGU4ZTFkODZiZDUwNS4uYzRl N2JjYjdmOTkyIDEwMDY0NAotLS0gYS9NQUlOVEFJTkVSUworKysgYi9NQUlOVEFJTkVSUwpAQCAt Mjk5MSw2ICsyOTkxLDE1IEBAIFM6CVN1cHBvcnRlZAogRjoJZHJpdmVycy9pMmMvYnVzc2VzL2ky Yy1icmNtc3RiLmMKIEY6CURvY3VtZW50YXRpb24vZGV2aWNldHJlZS9iaW5kaW5ncy9pMmMvaTJj LWJyY21zdGIudHh0CiAKK0JST0FEQ09NIEJSQ01TVEIgVVNCIFhIQ0ksIEVIQ0kgYW5kIE9IQ0kg RFJJVkVSUworTToJQWwgQ29vcGVyIDxhbGNvb3BlcnhAZ21haWwuY29tPgorTDoJbGludXgtdXNi QHZnZXIua2VybmVsLm9yZworTDoJYmNtLWtlcm5lbC1mZWVkYmFjay1saXN0QGJyb2FkY29tLmNv bQorUzoJTWFpbnRhaW5lZAorRjoJZHJpdmVycy91c2IvaG9zdC94aGNpLWJyY20uKgorRjoJZHJp dmVycy91c2IvaG9zdC9vaGNpLWJyY20uYworRjoJRG9jdW1lbnRhdGlvbi9kZXZpY2V0cmVlL2Jp bmRpbmdzL3VzYi9icmNtLGJjbTc0NDUtKi50eHQKKwogQlJPQURDT00gQlJDTVNUQiBVU0IyIGFu ZCBVU0IzIFBIWSBEUklWRVIKIE06CUFsIENvb3BlciA8YWxjb29wZXJ4QGdtYWlsLmNvbT4KIEw6 CWxpbnV4LWtlcm5lbEB2Z2VyLmtlcm5lbC5vcmcKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2hv c3QvS2NvbmZpZyBiL2RyaXZlcnMvdXNiL2hvc3QvS2NvbmZpZwppbmRleCAxNjc1OGIxMmE1ZTku LmVjNmI0NTgyYWIxMiAxMDA2NDQKLS0tIGEvZHJpdmVycy91c2IvaG9zdC9LY29uZmlnCisrKyBi L2RyaXZlcnMvdXNiL2hvc3QvS2NvbmZpZwpAQCAtOTQsNiArOTQsMzUgQEAgY29uZmlnIFVTQl9Y SENJX1RFR1JBCiAJICBTYXkgJ1knIHRvIGVuYWJsZSB0aGUgc3VwcG9ydCBmb3IgdGhlIHhIQ0kg aG9zdCBjb250cm9sbGVyCiAJICBmb3VuZCBpbiBOVklESUEgVGVncmExMjQgYW5kIGxhdGVyIFNv Q3MuCiAKK2NvbmZpZyBVU0JfT0hDSV9CUkNNCisgICAgICAgdHJpc3RhdGUKKworY29uZmlnIFVT Ql9FSENJX0JSQ00KKyAgICAgICB0cmlzdGF0ZQorCitjb25maWcgVVNCX1hIQ0lfQlJDTQorICAg ICAgIHRyaXN0YXRlCisKK2NvbmZpZyBCUkNNX1VTQl9QSFkKKyAgICAgICB0cmlzdGF0ZQorCitj b25maWcgVVNCX0JSQ00KKwl0cmlzdGF0ZSAiQnJvYWRjb20gU1RCIFVTQiBzdXBwb3J0IgorCWRl cGVuZHMgb24gQVJDSF9CUkNNU1RCCisJc2VsZWN0IFVTQl9PSENJX0hDRF9QTEFURk9STSBpZiBV U0JfT0hDSV9IQ0QKKwlzZWxlY3QgVVNCX0VIQ0lfQlJDTSBpZiBVU0JfRUhDSV9IQ0QKKwlzZWxl Y3QgVVNCX1hIQ0lfQlJDTSBpZiBVU0JfWEhDSV9IQ0QKKwlzZWxlY3QgVVNCX1hIQ0lfUExBVEZP Uk0gaWYgVVNCX1hIQ0lfSENECisJc2VsZWN0IEJSQ01fVVNCX1BIWSBpZiBVU0JfT0hDSV9IQ0Qg fHwgVVNCX0VIQ0lfSENEIHx8IFVTQl9YSENJX0hDRAorCXNlbGVjdCBHRU5FUklDX1BIWSBpZiBC UkNNX1VTQl9QSFkKKwlkZWZhdWx0IEFSQ0hfQlJDTVNUQgorCWhlbHAKKwkgIFNheSBZIHRvIGVu YWJsZSBzdXBwb3J0IGZvciBYSENJLCBFSENJIGFuZCBPSENJIGhvc3QgY29udHJvbGxlcnMKKwkg IGZvdW5kIGluIEJyb2FkY29tIFNUQiBTb0Mncy4KKworCSAgRGlzYWJsaW5nIHRoaXMgd2lsbCBr ZWVwIHRoZSBjb250cm9sbGVycyBhbmQgY29ycmVzcG9uZGluZworCSAgUEhZcyBwb3dlcmVkIGRv d24uCisKIGVuZGlmICMgVVNCX1hIQ0lfSENECiAKIGNvbmZpZyBVU0JfRUhDSV9IQ0QKZGlmZiAt LWdpdCBhL2RyaXZlcnMvdXNiL2hvc3QvTWFrZWZpbGUgYi9kcml2ZXJzL3VzYi9ob3N0L01ha2Vm aWxlCmluZGV4IDg0NTE0ZjcxYWU0NC4uOWJkZDY0YjcxMGVlIDEwMDY0NAotLS0gYS9kcml2ZXJz L3VzYi9ob3N0L01ha2VmaWxlCisrKyBiL2RyaXZlcnMvdXNiL2hvc3QvTWFrZWZpbGUKQEAgLTMx LDYgKzMxLDEwIEBAIGlmbmVxICgkKENPTkZJR19VU0JfWEhDSV9SQ0FSKSwgKQogCXhoY2ktcGxh dC1oY2QteQkJKz0geGhjaS1yY2FyLm8KIGVuZGlmCiAKK2lmbmVxICgkKENPTkZJR19VU0JfWEhD SV9CUkNNKSwgKQorCXhoY2ktcGxhdC1oY2QteQkJKz0geGhjaS1icmNtLm8KK2VuZGlmCisKIGlm bmVxICgkKENPTkZJR19ERUJVR19GUyksKQogCXhoY2ktaGNkLXkJCSs9IHhoY2ktZGVidWdmcy5v CiBlbmRpZgpAQCAtMzksNiArNDMsMTMgQEAgb2JqLSQoQ09ORklHX1VTQl9XSENJX0hDRCkJKz0g d2hjaS8KIAogb2JqLSQoQ09ORklHX1VTQl9QQ0kpCSs9IHBjaS1xdWlya3MubwogCitvYmotJChD T05GSUdfVVNCX1hIQ0lfSENEKQkrPSB4aGNpLWhjZC5vCitvYmotJChDT05GSUdfVVNCX1hIQ0lf UENJKQkrPSB4aGNpLXBjaS5vCitvYmotJChDT05GSUdfVVNCX1hIQ0lfUExBVEZPUk0pICs9IHho Y2ktcGxhdC1oY2Qubworb2JqLSQoQ09ORklHX1VTQl9YSENJX0hJU1RCKQkrPSB4aGNpLWhpc3Ri Lm8KK29iai0kKENPTkZJR19VU0JfWEhDSV9NVEspCSs9IHhoY2ktbXRrLm8KK29iai0kKENPTkZJ R19VU0JfWEhDSV9URUdSQSkJKz0geGhjaS10ZWdyYS5vCisKIG9iai0kKENPTkZJR19VU0JfRUhD SV9IQ0QpCSs9IGVoY2ktaGNkLm8KIG9iai0kKENPTkZJR19VU0JfRUhDSV9QQ0kpCSs9IGVoY2kt cGNpLm8KIG9iai0kKENPTkZJR19VU0JfRUhDSV9IQ0RfUExBVEZPUk0pCSs9IGVoY2ktcGxhdGZv cm0ubwpAQCAtNTIsNiArNjMsNyBAQCBvYmotJChDT05GSUdfVVNCX0VIQ0lfRVhZTk9TKQkrPSBl aGNpLWV4eW5vcy5vCiBvYmotJChDT05GSUdfVVNCX0VIQ0lfSENEX0FUOTEpICs9IGVoY2ktYXRt ZWwubwogb2JqLSQoQ09ORklHX1VTQl9FSENJX1RFR1JBKQkrPSBlaGNpLXRlZ3JhLm8KIG9iai0k KENPTkZJR19VU0JfVzkwWDkwMF9FSENJKQkrPSBlaGNpLXc5MHg5MDAubworb2JqLSQoQ09ORklH X1VTQl9FSENJX0JSQ00pCSs9IGVoY2ktYnJjbS5vCiAKIG9iai0kKENPTkZJR19VU0JfT1hVMjEw SFBfSENEKQkrPSBveHUyMTBocC1oY2Qubwogb2JqLSQoQ09ORklHX1VTQl9JU1AxMTZYX0hDRCkJ Kz0gaXNwMTE2eC1oY2QubwpAQCAtNzIsMTIgKzg0LDYgQEAgb2JqLSQoQ09ORklHX1VTQl9PSENJ X0hDRF9EQVZJTkNJKQkrPSBvaGNpLWRhOHh4Lm8KIAogb2JqLSQoQ09ORklHX1VTQl9VSENJX0hD RCkJKz0gdWhjaS1oY2Qubwogb2JqLSQoQ09ORklHX1VTQl9GSENJX0hDRCkJKz0gZmhjaS5vCi1v YmotJChDT05GSUdfVVNCX1hIQ0lfSENEKQkrPSB4aGNpLWhjZC5vCi1vYmotJChDT05GSUdfVVNC X1hIQ0lfUENJKQkrPSB4aGNpLXBjaS5vCi1vYmotJChDT05GSUdfVVNCX1hIQ0lfUExBVEZPUk0p ICs9IHhoY2ktcGxhdC1oY2Qubwotb2JqLSQoQ09ORklHX1VTQl9YSENJX0hJU1RCKQkrPSB4aGNp LWhpc3RiLm8KLW9iai0kKENPTkZJR19VU0JfWEhDSV9NVEspCSs9IHhoY2ktbXRrLm8KLW9iai0k KENPTkZJR19VU0JfWEhDSV9URUdSQSkJKz0geGhjaS10ZWdyYS5vCiBvYmotJChDT05GSUdfVVNC X1NMODExX0hDRCkJKz0gc2w4MTEtaGNkLm8KIG9iai0kKENPTkZJR19VU0JfU0w4MTFfQ1MpCSs9 IHNsODExX2NzLm8KIG9iai0kKENPTkZJR19VU0JfVTEzMl9IQ0QpCSs9IHUxMzItaGNkLm8K From mboxrd@z Thu Jan 1 00:00:00 1970 From: Al Cooper Subject: [PATCH V3 6/6] usb: host: Add ability to build new Broadcom STB USB drivers Date: Mon, 5 Nov 2018 16:31:33 -0500 Message-ID: <1541453493-34981-7-git-send-email-alcooperx@gmail.com> References: <1541453493-34981-1-git-send-email-alcooperx@gmail.com> Return-path: In-Reply-To: <1541453493-34981-1-git-send-email-alcooperx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Jianguo Sun , Johan Hovold , Kees Cook , linux-usb@ List-Id: devicetree@vger.kernel.org Add the build system changes needed to get the Broadcom STB XHCI, EHCI and OHCI functionality working. The link order for XHCI was changed in the Makefile because of the way STB XHCI, EHCI and OHCI controllers share a port which requires that the XHCI driver be initialized first. Also update MAINTAINERS. Signed-off-by: Al Cooper --- MAINTAINERS | 9 +++++++++ drivers/usb/host/Kconfig | 29 +++++++++++++++++++++++++++++ drivers/usb/host/Makefile | 18 ++++++++++++------ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e8e1d86bd505..c4e7bcb7f992 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2991,6 +2991,15 @@ S: Supported F: drivers/i2c/busses/i2c-brcmstb.c F: Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt +BROADCOM BRCMSTB USB XHCI, EHCI and OHCI DRIVERS +M: Al Cooper +L: linux-usb@vger.kernel.org +L: bcm-kernel-feedback-list@broadcom.com +S: Maintained +F: drivers/usb/host/xhci-brcm.* +F: drivers/usb/host/ohci-brcm.c +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-*.txt + BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER M: Al Cooper L: linux-kernel@vger.kernel.org diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 16758b12a5e9..ec6b4582ab12 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -94,6 +94,35 @@ config USB_XHCI_TEGRA Say 'Y' to enable the support for the xHCI host controller found in NVIDIA Tegra124 and later SoCs. +config USB_OHCI_BRCM + tristate + +config USB_EHCI_BRCM + tristate + +config USB_XHCI_BRCM + tristate + +config BRCM_USB_PHY + tristate + +config USB_BRCM + tristate "Broadcom STB USB support" + depends on ARCH_BRCMSTB + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD + select USB_EHCI_BRCM if USB_EHCI_HCD + select USB_XHCI_BRCM if USB_XHCI_HCD + select USB_XHCI_PLATFORM if USB_XHCI_HCD + select BRCM_USB_PHY if USB_OHCI_HCD || USB_EHCI_HCD || USB_XHCI_HCD + select GENERIC_PHY if BRCM_USB_PHY + default ARCH_BRCMSTB + help + Say Y to enable support for XHCI, EHCI and OHCI host controllers + found in Broadcom STB SoC's. + + Disabling this will keep the controllers and corresponding + PHYs powered down. + endif # USB_XHCI_HCD config USB_EHCI_HCD diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 84514f71ae44..9bdd64b710ee 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -31,6 +31,10 @@ ifneq ($(CONFIG_USB_XHCI_RCAR), ) xhci-plat-hcd-y += xhci-rcar.o endif +ifneq ($(CONFIG_USB_XHCI_BRCM), ) + xhci-plat-hcd-y += xhci-brcm.o +endif + ifneq ($(CONFIG_DEBUG_FS),) xhci-hcd-y += xhci-debugfs.o endif @@ -39,6 +43,13 @@ obj-$(CONFIG_USB_WHCI_HCD) += whci/ obj-$(CONFIG_USB_PCI) += pci-quirks.o +obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o +obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o +obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o +obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o +obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o +obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o + obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o @@ -52,6 +63,7 @@ obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o +obj-$(CONFIG_USB_EHCI_BRCM) += ehci-brcm.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o @@ -72,12 +84,6 @@ obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o -obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o -obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o -obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o -obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o -obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o -obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o -- 1.9.0.138.g2de3478 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52E72C0044C for ; Mon, 5 Nov 2018 21:33:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0AABB2081C for ; Mon, 5 Nov 2018 21:33:21 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gwhl328G" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0AABB2081C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388175AbeKFGzA (ORCPT ); Tue, 6 Nov 2018 01:55:00 -0500 Received: from mail-pf1-f195.google.com ([209.85.210.195]:40789 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388060AbeKFGy7 (ORCPT ); Tue, 6 Nov 2018 01:54:59 -0500 Received: by mail-pf1-f195.google.com with SMTP id x2-v6so962495pfm.7; Mon, 05 Nov 2018 13:33:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RwGQ3tpCHIWv3vI72V0rDL1gcbAOiKR+A7U2ZnntJHU=; b=gwhl328GnRl0xmDyXk51yXgBZQoXSCApvkfI7dvcfVkEuE1qtNP1Tp6i69zuxqaiFl 1KNBpV4q9gRuiKgZVSZzX0RcqNwRTrnC/y9uhrUaqFYsoclKJd6ohQDvGofUIc07A1L1 RzV8yk9/36NxosryMxnXwHC7v/O0gBdU+8dk1k3KJk+0AEuMAeEo5EWxHv2TVwmmaUr7 EI7wMdjKEKwgnxWSzVHjmCO9QdC7mBBtPwHj6oa96fffWnYvPwNBHZ6dD2aavJaU6yI4 A7dQv8hJEPH4UU+2ayjkRrF7Z13fuq50SubOPBq7cu8M8jRZicPM5c1qHM5gDca3Ndeh KguA== 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=RwGQ3tpCHIWv3vI72V0rDL1gcbAOiKR+A7U2ZnntJHU=; b=sqHUon4mGWYyV/g4QyMX7hJjaJxj3mbhqmz99hVyEuhRR24oGEDUMo7F9wPeFTVIL+ u697IwEuoO6LuahuFwSiLM06Bo7YVhThPe8BCU/wjEp3J3NnZnEhstT3TK6Xyydn+bHy RZ85sU7EqPIhW9LDqUXenQ386V7cZ9qw6Gkk9a3r7I99V89Xw0U5boTckuvA0T+f7X3W Vo56rIPKFDWMLZK3BatqtF7ruACBtP8f/7NKVFP5rUW0Is+W0/qbJ0AjOPlsxs61p0Oq Y4wxQeyOjmb5GNKIktXo+Ecbr+U+R0hIQY42Hog0/DCfOlfigxA84CeysgflPGz8a4NP oDJw== X-Gm-Message-State: AGRZ1gIAIDdahp0JSIUVcpBxvAN48j6delZklzaqkJM+vNw6Ix95ReUi UBCRFLnBE2bwcOMZ8KLLMlch/xvppnk= X-Google-Smtp-Source: AJdET5cQ3FvlLx9h8bnPKCnStS8CiF0LS+BdY14tbFquuTGM3T10NaOPpij8Svbt5OiaPYU2FAOGjA== X-Received: by 2002:a63:f547:: with SMTP id e7mr22005852pgk.182.1541453597320; Mon, 05 Nov 2018 13:33:17 -0800 (PST) Received: from stbsrv-and-3.and.broadcom.com ([192.19.231.250]) by smtp.gmail.com with ESMTPSA id m129-v6sm14328440pfm.78.2018.11.05.13.33.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Nov 2018 13:33:16 -0800 (PST) From: Al Cooper To: linux-kernel@vger.kernel.org Cc: Al Cooper , Alan Stern , Alban Bedel , Alex Elder , Andrew Morton , Arnd Bergmann , Avi Fishman , bcm-kernel-feedback-list@broadcom.com, Bjorn Andersson , Chunfeng Yun , "David S. Miller" , devicetree@vger.kernel.org, Dmitry Osipenko , Greg Kroah-Hartman , "Gustavo A. R. Silva" , Hans de Goede , James Hogan , Jianguo Sun , Johan Hovold , Kees Cook , linux-usb@vger.kernel.org, Lu Baolu , Mark Rutland , Martin Blumenstingl , Mathias Nyman , Mathias Nyman , Mauro Carvalho Chehab , Rishabh Bhatnagar , Rob Herring , Roger Quadros Subject: [PATCH V3 6/6] usb: host: Add ability to build new Broadcom STB USB drivers Date: Mon, 5 Nov 2018 16:31:33 -0500 Message-Id: <1541453493-34981-7-git-send-email-alcooperx@gmail.com> X-Mailer: git-send-email 1.9.0.138.g2de3478 In-Reply-To: <1541453493-34981-1-git-send-email-alcooperx@gmail.com> References: <1541453493-34981-1-git-send-email-alcooperx@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add the build system changes needed to get the Broadcom STB XHCI, EHCI and OHCI functionality working. The link order for XHCI was changed in the Makefile because of the way STB XHCI, EHCI and OHCI controllers share a port which requires that the XHCI driver be initialized first. Also update MAINTAINERS. Signed-off-by: Al Cooper --- MAINTAINERS | 9 +++++++++ drivers/usb/host/Kconfig | 29 +++++++++++++++++++++++++++++ drivers/usb/host/Makefile | 18 ++++++++++++------ 3 files changed, 50 insertions(+), 6 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index e8e1d86bd505..c4e7bcb7f992 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2991,6 +2991,15 @@ S: Supported F: drivers/i2c/busses/i2c-brcmstb.c F: Documentation/devicetree/bindings/i2c/i2c-brcmstb.txt +BROADCOM BRCMSTB USB XHCI, EHCI and OHCI DRIVERS +M: Al Cooper +L: linux-usb@vger.kernel.org +L: bcm-kernel-feedback-list@broadcom.com +S: Maintained +F: drivers/usb/host/xhci-brcm.* +F: drivers/usb/host/ohci-brcm.c +F: Documentation/devicetree/bindings/usb/brcm,bcm7445-*.txt + BROADCOM BRCMSTB USB2 and USB3 PHY DRIVER M: Al Cooper L: linux-kernel@vger.kernel.org diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 16758b12a5e9..ec6b4582ab12 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig @@ -94,6 +94,35 @@ config USB_XHCI_TEGRA Say 'Y' to enable the support for the xHCI host controller found in NVIDIA Tegra124 and later SoCs. +config USB_OHCI_BRCM + tristate + +config USB_EHCI_BRCM + tristate + +config USB_XHCI_BRCM + tristate + +config BRCM_USB_PHY + tristate + +config USB_BRCM + tristate "Broadcom STB USB support" + depends on ARCH_BRCMSTB + select USB_OHCI_HCD_PLATFORM if USB_OHCI_HCD + select USB_EHCI_BRCM if USB_EHCI_HCD + select USB_XHCI_BRCM if USB_XHCI_HCD + select USB_XHCI_PLATFORM if USB_XHCI_HCD + select BRCM_USB_PHY if USB_OHCI_HCD || USB_EHCI_HCD || USB_XHCI_HCD + select GENERIC_PHY if BRCM_USB_PHY + default ARCH_BRCMSTB + help + Say Y to enable support for XHCI, EHCI and OHCI host controllers + found in Broadcom STB SoC's. + + Disabling this will keep the controllers and corresponding + PHYs powered down. + endif # USB_XHCI_HCD config USB_EHCI_HCD diff --git a/drivers/usb/host/Makefile b/drivers/usb/host/Makefile index 84514f71ae44..9bdd64b710ee 100644 --- a/drivers/usb/host/Makefile +++ b/drivers/usb/host/Makefile @@ -31,6 +31,10 @@ ifneq ($(CONFIG_USB_XHCI_RCAR), ) xhci-plat-hcd-y += xhci-rcar.o endif +ifneq ($(CONFIG_USB_XHCI_BRCM), ) + xhci-plat-hcd-y += xhci-brcm.o +endif + ifneq ($(CONFIG_DEBUG_FS),) xhci-hcd-y += xhci-debugfs.o endif @@ -39,6 +43,13 @@ obj-$(CONFIG_USB_WHCI_HCD) += whci/ obj-$(CONFIG_USB_PCI) += pci-quirks.o +obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o +obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o +obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o +obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o +obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o +obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o + obj-$(CONFIG_USB_EHCI_HCD) += ehci-hcd.o obj-$(CONFIG_USB_EHCI_PCI) += ehci-pci.o obj-$(CONFIG_USB_EHCI_HCD_PLATFORM) += ehci-platform.o @@ -52,6 +63,7 @@ obj-$(CONFIG_USB_EHCI_EXYNOS) += ehci-exynos.o obj-$(CONFIG_USB_EHCI_HCD_AT91) += ehci-atmel.o obj-$(CONFIG_USB_EHCI_TEGRA) += ehci-tegra.o obj-$(CONFIG_USB_W90X900_EHCI) += ehci-w90x900.o +obj-$(CONFIG_USB_EHCI_BRCM) += ehci-brcm.o obj-$(CONFIG_USB_OXU210HP_HCD) += oxu210hp-hcd.o obj-$(CONFIG_USB_ISP116X_HCD) += isp116x-hcd.o @@ -72,12 +84,6 @@ obj-$(CONFIG_USB_OHCI_HCD_DAVINCI) += ohci-da8xx.o obj-$(CONFIG_USB_UHCI_HCD) += uhci-hcd.o obj-$(CONFIG_USB_FHCI_HCD) += fhci.o -obj-$(CONFIG_USB_XHCI_HCD) += xhci-hcd.o -obj-$(CONFIG_USB_XHCI_PCI) += xhci-pci.o -obj-$(CONFIG_USB_XHCI_PLATFORM) += xhci-plat-hcd.o -obj-$(CONFIG_USB_XHCI_HISTB) += xhci-histb.o -obj-$(CONFIG_USB_XHCI_MTK) += xhci-mtk.o -obj-$(CONFIG_USB_XHCI_TEGRA) += xhci-tegra.o obj-$(CONFIG_USB_SL811_HCD) += sl811-hcd.o obj-$(CONFIG_USB_SL811_CS) += sl811_cs.o obj-$(CONFIG_USB_U132_HCD) += u132-hcd.o -- 1.9.0.138.g2de3478