From patchwork Wed Jan 18 18:59:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13106941 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C047C32793 for ; Wed, 18 Jan 2023 19:00:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229714AbjARS77 (ORCPT ); Wed, 18 Jan 2023 13:59:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229591AbjARS7i (ORCPT ); Wed, 18 Jan 2023 13:59:38 -0500 Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14E695957F; Wed, 18 Jan 2023 10:59:35 -0800 (PST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-1433ef3b61fso36502820fac.10; Wed, 18 Jan 2023 10:59:35 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2FJcOTfsjwpdIljEO429tvKoOeEBhTBITWRzGMiqJAg=; b=wKaEcRs98rs+WQXuCK99GUfiMsLuVyKh0EEDMxIujNqyL4iI+i4GukXjtuT2oIt9w2 o67P1uPjuetKONTvGvGclgiBxi0G6bRryA83n05sUnWHHbWdLc6TC6Ab4H7Tu0STT4/3 rUY49cDvNoiENlfUUFuwBsyEzcRBY8wmy4XG/HF6MTnhUex5ZY+P1mtOyPTStkK12BuD SDokdJ2mDi3Fn8kP3DOK3b4lc9q+utUJEkcep1Hyhoh/fKyuTWr7U6S1o7R7Mc3s4Eys nSutX7T3g41mDWP5E09n9LQluEugq9jnLEE/UhHIN6cJUIjIG32lA2mUM6KmW6grYdv3 wB+Q== X-Gm-Message-State: AFqh2ko02dH7qatKdaLk7yE9aJ0en1qVBosR5jy8msBUTMcNOsK5Th9D GN+hqs4SX8ULtF2oNY3XRA== X-Google-Smtp-Source: AMrXdXscaED9/2tSNc/EWmCUoL6KUA5ro4vcmZupKkFZp8aHQrNSo7DtQPDnUsLGeCcrB99X4bhVlw== X-Received: by 2002:a05:6870:b6a5:b0:14c:68df:833e with SMTP id cy37-20020a056870b6a500b0014c68df833emr5764905oab.15.1674068374366; Wed, 18 Jan 2023 10:59:34 -0800 (PST) Received: from robh_at_kernel.org ([4.31.143.193]) by smtp.gmail.com with ESMTPSA id y34-20020a05687045a200b00143ae7d4ccesm5057713oao.45.2023.01.18.10.59.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 10:59:33 -0800 (PST) Received: (nullmailer pid 629746 invoked by uid 1000); Wed, 18 Jan 2023 18:59:29 -0000 From: Rob Herring Date: Wed, 18 Jan 2023 12:59:23 -0600 Subject: [PATCH v2 1/5] dt-bindings: usb: Remove obsolete brcm,bcm3384-usb.txt MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v2-1-926bc1260e51@kernel.org> References: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> In-Reply-To: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> To: Greg Kroah-Hartman , Krzysztof Kozlowski , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Lee Jones Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openbmc@lists.ozlabs.org X-Mailer: b4 0.12-dev Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The "brcm,bcm3384-ohci" and "brcm,bcm3384-ehci" compatibles are already documented in generic-ohci.yaml and generic-ehci.yaml, respectively, so remove the old txt binding. Signed-off-by: Rob Herring --- Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt b/Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt deleted file mode 100644 index 452c45c7bf29..000000000000 --- a/Documentation/devicetree/bindings/usb/brcm,bcm3384-usb.txt +++ /dev/null @@ -1,11 +0,0 @@ -* Broadcom USB controllers - -Required properties: -- compatible: "brcm,bcm3384-ohci", "brcm,bcm3384-ehci" - - These currently use the generic-ohci and generic-ehci drivers. On some - systems, special handling may be needed in the following cases: - - - Restoring state after systemwide power save modes - - Sharing PHYs with the USBD (UDC) hardware - - Figuring out which controllers are disabled on ASIC bondout variants From patchwork Wed Jan 18 18:59:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13106943 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2DD0EC38147 for ; Wed, 18 Jan 2023 19:00:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229749AbjARTAD (ORCPT ); Wed, 18 Jan 2023 14:00:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229718AbjARS7p (ORCPT ); Wed, 18 Jan 2023 13:59:45 -0500 Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38A995AB7F; Wed, 18 Jan 2023 10:59:40 -0800 (PST) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-15085b8a2f7so36555308fac.2; Wed, 18 Jan 2023 10:59:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ODJnN8bRpnIpOcq/j8GhrdGyRWH1W8cT3IRjCv4ER3A=; b=eV2AXD2/2vwypuAbNJ5TMq2Hgwktt13poku6OW6nDtZrklzk1KRxY4jhZmJJfSKQkk JMC2vXG6NZzegMku4apsSjO5DXBD2tT6DLHBtrv6PcdQy+9jHzN0n8CV2ArUFvxsI15K pRhOUDMRlWucDy3Nni5cu3mocLpRknguCK6Wmb8eJjOarXmB9mtJ+tT2BsLU0qcJgju4 n1M3IvUMqDU13Hu0fzzj1CmYMbQuR81AhvJrveoCq35VKvDke8Lkpfez4Nqi4yAMOyiE dYl7QpFcoCtnO+Xukx2+tS1sOT/oRtFTVUs7BRt6AQyt0vygo49QqWVbQD6RXtp77olC PMxg== X-Gm-Message-State: AFqh2krPwyd52+5F1fyoH0YW3ytBwiXnJ0sAsL1CJSiw9RP0m73R1lWt zrdE0buLUef0m03BmCtf2A== X-Google-Smtp-Source: AMrXdXu9zG06IMZpgmtOQ7L1h11dhjdNyBorEjEBZFjLS2nvmomm0VUxvyDl9ThG87aTiuEVVvZMlg== X-Received: by 2002:a05:6871:4186:b0:15e:e77b:b2fd with SMTP id lc6-20020a056871418600b0015ee77bb2fdmr4189474oab.41.1674068379430; Wed, 18 Jan 2023 10:59:39 -0800 (PST) Received: from robh_at_kernel.org ([4.31.143.193]) by smtp.gmail.com with ESMTPSA id f15-20020a056870548f00b0015f1024d322sm7378767oan.37.2023.01.18.10.59.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 10:59:38 -0800 (PST) Received: (nullmailer pid 629748 invoked by uid 1000); Wed, 18 Jan 2023 18:59:29 -0000 From: Rob Herring Date: Wed, 18 Jan 2023 12:59:24 -0600 Subject: [PATCH v2 2/5] dt-bindings: usb: Convert multiple "usb-ohci" bindings to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v2-2-926bc1260e51@kernel.org> References: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> In-Reply-To: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> To: Greg Kroah-Hartman , Krzysztof Kozlowski , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Lee Jones Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openbmc@lists.ozlabs.org X-Mailer: b4 0.12-dev Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org "usb-ohci" is another "generic" OHCI controller compatible string used by several platforms. Add it to the generic-ohci.yaml schema and remove all the old binding docs. Marvell pxa-usb.txt has "usb-ohci" in the example, but actual users don't, so drop it. Signed-off-by: Rob Herring --- v2: - Fix transceiver property in if/then schema - Move OMAP to separate patch --- .../devicetree/bindings/powerpc/nintendo/wii.txt | 10 ------- .../devicetree/bindings/usb/generic-ohci.yaml | 28 +++++++++++++++-- Documentation/devicetree/bindings/usb/ohci-nxp.txt | 24 --------------- Documentation/devicetree/bindings/usb/pxa-usb.txt | 2 +- .../devicetree/bindings/usb/spear-usb.txt | 35 ---------------------- 5 files changed, 26 insertions(+), 73 deletions(-) diff --git a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt index c4d78f28d23c..3ff6ebbb4998 100644 --- a/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt +++ b/Documentation/devicetree/bindings/powerpc/nintendo/wii.txt @@ -97,16 +97,6 @@ Nintendo Wii device tree - reg : should contain the EXI registers location and length - interrupts : should contain the EXI interrupt -1.g) The Open Host Controller Interface (OHCI) nodes - - Represent the USB 1.x Open Host Controller Interfaces. - - Required properties: - - - compatible : should be "nintendo,hollywood-usb-ohci","usb-ohci" - - reg : should contain the OHCI registers location and length - - interrupts : should contain the OHCI interrupt - 1.h) The Enhanced Host Controller Interface (EHCI) node Represents the USB 2.0 Enhanced Host Controller Interface. diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml index 4fcbd0add49d..8492d809ba40 100644 --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml @@ -6,9 +6,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: USB OHCI Controller -allOf: - - $ref: "usb-hcd.yaml" - maintainers: - Greg Kroah-Hartman @@ -50,6 +47,13 @@ properties: - snps,hsdk-v1.0-ohci - const: generic-ohci - const: generic-ohci + - items: + - enum: + - cavium,octeon-6335-ohci + - nintendo,hollywood-usb-ohci + - nxp,ohci-nxp + - st,spear600-ohci + - const: usb-ohci reg: maxItems: 1 @@ -119,11 +123,29 @@ properties: - host - otg + transceiver: + $ref: /schemas/types.yaml#/definitions/phandle + description: + The associated ISP1301 device. Necessary for the UDC controller for + connecting to the USB physical layer. + required: - compatible - reg - interrupts +allOf: + - $ref: usb-hcd.yaml + - if: + not: + properties: + compatible: + contains: + const: nxp,ohci-nxp + then: + properties: + transceiver: false + additionalProperties: false examples: diff --git a/Documentation/devicetree/bindings/usb/ohci-nxp.txt b/Documentation/devicetree/bindings/usb/ohci-nxp.txt deleted file mode 100644 index 71e28c1017ed..000000000000 --- a/Documentation/devicetree/bindings/usb/ohci-nxp.txt +++ /dev/null @@ -1,24 +0,0 @@ -* OHCI controller, NXP ohci-nxp variant - -Required properties: -- compatible: must be "nxp,ohci-nxp" -- reg: physical base address of the controller and length of memory mapped - region. -- interrupts: The OHCI interrupt -- transceiver: phandle of the associated ISP1301 device - this is necessary for - the UDC controller for connecting to the USB physical layer - -Example (LPC32xx): - - isp1301: usb-transceiver@2c { - compatible = "nxp,isp1301"; - reg = <0x2c>; - }; - - ohci@31020000 { - compatible = "nxp,ohci-nxp"; - reg = <0x31020000 0x300>; - interrupt-parent = <&mic>; - interrupts = <0x3b 0>; - transceiver = <&isp1301>; - }; diff --git a/Documentation/devicetree/bindings/usb/pxa-usb.txt b/Documentation/devicetree/bindings/usb/pxa-usb.txt index 9c331799b87c..53fdae4fa6f6 100644 --- a/Documentation/devicetree/bindings/usb/pxa-usb.txt +++ b/Documentation/devicetree/bindings/usb/pxa-usb.txt @@ -22,7 +22,7 @@ Optional properties: Example: usb0: ohci@4c000000 { - compatible = "marvell,pxa-ohci", "usb-ohci"; + compatible = "marvell,pxa-ohci"; reg = <0x4c000000 0x100000>; interrupts = <18>; marvell,enable-port1; diff --git a/Documentation/devicetree/bindings/usb/spear-usb.txt b/Documentation/devicetree/bindings/usb/spear-usb.txt deleted file mode 100644 index 1dc91cc459c0..000000000000 --- a/Documentation/devicetree/bindings/usb/spear-usb.txt +++ /dev/null @@ -1,35 +0,0 @@ -ST SPEAr SoC USB controllers: ------------------------------ - -EHCI: ------ - -Required properties: -- compatible: "st,spear600-ehci" -- interrupts: Should contain the EHCI interrupt - -Example: - - ehci@e1800000 { - compatible = "st,spear600-ehci", "usb-ehci"; - reg = <0xe1800000 0x1000>; - interrupt-parent = <&vic1>; - interrupts = <27>; - }; - - -OHCI: ------ - -Required properties: -- compatible: "st,spear600-ohci" -- interrupts: Should contain the OHCI interrupt - -Example: - - ohci@e1900000 { - compatible = "st,spear600-ohci", "usb-ohci"; - reg = <0xe1800000 0x1000>; - interrupt-parent = <&vic1>; - interrupts = <26>; - }; From patchwork Wed Jan 18 18:59:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13106944 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 96557C32793 for ; Wed, 18 Jan 2023 19:00:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229773AbjARTAE (ORCPT ); Wed, 18 Jan 2023 14:00:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39706 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229699AbjARS7n (ORCPT ); Wed, 18 Jan 2023 13:59:43 -0500 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8410459B6E; Wed, 18 Jan 2023 10:59:36 -0800 (PST) Received: by mail-oi1-f172.google.com with SMTP id j130so29422332oif.4; Wed, 18 Jan 2023 10:59:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/498OiMZPHbFbvFSKtUIhHhTesngR9MYr2wpHtuKiUI=; b=jY7KHZgfmit8SjzSzSGiorARgbaOLILaTRkZaj6P0jlnMnbu3i33rYKZnHCR7pD2Pp pcDnppSicgWkxaPcr8a9Dx0TIm6qM9ezDAoJHIVFPwbDWMv1S+Zw5YurzaevanjPWYxC oPxHYgSpJztnNLQGG+/wWPn1mItolGxRhh7ncgXffCy0uvBRLdxW+qqSX2Fy9K1KbYzX pLgGEU4zK85e6qvXvpEjx6kvOzzyPsDtNnaL4J/gtDkFhxd4lMy62RxR1nc/DzZsvgom +RaRAHM+EqIDyFugUZZCzD6rA6HyeTs9gVTN1oqRIbOmGLKTnisFERjp8QSXhXLArRRd vYQg== X-Gm-Message-State: AFqh2kpMOLmgQpbWAp69eWK7XgpgJ2s93U1pv3t1MizEcDlUaPZpO1Xe HxwKtwqXmRyalcSzmRJWHA== X-Google-Smtp-Source: AMrXdXvc70DFsiA2pntRri38rws+2fLrYDsxkQrHaqfeU1sFs4J2tC6t9tH8CPlf2dEY9/epVtwQ3g== X-Received: by 2002:a05:6808:2204:b0:367:1c4f:cb13 with SMTP id bd4-20020a056808220400b003671c4fcb13mr5480278oib.37.1674068375759; Wed, 18 Jan 2023 10:59:35 -0800 (PST) Received: from robh_at_kernel.org ([4.31.143.193]) by smtp.gmail.com with ESMTPSA id bj23-20020a056808199700b0036718f58b7esm4148788oib.15.2023.01.18.10.59.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 10:59:35 -0800 (PST) Received: (nullmailer pid 629750 invoked by uid 1000); Wed, 18 Jan 2023 18:59:29 -0000 From: Rob Herring Date: Wed, 18 Jan 2023 12:59:25 -0600 Subject: [PATCH v2 3/5] dt-bindings: usb: Convert OMAP OHCI/EHCI bindings to schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v2-3-926bc1260e51@kernel.org> References: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> In-Reply-To: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> To: Greg Kroah-Hartman , Krzysztof Kozlowski , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Lee Jones Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openbmc@lists.ozlabs.org X-Mailer: b4 0.12-dev Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The OMAP OHCI and EHCI USB host bindings follow the generic binding, so add the compatibles and remove the old txt binding docs. The examples in omap-usb-host.txt don't match actual users, so update them dropping the fallback compatible. Signed-off-by: Rob Herring --- v2: - New patch --- .../devicetree/bindings/mfd/omap-usb-host.txt | 8 +++--- .../devicetree/bindings/usb/ehci-omap.txt | 31 ---------------------- .../devicetree/bindings/usb/generic-ehci.yaml | 1 + .../devicetree/bindings/usb/generic-ohci.yaml | 4 ++- .../devicetree/bindings/usb/ohci-omap3.txt | 15 ----------- 5 files changed, 8 insertions(+), 51 deletions(-) diff --git a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt index aa1eaa59581b..7ce5800dd36d 100644 --- a/Documentation/devicetree/bindings/mfd/omap-usb-host.txt +++ b/Documentation/devicetree/bindings/mfd/omap-usb-host.txt @@ -64,8 +64,8 @@ Required properties if child node exists: Properties for children: The OMAP HS USB Host subsystem contains EHCI and OHCI controllers. -See Documentation/devicetree/bindings/usb/ehci-omap.txt and -Documentation/devicetree/bindings/usb/ohci-omap3.txt. +See Documentation/devicetree/bindings/usb/ehci-generic.yaml and +Documentation/devicetree/bindings/usb/ohci-generic.yaml. Example for OMAP4: @@ -78,14 +78,14 @@ usbhshost: usbhshost@4a064000 { ranges; usbhsohci: ohci@4a064800 { - compatible = "ti,ohci-omap3", "usb-ohci"; + compatible = "ti,ohci-omap3"; reg = <0x4a064800 0x400>; interrupt-parent = <&gic>; interrupts = <0 76 0x4>; }; usbhsehci: ehci@4a064c00 { - compatible = "ti,ehci-omap", "usb-ehci"; + compatible = "ti,ehci-omap"; reg = <0x4a064c00 0x400>; interrupt-parent = <&gic>; interrupts = <0 77 0x4>; diff --git a/Documentation/devicetree/bindings/usb/ehci-omap.txt b/Documentation/devicetree/bindings/usb/ehci-omap.txt deleted file mode 100644 index d77e11a975a2..000000000000 --- a/Documentation/devicetree/bindings/usb/ehci-omap.txt +++ /dev/null @@ -1,31 +0,0 @@ -OMAP HS USB EHCI controller - -This device is usually the child of the omap-usb-host -Documentation/devicetree/bindings/mfd/omap-usb-host.txt - -Required properties: - -- compatible: should be "ti,ehci-omap" -- reg: should contain one register range i.e. start and length -- interrupts: description of the interrupt line - -Optional properties: - -- phys: list of phandles to PHY nodes. - This property is required if at least one of the ports are in - PHY mode i.e. OMAP_EHCI_PORT_MODE_PHY - -To specify the port mode, see -Documentation/devicetree/bindings/mfd/omap-usb-host.txt - -Example for OMAP4: - -usbhsehci: ehci@4a064c00 { - compatible = "ti,ehci-omap"; - reg = <0x4a064c00 0x400>; - interrupts = <0 77 0x4>; -}; - -&usbhsehci { - phys = <&hsusb1_phy 0 &hsusb3_phy>; -}; diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml index 994818cb6044..2d382ae424da 100644 --- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml +++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml @@ -74,6 +74,7 @@ properties: - const: usb-ehci - enum: - generic-ehci + - ti,ehci-omap - usb-ehci reg: diff --git a/Documentation/devicetree/bindings/usb/generic-ohci.yaml b/Documentation/devicetree/bindings/usb/generic-ohci.yaml index 8492d809ba40..a9ba7257b884 100644 --- a/Documentation/devicetree/bindings/usb/generic-ohci.yaml +++ b/Documentation/devicetree/bindings/usb/generic-ohci.yaml @@ -46,7 +46,9 @@ properties: - ingenic,jz4740-ohci - snps,hsdk-v1.0-ohci - const: generic-ohci - - const: generic-ohci + - enum: + - generic-ohci + - ti,ohci-omap3 - items: - enum: - cavium,octeon-6335-ohci diff --git a/Documentation/devicetree/bindings/usb/ohci-omap3.txt b/Documentation/devicetree/bindings/usb/ohci-omap3.txt deleted file mode 100644 index ce8c47cff6d0..000000000000 --- a/Documentation/devicetree/bindings/usb/ohci-omap3.txt +++ /dev/null @@ -1,15 +0,0 @@ -OMAP HS USB OHCI controller (OMAP3 and later) - -Required properties: - -- compatible: should be "ti,ohci-omap3" -- reg: should contain one register range i.e. start and length -- interrupts: description of the interrupt line - -Example for OMAP4: - -usbhsohci: ohci@4a064800 { - compatible = "ti,ohci-omap3"; - reg = <0x4a064800 0x400>; - interrupts = <0 76 0x4>; -}; From patchwork Wed Jan 18 18:59:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13106942 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4341EC6379F for ; Wed, 18 Jan 2023 19:00:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbjARTAC (ORCPT ); Wed, 18 Jan 2023 14:00:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39716 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229716AbjARS7p (ORCPT ); Wed, 18 Jan 2023 13:59:45 -0500 Received: from mail-ot1-f52.google.com (mail-ot1-f52.google.com [209.85.210.52]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF4975AB5A; Wed, 18 Jan 2023 10:59:37 -0800 (PST) Received: by mail-ot1-f52.google.com with SMTP id cc13-20020a05683061cd00b00684b8cf2f4dso11981792otb.12; Wed, 18 Jan 2023 10:59:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=l/w7cp6YVGNbkVTPnnS6fPAfMJMQm9O9TtAZyHYNnBw=; b=YbWd6oMylmb27P3pm725nlhUzeHzOBe8RkwIAJKmwOF/fHoloz4UCzzAnIN5kNPIux HLGxDlrZe2PSQOIFOd4GrnQL7yVqON5E6t58qTgyR9/A574Zqfhkxiz2+XymLSPVmGpP H0ANmWvvqpOC77H/UWU+GO3DW/LACayxNFON3LWD9eqk7EjTsBkGTgKth4BQglKJqQgj 3zkoxvEwXDodQy6zUr6wfagyz1Uhv7qGsAPDgi2uP6iqYzghzFyLAIhqQwCK9y64jBS9 nmN9vzb9n6AC6hu1oXXsIP1m2RNx/Gllgpz7HNqCFbOnlvH3Y1ELEfuDFVsufOFuYM/6 acgg== X-Gm-Message-State: AFqh2krTo/eIpgdQFFUui7yy9qHMQuRL3gsN4Vl0bHPVDe+DTHQzv9Uu 1lgr5zzwEdnIKyrcY2tJdw== X-Google-Smtp-Source: AMrXdXte0bYZFLFpbx1SB+TuluJMNIGkayFObGKl8ktRZeTlQi80dYuVH04jQYvzqTsrgPgipC8SMg== X-Received: by 2002:a9d:196:0:b0:66e:c736:ef9a with SMTP id e22-20020a9d0196000000b0066ec736ef9amr3720906ote.1.1674068377180; Wed, 18 Jan 2023 10:59:37 -0800 (PST) Received: from robh_at_kernel.org ([4.31.143.193]) by smtp.gmail.com with ESMTPSA id e18-20020a9d6e12000000b00684c5211c58sm10143809otr.60.2023.01.18.10.59.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 10:59:36 -0800 (PST) Received: (nullmailer pid 629752 invoked by uid 1000); Wed, 18 Jan 2023 18:59:29 -0000 From: Rob Herring Date: Wed, 18 Jan 2023 12:59:26 -0600 Subject: [PATCH v2 4/5] dt-bindings: usb: Convert Marvell Orion EHCI to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v2-4-926bc1260e51@kernel.org> References: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> In-Reply-To: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> To: Greg Kroah-Hartman , Krzysztof Kozlowski , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Lee Jones Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openbmc@lists.ozlabs.org X-Mailer: b4 0.12-dev Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The Marvell Orion EHCI binding is just some compatible strings, so add it to the generic-ehci.yaml schema. Signed-off-by: Rob Herring --- .../devicetree/bindings/usb/ehci-orion.txt | 22 ---------------------- .../devicetree/bindings/usb/generic-ehci.yaml | 2 ++ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/ehci-orion.txt b/Documentation/devicetree/bindings/usb/ehci-orion.txt deleted file mode 100644 index 2855bae79fda..000000000000 --- a/Documentation/devicetree/bindings/usb/ehci-orion.txt +++ /dev/null @@ -1,22 +0,0 @@ -* EHCI controller, Orion Marvell variants - -Required properties: -- compatible: must be one of the following - "marvell,orion-ehci" - "marvell,armada-3700-ehci" -- reg: physical base address of the controller and length of memory mapped - region. -- interrupts: The EHCI interrupt - -Optional properties: -- clocks: reference to the clock -- phys: reference to the USB PHY -- phy-names: name of the USB PHY, should be "usb" - -Example: - - ehci@50000 { - compatible = "marvell,orion-ehci"; - reg = <0x50000 0x1000>; - interrupts = <19>; - }; diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml index 2d382ae424da..ebbb01b39a92 100644 --- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml +++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml @@ -74,6 +74,8 @@ properties: - const: usb-ehci - enum: - generic-ehci + - marvell,armada-3700-ehci + - marvell,orion-ehci - ti,ehci-omap - usb-ehci From patchwork Wed Jan 18 18:59:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 13106940 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66B47C38147 for ; Wed, 18 Jan 2023 18:59:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229736AbjARS7r (ORCPT ); Wed, 18 Jan 2023 13:59:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39662 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229572AbjARS7i (ORCPT ); Wed, 18 Jan 2023 13:59:38 -0500 Received: from mail-oa1-f50.google.com (mail-oa1-f50.google.com [209.85.160.50]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 212E853E5C; Wed, 18 Jan 2023 10:59:33 -0800 (PST) Received: by mail-oa1-f50.google.com with SMTP id 586e51a60fabf-15ebfdf69adso44974fac.0; Wed, 18 Jan 2023 10:59:33 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=t21dCSgXMADUq1pWfl156WNqD9atSWj6SahX+ddDCFs=; b=PWJv9FVBhirkqEqeeFHznZmcwj8JOIo7Lo9cdFmgHARnJ+JcLqLl79u3TwVpTVn5Xe YFEFHYF4NlsCGpuAgoWDy+MPWvIcefPXyBVmsbyTc9D6FDTG5YJ/RYGSFzeKfEv6t2hi sef7Tk+/djUBZvEXs4ST9Ueq/OMR9MqITm+LVw+KvSfJerrYBRgqDmjlYIq0AJHkF6QI PxAX/lqxq+PVTCCMRqiuWpmKXA4CsojNdU4VtE/DI8/X0tI+DMwyLJ3zU967OWcJtDJm AKtS4hgB00T9w/ujoDC6yBG9v9ibJIcz7H8Butb5//VP5TfvRxlWqhDo0R/7KqTRXQ7a svDQ== X-Gm-Message-State: AFqh2kpbQivmi2mIVZWbCsyLfQXzhy+FJI2i8d2hf2eDN6zESa7VlqjD b1fnUlb3r+moQPS3IlFpeQ== X-Google-Smtp-Source: AMrXdXu1m2DIrv1ryGF/RTJllp6w43tl35oqGQcA5exBroeqivdYJaPoylgEUL5k6Lc/e6NTdaZI0g== X-Received: by 2002:a05:6871:4207:b0:144:a774:15bf with SMTP id li7-20020a056871420700b00144a77415bfmr4223145oab.48.1674068372392; Wed, 18 Jan 2023 10:59:32 -0800 (PST) Received: from robh_at_kernel.org ([4.31.143.193]) by smtp.gmail.com with ESMTPSA id eq2-20020a056870a90200b0014fb4bdc746sm18661681oab.8.2023.01.18.10.59.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Jan 2023 10:59:31 -0800 (PST) Received: (nullmailer pid 629754 invoked by uid 1000); Wed, 18 Jan 2023 18:59:29 -0000 From: Rob Herring Date: Wed, 18 Jan 2023 12:59:27 -0600 Subject: [PATCH v2 5/5] dt-bindings: usb: Convert Nuvoton EHCI to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v2-5-926bc1260e51@kernel.org> References: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> In-Reply-To: <20230110-dt-usb-v2-0-926bc1260e51@kernel.org> To: Greg Kroah-Hartman , Krzysztof Kozlowski , Michael Ellerman , Nicholas Piggin , Christophe Leroy , Avi Fishman , Tomer Maimon , Tali Perry , Patrick Venture , Nancy Yuen , Benjamin Fair , Lee Jones Cc: linux-usb@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, openbmc@lists.ozlabs.org X-Mailer: b4 0.12-dev Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The Nuvoton EHCI binding is just some compatible strings, so add it to the generic-ehci.yaml schema. Signed-off-by: Rob Herring --- .../devicetree/bindings/usb/generic-ehci.yaml | 2 ++ .../devicetree/bindings/usb/npcm7xx-usb.txt | 20 -------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/Documentation/devicetree/bindings/usb/generic-ehci.yaml b/Documentation/devicetree/bindings/usb/generic-ehci.yaml index ebbb01b39a92..050cfd5acdaa 100644 --- a/Documentation/devicetree/bindings/usb/generic-ehci.yaml +++ b/Documentation/devicetree/bindings/usb/generic-ehci.yaml @@ -76,6 +76,8 @@ properties: - generic-ehci - marvell,armada-3700-ehci - marvell,orion-ehci + - nuvoton,npcm750-ehci + - nuvoton,npcm845-ehci - ti,ehci-omap - usb-ehci diff --git a/Documentation/devicetree/bindings/usb/npcm7xx-usb.txt b/Documentation/devicetree/bindings/usb/npcm7xx-usb.txt deleted file mode 100644 index 352a0a1e2f76..000000000000 --- a/Documentation/devicetree/bindings/usb/npcm7xx-usb.txt +++ /dev/null @@ -1,20 +0,0 @@ -Nuvoton NPCM7XX SoC USB controllers: ------------------------------ - -EHCI: ------ - -Required properties: -- compatible: should be one of - "nuvoton,npcm750-ehci" - "nuvoton,npcm845-ehci" -- interrupts: Should contain the EHCI interrupt -- reg: Physical address and length of the register set for the device - -Example: - - ehci1: usb@f0806000 { - compatible = "nuvoton,npcm750-ehci"; - reg = <0xf0806000 0x1000>; - interrupts = <0 61 4>; - };