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: 11500419 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 02B4D14DD for ; Tue, 21 Apr 2020 04:18:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D9A3B214AF for ; Tue, 21 Apr 2020 04:18:23 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="Z66vAOf3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726121AbgDUESW (ORCPT ); Tue, 21 Apr 2020 00:18:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1725904AbgDUESV (ORCPT ); Tue, 21 Apr 2020 00:18:21 -0400 Received: from mail-pf1-x444.google.com (mail-pf1-x444.google.com [IPv6:2607:f8b0:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3FED4C061A0F for ; Mon, 20 Apr 2020 21:18:20 -0700 (PDT) Received: by mail-pf1-x444.google.com with SMTP id y25so6041823pfn.5 for ; Mon, 20 Apr 2020 21:18:20 -0700 (PDT) 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=k6dcTQkR6848BgMgzhFFwWzBggJYTYeE+kNznUmfuk7PC1escpgtAJ+F2Pvuq1PEIu /NNcUxP/ImGkDmu6CLgXouKocwN3wfbUzJySJenMrb11FYGra/WPeWSaatDn12E2eHDi +MHpgSJw1XBpsoox/hEIRX9tT2xqjKiRTdXLIjAqTFCV8BfuOoIWPIHUY3AaicLDePrQ yM1IzLz9tbhJfez0lLgoFBKJLb3I0ilFXV3ptrmoOtjcJYk/fYkzrf6yaxP8kWkECVJJ ybcjWYfdwN6eJtjYrBWcPEcErw51tyUD5kG39IEAJDVHuWkrdHv7U/oUsBMPcNKXtG16 yAJQ== X-Gm-Message-State: AGi0PuYWYe3uKmGIITRME7oJ54kXtciE43G0gjyCDzXxhhD3oVS1Eupr a6mY2zWGbdgHiG0RUEbEERVEvw== 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) 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 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org 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(+) 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,