From patchwork Tue Apr 21 04:18:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 185585 Delivered-To: patches@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp4781799ilf; Mon, 20 Apr 2020 21:18:20 -0700 (PDT) X-Received: by 2002:a63:ca4f:: with SMTP id o15mr19112761pgi.122.1587442700204; Mon, 20 Apr 2020 21:18:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1587442700; cv=none; d=google.com; s=arc-20160816; b=nvxsYNVRXu+ksxoG4uEJlMr7IP1yPHykdZrvKrjyH1DZ6RPpNdrsM8mwZr55dOVEsv y93h1P6VcJZ7YfKvZ6QXO0QsT1G1IpG9NXc+uTSco3xnFYTgQmjlmUX3eFz9KtZL4Fmh MaENNzJ31wWG2VkTnvrYNRTTCxWNKzX+9iRq2hj4yzY0hGCx2LL1h1mGXoPm8Wul8YUi n7YXevA9zSUyEcdggBn2EobKICjngM/CjrKPMWmieWzO0wsNiI97r22g/84r9v6fIG1Q qJO93ndKFe+23Ix4m24vSL4ngODDqPOdJhER0dmiz8luqyEOzepaKwvrMULKVJRoEQWC fnTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:date:subject:cc:to:from:dkim-signature; bh=8e6fmLjhn9iA1rR0EhCdHo59ETG2z9t4z8p3W3x9ZsE=; b=nlRnkrOPaGqNn/YTtME66SxYHEsN6FfjIS63QJGRx1EISA4zaAVwRKeR1lMG1ZeYdJ ddBPoh20g+APFbnNzpUObT/4tfpgzLRx+Ah77Aog3zmD9qj8sXaeslxWGUBzJiETC8T2 gvvjhnbcJ86FAEyCjM4wdJcnkIp/v2PXxWVEMhUrrVJD7DuqtXkg6RD5eA/yEFMfot2N JdtzSuXOjVzcqCnKf4lgl1NuCP8PLvmXP6CCdur5eNALOrclxgcZYwtCnYkB+tDdBg1H GgI5Tg+0kCxKkk7H2pVuGl7a/UwfR2DcijNIG2ECJkY4yZhJu5sK1y6m89EdhcDQFNKy 4PsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z66vAOf3; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u64sor1616382pgu.49.2020.04.20.21.18.19 for (Google Transport Security); Mon, 20 Apr 2020 21:18:20 -0700 (PDT) Received-SPF: pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Z66vAOf3; spf=pass (google.com: domain of john.stultz@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=john.stultz@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=8e6fmLjhn9iA1rR0EhCdHo59ETG2z9t4z8p3W3x9ZsE=; b=Z66vAOf3VQVmIh3G/f3v+6AhWFW/rGAlD7zhpbTN+8JTLOCQmy3sn1cR8uwLZOsUbf CsqLN6Ll2QQIj07DvacoMIIY9VqBt5A4RcgY26IOwDFYrWR5oS3Tcvel8CM2DF/cgFC3 Z4JHFm1o5plpW7mK4ZHM2sHW2Bc3R1ou5MUG+54JXkCnIuKvnKJS6h7gfJMpnV2W8oGu UEgm4W/+Shn+cjTdAWgMA842Oe5/C8ZV7ypvyInb5oaiTYz8al1a05rHl4eANNd8wtgV mkH2EAR3og9LeL3pW8Wirhw0IwqHyyN08rBAZ8JNA8jGbPl5+nKGY99uLHlNyC7eLgsl 390A== 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; bh=8e6fmLjhn9iA1rR0EhCdHo59ETG2z9t4z8p3W3x9ZsE=; b=P/13HaBfaRUwEUb7OscMaCQ3xSSowTQf0w40wHsVxqlOAZF1/aK0tgXR3QLEcxpaeu VDIvRJSGHDdKOehnPqPmBw2C6p2r6bddn1mTwctg1geMIeA2cf3uOr+CJi8of7ImyXos pnoifz9zUKDSxp7uWos1Vfo3cp4IJGFvONVt/x/LVcaGVctsnIZqs0bgvplVmo3Ut0FQ ArvIdBLqImmpe0V/xby8zfeL0+427sU3GhnMgDqAAxjQzzPpOv5m5fybGyf68b+vwZ4L KOcP6hJQP1eD6qNE7C7s9mvR/V7ZnU8siwVTFpPAqYM7l1Gu+h35s1p9+OlNlFZDCe3p z2NA== X-Gm-Message-State: AGi0PuaZm84N8VKxGzKg+6Y7iOwq5gh+W5huYpn7SaEPBkr7Du0beBMM iyuWQt8pZXkewLoBjnbCbCjAg7bn X-Google-Smtp-Source: APiQypIWgC4Ikb23fi2/xY/q7/ojPQJBPkkRf3Hnp9tPWOb2+PCZ1n6vZSajOCgL3d/OC6zb5dVLnA== X-Received: by 2002:a63:3814:: with SMTP id f20mr10279254pga.283.1587442699578; Mon, 20 Apr 2020 21:18:19 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a136sm1083262pfa.99.2020.04.20.21.18.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 20 Apr 2020 21:18:18 -0700 (PDT) From: John Stultz To: lkml Cc: John Stultz , Andy Gross , Bjorn Andersson , Rob Herring , Mark Rutland , Doug Anderson , Manu Gautam , Sandeep Maheswaram , Matthias Kaehlcke , Stephen Boyd , Kishon Vijay Abraham I , linux-arm-msm@vger.kernel.org, devicetree@vger.kernel.org Subject: [RESEND x2][PATCH v2] phy: qcom-qusb2: Re add "qcom, sdm845-qusb2-phy" compat string Date: Tue, 21 Apr 2020 04:18:15 +0000 Message-Id: <20200421041815.1808-1-john.stultz@linaro.org> X-Mailer: git-send-email 2.17.1 This patch fixes a regression in 5.7-rc1+ In commit 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support"), the change was made to add "qcom,qusb2-v2-phy" as a generic compat string. However the change also removed the "qcom,sdm845-qusb2-phy" compat string, which is documented in the binding and already in use. This patch re-adds the "qcom,sdm845-qusb2-phy" compat string which allows the driver to continue to work with existing dts entries such as found on the db845c. Cc: Andy Gross Cc: Bjorn Andersson Cc: Rob Herring Cc: Mark Rutland Cc: Doug Anderson Cc: Manu Gautam Cc: Sandeep Maheswaram Cc: Matthias Kaehlcke Cc: Stephen Boyd Cc: Kishon Vijay Abraham I Cc: linux-arm-msm@vger.kernel.org Cc: devicetree@vger.kernel.org Reviewed-by: Stephen Boyd Reviewed-by: Douglas Anderson Reviewed-by: Bjorn Andersson Fixes: 8fe75cd4cddf ("phy: qcom-qusb2: Add generic QUSB2 V2 PHY support") Reported-by: YongQin Liu Signed-off-by: John Stultz --- v2: Add deprecation note on "qcom,sdm845-qusb2-phy" string as suggested by Doug. --- drivers/phy/qualcomm/phy-qcom-qusb2.c | 7 +++++++ 1 file changed, 7 insertions(+) -- 2.17.1 diff --git a/drivers/phy/qualcomm/phy-qcom-qusb2.c b/drivers/phy/qualcomm/phy-qcom-qusb2.c index 3708d43b7508..393011a05b48 100644 --- a/drivers/phy/qualcomm/phy-qcom-qusb2.c +++ b/drivers/phy/qualcomm/phy-qcom-qusb2.c @@ -815,6 +815,13 @@ static const struct of_device_id qusb2_phy_of_match_table[] = { }, { .compatible = "qcom,msm8998-qusb2-phy", .data = &msm8998_phy_cfg, + }, { + /* + * Deprecated. Only here to support legacy device + * trees that didn't include "qcom,qusb2-v2-phy" + */ + .compatible = "qcom,sdm845-qusb2-phy", + .data = &qusb2_v2_phy_cfg, }, { .compatible = "qcom,qusb2-v2-phy", .data = &qusb2_v2_phy_cfg,