| Message ID | 20211229220117.293542-1-marijn.suijten@somainline.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | Revert "arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX" | expand |
On Wed, 29 Dec 2021 23:01:17 +0100, Marijn Suijten wrote: > This reverts commit c23f1b77358c173a25ef21303d2a8cc893e9ce22. > > The SM6125_VDDCX constant was replaced with 0 temporarily as the header > patch defining this constant resided in a different branch, creating an > unwanted dependency of the dts branch on the drivers branch. > Now (by the time this patch will be applied) that both branches have > been merged upstream, it is safe to revert to the constant again. > > [...] Applied, thanks! [1/1] Revert "arm64: dts: qcom: sm6125: Avoid using missing SM6125_VDDCX" commit: a90b8adfa2ddfd74944fa73be97fabe230f0046d Best regards,
diff --git a/arch/arm64/boot/dts/qcom/sm6125.dtsi b/arch/arm64/boot/dts/qcom/sm6125.dtsi index 49e6bca646c2..e81b2a7794fb 100644 --- a/arch/arm64/boot/dts/qcom/sm6125.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6125.dtsi @@ -449,7 +449,7 @@ sdhc_1: sdhci@4744000 { <&xo_board>; clock-names = "iface", "core", "xo"; - power-domains = <&rpmpd 0>; + power-domains = <&rpmpd SM6125_VDDCX>; bus-width = <8>; non-removable; @@ -474,7 +474,7 @@ sdhc_2: sdhci@4784000 { pinctrl-1 = <&sdc2_state_off>; pinctrl-names = "default", "sleep"; - power-domains = <&rpmpd 0>; + power-domains = <&rpmpd SM6125_VDDCX>; bus-width = <4>; status = "disabled";
This reverts commit c23f1b77358c173a25ef21303d2a8cc893e9ce22. The SM6125_VDDCX constant was replaced with 0 temporarily as the header patch defining this constant resided in a different branch, creating an unwanted dependency of the dts branch on the drivers branch. Now (by the time this patch will be applied) that both branches have been merged upstream, it is safe to revert to the constant again. Signed-off-by: Marijn Suijten <marijn.suijten@somainline.org> --- arch/arm64/boot/dts/qcom/sm6125.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)