From patchwork Tue Apr 14 18:57:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 185435 Delivered-To: patches@linaro.org Received: by 2002:a92:3d9a:0:0:0:0:0 with SMTP id k26csp1762570ilf; Tue, 14 Apr 2020 11:57:50 -0700 (PDT) X-Received: by 2002:a65:6101:: with SMTP id z1mr22526078pgu.224.1586890670028; Tue, 14 Apr 2020 11:57:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586890670; cv=none; d=google.com; s=arc-20160816; b=CN9pdrGI1++aMGidEjcFl/Tr57P3+lYemlwBPQnzs4+Y4e1gW0GEhHI9ZbTVXZj9Sc VTX9s/N0PC2xO/bLOM/O1Mo75bnqosc8Q7H2MtG7yDHfs+wKvZBNF8YaSfYVkQ9fx2ek QUjkJ+LHmB74B0WV1t9C6XHnOWWz7iSMKaRG9mOM8AMJKSTSdXSyZcjNs27rLWJsMLtb mKfmfjlBOAh43PRCrNp2ykZW+lmIMd6pv74RJRODPAPU+8xfxjzSlg9L9mbls6sDL1zJ aiEciC2Dq8kiP/qxostWQFuVif8ZmCsICCYlwphQYfhLozUqTiD5p5/wL5+V+bPLlyQU YLFQ== 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=eLhNg8kDFNpBIRgI1oareY/yJAWpxKnYxH3HqcN0OKc=; b=ux9of6rpsFM9TuxBqNfRiShYYLGV5zo9qtOenQBgbJ8d8J+e02pdWTFn3vRiA5JBFV Y7EQEsN6BYk07s8twE3gSH/tr5ocgzCbm1vwy6947QbqTsmBmFSaUmTIE/wkl97coO27 aLzPMjR9XlWKoxZAUVWtxk7YkWUJMWC7BovwPtpdcWaW/nmCfb1RFSguKg4p4IxFEPds tvuxvEBzElQnt6AWorR+nOdA5sNA2suJs1dpTWeN7WJP/NHaabUhBFat9JIZPcEwcBcD ub1iUPQEoiFHX9UMLNgcYBhON69j5uZ8ocCjwdgyy25cOW2rZFOmFB+9eqp89LmcNmrS ilsA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=ez1U5xHO; 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 1sor19651655pla.14.2020.04.14.11.57.49 for (Google Transport Security); Tue, 14 Apr 2020 11:57:49 -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=ez1U5xHO; 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=eLhNg8kDFNpBIRgI1oareY/yJAWpxKnYxH3HqcN0OKc=; b=ez1U5xHOxFaBocYyvpYcUW3fff2IH0WXHGkc5ZTFQ9vHmRlorLGiAGbqRVF3ylGzl6 aQuz4yVKzjIFAREzZf8GrBsBXWjVIBOjMo5r3VdcGcdKizW34CI91N8KY/0Fp0Ij+jLe 3i6A1zhISgRJ1FvCLFcHCSxzTQE3IhloAOm6a10IcaU/DwxQp10GpZxVQES2LrO8RaWs Yk7lMqRiNiXoPWrx6+7aZoRGI77G1c6nX7wOfiF4iKknvXx70ba7kqkM6lMPqmLOEmCi 8Anbggy4C2herkaUy8MlH3ygKEbO4ekWk1bdySIiPLiy1wadSFSJfb1EViD49iJxegxs gEZg== 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=eLhNg8kDFNpBIRgI1oareY/yJAWpxKnYxH3HqcN0OKc=; b=i2SrWu1OwxDep/EigiChRuyTtsYUh5ixnF5vppNKRT0JOiPBM8Fs9/Q7Pl0m5KcZss EjiyM9X/hHSjCsBpB/d5+2S9wetA8utrHlamvvd5zi5G9shDgVYPqihln3JZ5c+oNBmR 18c2EGupqj0/zbAcjQoromqBCAUEkdkRqLDZwKd2D3EYOKT3arOtB6p9CGt/WIQVS0xd rwAsFrCK0BjID8tPXSaZwMFop495uG0LA/ejBn2QfEmusvaNLXUR2QZNAlhBbeznbcfC 3hAz9Ra+8HgeKHq6etEwYyKNtwmALgMBrkBdXZE3DrcbYB+3gDinpo6yzlnULecT2GLj 3riQ== X-Gm-Message-State: AGi0PuZU5ZX8htnBRj2bUtjtjWN/U0sZUoLJkcOf/C3Er05at4zRnrTo LZyAZMUF5pSWF2M4Gnvv8VeUBnB1 X-Google-Smtp-Source: APiQypIQqv3aTGpX5KMbNC05HSpYyKy/zSB3plcdQbijP6ouAUwBS3T+FFgq7tSGMMQkTN4B1//L6Q== X-Received: by 2002:a17:902:8a89:: with SMTP id p9mr1280398plo.286.1586890669483; Tue, 14 Apr 2020 11:57:49 -0700 (PDT) Return-Path: Received: from localhost.localdomain ([2601:1c2:680:1319:692:26ff:feda:3a81]) by smtp.gmail.com with ESMTPSA id a13sm1865870pfo.85.2020.04.14.11.57.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 14 Apr 2020 11:57:48 -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][PATCH v2] phy: qcom-qusb2: Re add "qcom, sdm845-qusb2-phy" compat string Date: Tue, 14 Apr 2020 18:57:44 +0000 Message-Id: <20200414185744.84581-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: 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,