From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D1FD9196C6F; Thu, 6 Jun 2024 14:08:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682933; cv=none; b=a+n3U+PkVTnPz76BI6pwKOg9wuBGwX/nRGx7e/c1if4yNbgIoEnBls1HwlceupPQGlECyfOIlw6nlAnk+f+HbyTSb/BxV6nsGS49gwsXgbJey5DX3qPr8//sXXhywJ23F6RhynfJb0tCqM1+9xRBcJHbNSdd88B9UA8F2RKLegg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1717682933; c=relaxed/simple; bh=u5ZxTNX9FnUd7erFcSrmKNgne4v/c8cEu0dR3BE8MmQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jmRfIOGWF6rcQteeaW1lMplivhYhyHTzZxr8kvGVD5kLsP/XimV+gCVeekgTiBULd9GwZ4Y+N9/PF/uOSrQCV8OHJ9/rVImZIp+gF+TUZ12CrqC/TJ1DlbM/chDYkk7I8pTL/Wisg/PBLsOHvfJ0MC7Y7gY54Hp+P5KhNEEXWRQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=T/IbfjGK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="T/IbfjGK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE3C4C2BD10; Thu, 6 Jun 2024 14:08:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1717682933; bh=u5ZxTNX9FnUd7erFcSrmKNgne4v/c8cEu0dR3BE8MmQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=T/IbfjGKYQljyamdJapSj8iH3zPh5TzOAIBNzqVF7VUc7cigl64pzAywv5xEhfzeU AdTPcCMJfN8dj/EN75C45oXlGDnslOwr2XTwggTTeCbNP6bYTrafjpMFrydDpz9R68 Tya+Wwb7CM7tG2/F4n27p2287VvD79+2vmyPVadI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Dmitry Baryshkov , Krzysztof Kozlowski , Vinod Koul , Sasha Levin Subject: [PATCH 6.9 082/374] dt-bindings: phy: qcom,sc8280xp-qmp-ufs-phy: fix msm899[68] power-domains Date: Thu, 6 Jun 2024 16:01:01 +0200 Message-ID: <20240606131654.610406466@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240606131651.683718371@linuxfoundation.org> References: <20240606131651.683718371@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Dmitry Baryshkov [ Upstream commit 59e377a124dc9039d9554d823b1cb4942bcee9a0 ] The Qualcomm MSM8996 and MSM8998 platforms don't have separate power domain for the UFS PHY. Replace required:power-domains with the conditional schema. Fixes: dc5cb63592bd ("dt-bindings: phy: migrate QMP UFS PHY bindings to qcom,sc8280xp-qmp-ufs-phy.yaml") Signed-off-by: Dmitry Baryshkov Reviewed-by: Krzysztof Kozlowski Link: https://lore.kernel.org/r/20240501-qcom-phy-fixes-v1-2-f1fd15c33fb3@linaro.org Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml index 91a6cc38ff7ff..c4c4fb38c51a9 100644 --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml @@ -71,7 +71,6 @@ required: - reg - clocks - clock-names - - power-domains - resets - reset-names - vdda-phy-supply @@ -127,6 +126,21 @@ allOf: - const: ref - const: qref + - if: + properties: + compatible: + contains: + enum: + - qcom,msm8996-qmp-ufs-phy + - qcom,msm8998-qmp-ufs-phy + then: + properties: + power-domains: + false + else: + required: + - power-domains + additionalProperties: false examples: -- 2.43.0