From patchwork Tue Jan 24 03:05:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1730831 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1BjV0fDhz23gV for ; Tue, 24 Jan 2023 14:07:42 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P1BjT6mCjz3fC2 for ; Tue, 24 Jan 2023 14:07:41 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.210.43; helo=mail-ot1-f43.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-ot1-f43.google.com (mail-ot1-f43.google.com [209.85.210.43]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P1Bft6ZCkz3bh6; Tue, 24 Jan 2023 14:05:26 +1100 (AEDT) Received: by mail-ot1-f43.google.com with SMTP id f5-20020a9d5f05000000b00684c0c2eb3fso8480488oti.10; Mon, 23 Jan 2023 19:05:26 -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=bcXZsVOfAsHpVxW5S9tMPQsr4TSs7TRxYVzJOfkRIYukVvszG+hgpNN653OoBl9Ym6 3gLJdV/UKtXUIQEnXWTPh+xZN+/MD7ziZ7WdEQpUPpwl3TVO3A79jpVS8QHS1XMZ8vB5 owGTAL2JAmm/3ehXwx7B7iDeVWU0B4BozVNMazzdTY6Lo9tV5eN5Nu6IVljZXWMchGuw gBFQwJM3r/MqffgsByteZ3QQf8T8zwI1UYwzeRI1v1JmolQrXVPGeteANE/k4AUfZghv dPAyhABRbBdihcJislEVJO4jErhRumP5kSB3PQTunmoanScnDax8ZbpmcaSxC/PrwalU ia9A== X-Gm-Message-State: AFqh2krLOrAO3DtARAgRKt7Riybk9RkI9BpzO6y5MODg3fu21rZNb1g+ 9q8k9ZjgPv9/Fpz9/y4r1w== X-Google-Smtp-Source: AMrXdXtk4ESBvi3kPtNVN3s661xo1Y5KZZtfQ+KM3W+ytAIpqKVTTtgkQJaI3xv9A63V8+UpEsWh0A== X-Received: by 2002:a9d:624a:0:b0:66d:a5f7:9adc with SMTP id i10-20020a9d624a000000b0066da5f79adcmr16670014otk.2.1674529524022; Mon, 23 Jan 2023 19:05:24 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id s13-20020a05683004cd00b00686543d0f04sm449342otd.21.2023.01.23.19.05.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 19:05:23 -0800 (PST) Received: (nullmailer pid 3266340 invoked by uid 1000); Tue, 24 Jan 2023 03:05:20 -0000 From: Rob Herring Date: Mon, 23 Jan 2023 21:05:15 -0600 Subject: [PATCH v3 1/5] dt-bindings: usb: Remove obsolete brcm,bcm3384-usb.txt MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v3-1-5af0541fcf8c@kernel.org> References: <20230110-dt-usb-v3-0-5af0541fcf8c@kernel.org> In-Reply-To: <20230110-dt-usb-v3-0-5af0541fcf8c@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 X-Mailer: b4 0.12-dev X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" 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 Tue Jan 24 03:05:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1730836 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1BmT29BQz23gM for ; Tue, 24 Jan 2023 14:10:17 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P1BmT1GQvz3fBJ for ; Tue, 24 Jan 2023 14:10:17 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.167.175; helo=mail-oi1-f175.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-oi1-f175.google.com (mail-oi1-f175.google.com [209.85.167.175]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P1Bfx4gWCz3c8N; Tue, 24 Jan 2023 14:05:29 +1100 (AEDT) Received: by mail-oi1-f175.google.com with SMTP id r132so12172567oif.10; Mon, 23 Jan 2023 19:05:29 -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=dzMMEwAcXtdP0tqgtCSuNdvgk4QXAgcUodI9vpzLmXXSVjH/BMtyUztOClY8KTjjAs 3SWc4X2Aiedoir9V8cwZRY0L3ck94JQx1bo8qWthvWM2bExqj9oBAGaAfuldLtFHaTNR KR75HKuZWxLMHVyeuAvl/KP1zyeDoyrmqcl0/c3z+uXWAIo7a0pnq81ODrtQX4gJiFiu 5JbOW/5RNYCVFjNAHOmOQEawZbfm56DI8yDArQtGF4rpfUiXPP1NHnsF/biXjVdDRdog 1r/5vZgwP30f0wFkMFWbx2Ww8LJk6Ebt3Y2LfxB5jDuJnhK+vv/yvNl1mleTqoo08vx+ UGcA== X-Gm-Message-State: AFqh2kr7fbDEZQe/d1gSxyCbi4ZASLI2TJfVR3Te37UUjvrsNyZz1JNH 8X6JBXsIynJnTUrlrKHzdQ== X-Google-Smtp-Source: AMrXdXsgG7aV7ajMSANspew/t3LBZ4Y40ptgKFcjbQ1X7Su1kbM0yKwi0nk/Qwu4FtLB6NsP8TN72Q== X-Received: by 2002:a05:6808:16a6:b0:364:8f2c:1861 with SMTP id bb38-20020a05680816a600b003648f2c1861mr15097137oib.4.1674529526908; Mon, 23 Jan 2023 19:05:26 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id bx35-20020a0568081b2300b0036701c185basm472802oib.55.2023.01.23.19.05.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 19:05:26 -0800 (PST) Received: (nullmailer pid 3266342 invoked by uid 1000); Tue, 24 Jan 2023 03:05:20 -0000 From: Rob Herring Date: Mon, 23 Jan 2023 21:05:16 -0600 Subject: [PATCH v3 2/5] dt-bindings: usb: Convert multiple "usb-ohci" bindings to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v3-2-5af0541fcf8c@kernel.org> References: <20230110-dt-usb-v3-0-5af0541fcf8c@kernel.org> In-Reply-To: <20230110-dt-usb-v3-0-5af0541fcf8c@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 X-Mailer: b4 0.12-dev X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" "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 Tue Jan 24 03:05:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1730830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=112.213.38.117; helo=lists.ozlabs.org; envelope-from=openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1Bhs6tVmz23gV for ; Tue, 24 Jan 2023 14:07:09 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P1Bhs645Gz3fJH for ; Tue, 24 Jan 2023 14:07:09 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.160.49; helo=mail-oa1-f49.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-oa1-f49.google.com (mail-oa1-f49.google.com [209.85.160.49]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P1Bft3Yz7z3bh6; Tue, 24 Jan 2023 14:05:25 +1100 (AEDT) Received: by mail-oa1-f49.google.com with SMTP id 586e51a60fabf-15f97c478a8so16211932fac.13; Mon, 23 Jan 2023 19:05:25 -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=Q/AFIBZBlVMlUymjRHheiMpee3m76POsDggSk1UWmhI=; b=HKDX+Nbsib0VgpJRWQKxx0r43HZ9CS7iDl+5HPo3oT8I5Esogz5LLbtT4LachlHVIL pLAimP30o2wBAwNOsnc/AfZrMqMCppYSGzVpqOEEFE7jKjbkYSFD0dyWbjchM4ic91bT HH/Qj6ZOsusJLNrYVmMZMVZrf9cYvfbRCtrRQuJP/0isKW9c0Q66uRTHoMID4rWiY/Z3 WqGqvO3hqaX2Z1AkkHvjDmN1UNcxDYhPrmtr0sNyGncrCAVWDb/BFOLWbvDPHeSHbvq3 XhusSXME9o7PUoYec+sqho1LZybVfXaYcBnQqNvt9nGxnt2A1nwNwif4V4OFBsdg+m67 NAPQ== X-Gm-Message-State: AFqh2kr9juG7ud7HZEsF9j1sw3tDUMGPqzRJuMjcJXljimGxE999j4e0 Rjne/LBeWkr9yIfeL6QtGw== X-Google-Smtp-Source: AMrXdXtLjF7KETuY0Xd3Nk9VYIhUHuC3c+T3ChWZB5joiQamOBF0Q4wxZ7GtxK4IzYtccz//wXwirA== X-Received: by 2002:a05:6870:4508:b0:154:3fcb:bc20 with SMTP id e8-20020a056870450800b001543fcbbc20mr14559591oao.17.1674529522783; Mon, 23 Jan 2023 19:05:22 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id t12-20020a056870e74c00b0013bc95650c8sm230827oak.54.2023.01.23.19.05.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 19:05:22 -0800 (PST) Received: (nullmailer pid 3266344 invoked by uid 1000); Tue, 24 Jan 2023 03:05:20 -0000 From: Rob Herring Date: Mon, 23 Jan 2023 21:05:17 -0600 Subject: [PATCH v3 3/5] dt-bindings: usb: Convert OMAP OHCI/EHCI bindings to schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v3-3-5af0541fcf8c@kernel.org> References: <20230110-dt-usb-v3-0-5af0541fcf8c@kernel.org> In-Reply-To: <20230110-dt-usb-v3-0-5af0541fcf8c@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 X-Mailer: b4 0.12-dev X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" 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 --- v3: - Fix document references to generic-ehci.yaml and generic-ohci.yaml (0-day) 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..a0d8c30c2631 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/generic-ehci.yaml and +Documentation/devicetree/bindings/usb/generic-ohci.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 Tue Jan 24 03:05:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1730837 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1Bn54JR9z23gM for ; Tue, 24 Jan 2023 14:10:49 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P1Bn53VFLz3fMW for ; Tue, 24 Jan 2023 14:10:49 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.210.47; helo=mail-ot1-f47.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-ot1-f47.google.com (mail-ot1-f47.google.com [209.85.210.47]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P1Bfy5KHPz3c9T; Tue, 24 Jan 2023 14:05:30 +1100 (AEDT) Received: by mail-ot1-f47.google.com with SMTP id a1-20020a056830008100b006864df3b1f8so8497293oto.3; Mon, 23 Jan 2023 19:05:30 -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=tkh73S6szkffFrzKhDtdtuSfSgfp7To2mRcjcx99WlwO9yNWO7CZ7p3ViB6oVyfuO/ ko2/wwia/mGAALji6oZUky06izeN+vc0t7N8zoJHNjZtI3mbQ+6+qDrEjhvLGYxecuaA 3R08ev9JCT1Uhnn4hqmFnNJv8dmh3e7J5DitQ0Ljrt+kWyDIMpny7mA4mnP410eRlzpu SsCui61Gl6njva3AV7ZG+Uwc9BaYPF+7jsz/OndVd29Pt1ZrjEJsQauTGyfVQV+Ib7Hs W63mV43pcYyRVBup9Q9zCEZidYghwm+Jl9Ti8f2dzUcMuCBYrzzYHqgrYbwsjKfat6Te nvJw== X-Gm-Message-State: AFqh2kq/wu+3TST2FiJtIf6zRjlFBzTHXt96dsej3GIODmp8Br+pUG4O foAszG/ehAX6aaA+Pp2FJopO/cY/sg== X-Google-Smtp-Source: AMrXdXvQH0sqj/L9JBEQUzQ6OMqA602/d6xDzeDJd2iqRHh2295yqrVgSM/VJdjsM0K9Fx0dwIY4/A== X-Received: by 2002:a05:6830:670a:b0:684:e1cb:df87 with SMTP id cr10-20020a056830670a00b00684e1cbdf87mr15320609otb.8.1674529528074; Mon, 23 Jan 2023 19:05:28 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id cr11-20020a056830670b00b00661a3f4113bsm419338otb.64.2023.01.23.19.05.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 19:05:27 -0800 (PST) Received: (nullmailer pid 3266346 invoked by uid 1000); Tue, 24 Jan 2023 03:05:20 -0000 From: Rob Herring Date: Mon, 23 Jan 2023 21:05:18 -0600 Subject: [PATCH v3 4/5] dt-bindings: usb: Convert Marvell Orion EHCI to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v3-4-5af0541fcf8c@kernel.org> References: <20230110-dt-usb-v3-0-5af0541fcf8c@kernel.org> In-Reply-To: <20230110-dt-usb-v3-0-5af0541fcf8c@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 X-Mailer: b4 0.12-dev X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" 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 Tue Jan 24 03:05:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Herring X-Patchwork-Id: 1730834 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org (client-ip=2404:9400:2:0:216:3eff:fee1:b9f1; helo=lists.ozlabs.org; envelope-from=openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org; receiver=) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2404:9400:2:0:216:3eff:fee1:b9f1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4P1BlH0Hx9z23gV for ; Tue, 24 Jan 2023 14:09:15 +1100 (AEDT) Received: from boromir.ozlabs.org (localhost [IPv6:::1]) by lists.ozlabs.org (Postfix) with ESMTP id 4P1BlG6Zfpz3fS5 for ; Tue, 24 Jan 2023 14:09:14 +1100 (AEDT) X-Original-To: openbmc@lists.ozlabs.org Delivered-To: openbmc@lists.ozlabs.org Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=209.85.167.174; helo=mail-oi1-f174.google.com; envelope-from=robherring2@gmail.com; receiver=) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 4P1Bfw0zmbz3bh6; Tue, 24 Jan 2023 14:05:27 +1100 (AEDT) Received: by mail-oi1-f174.google.com with SMTP id p185so12213871oif.2; Mon, 23 Jan 2023 19:05:27 -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=nHsziz/xLaymkoZLkzu7zMoEFb/2swuiZv6PfnUdEJ8hOZ980QvFiuMeuUSGvRoTje 8t+r24+2oQBdiyE5nNqSNBJzE6JgFyTAhSu1EpS7fq6mYX0we4S/r2TSMZxaQqRdh6cg Lt/y8qy8gePdDKkMHd4chGDbcMYMn2uyUNLfoiwiKm0LzQRyfwLDU/Hk1IPz/kSIlDbL B14YxRjZGcmPhx0SBRY7ZDBpNWcLHWZul+Hg+JQDXxHLRZ2xU0Gn/xWt2vSjLaegoY6G dcO58/b49GSBXpNWKun0SSjoI41zh34fqrtVz2xFpjASLPAfZIwtqRo+Ko4JZtIhaIms Wp8w== X-Gm-Message-State: AFqh2krja3whq5Qh2Q8pVnKcn2m8Bp+WSZlFJqYXzNEF6a+ULfbBYy/S T5c8fM25DOJ3ND2NhCGpsjxyUGjZRA== X-Google-Smtp-Source: AMrXdXsQxU+g4VkhTO6PSGz2Uzgx2PhXFUQ4vF3YFaAwscF0LSrRJQAelA7PCrv0Epi3/ObSdAJ3mA== X-Received: by 2002:a05:6808:2a8c:b0:36a:8422:d962 with SMTP id fc12-20020a0568082a8c00b0036a8422d962mr10569363oib.2.1674529525545; Mon, 23 Jan 2023 19:05:25 -0800 (PST) Received: from robh_at_kernel.org (66-90-144-107.dyn.grandenetworks.net. [66.90.144.107]) by smtp.gmail.com with ESMTPSA id s26-20020a056808009a00b003645ec41412sm492545oic.27.2023.01.23.19.05.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Jan 2023 19:05:24 -0800 (PST) Received: (nullmailer pid 3266348 invoked by uid 1000); Tue, 24 Jan 2023 03:05:20 -0000 From: Rob Herring Date: Mon, 23 Jan 2023 21:05:19 -0600 Subject: [PATCH v3 5/5] dt-bindings: usb: Convert Nuvoton EHCI to DT schema MIME-Version: 1.0 Message-Id: <20230110-dt-usb-v3-5-5af0541fcf8c@kernel.org> References: <20230110-dt-usb-v3-0-5af0541fcf8c@kernel.org> In-Reply-To: <20230110-dt-usb-v3-0-5af0541fcf8c@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 X-Mailer: b4 0.12-dev X-BeenThere: openbmc@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Development list for OpenBMC List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, openbmc@lists.ozlabs.org, linux-usb@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org Errors-To: openbmc-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "openbmc" 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>; - };