From patchwork Mon May 17 14:03:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 440118 Delivered-To: patch@linaro.org Received: by 2002:a02:7a1b:0:0:0:0:0 with SMTP id a27csp1163671jac; Mon, 17 May 2021 07:56:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzMKYoJeOMntb9xPBS0P4vw5ya99JbSkGiCcdl3+Z6nTlcGpcZM1WaooL62wMuNswWlhH59 X-Received: by 2002:a05:6602:72f:: with SMTP id g15mr328201iox.5.1621263413099; Mon, 17 May 2021 07:56:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1621263413; cv=none; d=google.com; s=arc-20160816; b=zc31oLNtmmTBbe5wRHs4tFxw/Jl5Ic6yo0kQoYKcjFwBEL2czD24PpXYtWzysiLAF5 xo1M3aWAY7KnEG9a0WMMxCpj+7vb/My6LsrLzlO4KFKX/Y4KgSyALJDY4mS6c/bArne2 /sY0WUF0SeqJIGMEQ9nIi7/D9toRFd0koFbaoxEhEo6rjWkWa3bpKwyh1zETCRkXxjg7 5raScheQBgga2EKVfAL/X4mJ7sWjeTaXINVGwV+4oiobKnE2ylXcdDJtzCLEa91gasff +pMNEAEt0oyjbqZSIEv4V+tDFst9+iMNHBZbCj0h1nDVEXywmPPuTZijGbtSbo54rT35 qbRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=kqrWUOYK54e8sBNLnTtWz0l21Y+J8s8YQzQnDFHSkrQ=; b=Uunujy2pj0HC8nCbRgezsEk3y6cDDM/z+1+0cAZrEFM/rQAvIly8uhW5ztBUnooPc4 i7QUflVDLHOYAhV/S8XKWKFUnvEvI3tv5ui4dUCl7sQjcKqu/uOPIxox/VrWtmraclQl a+u6ARP9yV4Yz1bbx8HGGnUvHCAhcel4M302fpIdw32gzzXR+QqHDD/y552ncnw32OCH NVyEQww++00mwBSqnzCe8Q6eXq+O6iGRKfjTMesMpN7z4aDwjFk22A29jW3BUQA5eDP1 HynFxLPdz55bK0zP69+fmwHXBSLsIRYOij1reBVVpd/G7DhTZrOu7Ht/HNPfsRhcfgUT xsug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cjw58jpa; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id o67si19717932jao.17.2021.05.17.07.56.52; Mon, 17 May 2021 07:56:53 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cjw58jpa; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241220AbhEQO6I (ORCPT + 12 others); Mon, 17 May 2021 10:58:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:48008 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241184AbhEQO4C (ORCPT ); Mon, 17 May 2021 10:56:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id AF99F61999; Mon, 17 May 2021 14:25:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1621261508; bh=mJGn8kKmvzm1L4SpZ5CFOdxDgF+ThAv3gXsHYvLl4Eo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cjw58jpa2PfZakabe0/9++GQMJlg92WXiwn0Lv05bdi9Jnx/Alq14uWFFJiHqWBfA Gxy9SluAr9xUDVMPSfYCF3JtGwJjlZsa9z8ftX8bW34bYsBurhgjWf3MAIbgBgDD4y O9NVIpEC+1RTGMf64Ykpkly9czmyLhuYNhqOIf3w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stephen Boyd , Sandeep Maheswaram , Dmitry Baryshkov , Rob Herring , Bjorn Andersson , Vinod Koul Subject: [PATCH 5.12 357/363] dt-bindings: phy: qcom, qmp-usb3-dp-phy: move usb3 compatibles back to qcom, qmp-phy.yaml Date: Mon, 17 May 2021 16:03:43 +0200 Message-Id: <20210517140314.660253350@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517140302.508966430@linuxfoundation.org> References: <20210517140302.508966430@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Dmitry Baryshkov commit 94c34600b6173a2b9dd7d9694a42d86fb8768e62 upstream. The commit 724fabf5df13 ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information") has support for DP part of USB3+DP combo PHYs. However this change is not backwards compatible, placing additional requirements onto qcom,sc7180-qmp-usb3-phy and qcom,sdm845-qmp-usb3-phy device nodes (to include separate DP part, etc). However the aforementioned nodes do not inclue DP part, they strictly follow the schema defined in the qcom,qmp-phy.yaml file. Move those compatibles, leaving qcom,qmp-usb3-dp-phy.yaml to describe only real "combo" USB3+DP device nodes. Fixes: 724fabf5df13 ("dt-bindings: phy: qcom,qmp-usb3-dp: Add DP phy information") Cc: Stephen Boyd Cc: Sandeep Maheswaram Signed-off-by: Dmitry Baryshkov Acked-by: Rob Herring Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson Link: https://lore.kernel.org/r/20210331151614.3810197-2-dmitry.baryshkov@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Greg Kroah-Hartman --- Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 ++ Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) --- a/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml @@ -25,11 +25,13 @@ properties: - qcom,msm8998-qmp-pcie-phy - qcom,msm8998-qmp-ufs-phy - qcom,msm8998-qmp-usb3-phy + - qcom,sc7180-qmp-usb3-phy - qcom,sc8180x-qmp-ufs-phy - qcom,sc8180x-qmp-usb3-phy - qcom,sdm845-qhp-pcie-phy - qcom,sdm845-qmp-pcie-phy - qcom,sdm845-qmp-ufs-phy + - qcom,sdm845-qmp-usb3-phy - qcom,sdm845-qmp-usb3-uni-phy - qcom,sm8150-qmp-ufs-phy - qcom,sm8150-qmp-usb3-phy --- a/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,qmp-usb3-dp-phy.yaml @@ -14,9 +14,7 @@ properties: compatible: enum: - qcom,sc7180-qmp-usb3-dp-phy - - qcom,sc7180-qmp-usb3-phy - qcom,sdm845-qmp-usb3-dp-phy - - qcom,sdm845-qmp-usb3-phy reg: items: - description: Address and length of PHY's USB serdes block.