Message ID | 20230418071734.5706-1-krzysztof.kozlowski@linaro.org |
---|---|
State | Accepted |
Commit | 902f8c9830c35cc61a7b3f63003c7246b2bf06ca |
Headers | show |
Series | [RESEND,1/2] regulator: dt-bindings: qcom,rpmh: Correct PM8550 family supplies | expand |
On Tue, 18 Apr 2023 09:17:33 +0200, Krzysztof Kozlowski wrote: > PM8550 is different than PM8550VE/VS, because the latter has much > smaller amount of supplies (l1-3 and s1-6) and regulators. The PM8550 > has on the other hand one pin for vdd-l1-l4-l10 supplies. Correct the > if:then: clause with their supplies. > > Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next Thanks! [2/2] regulator: dt-bindings: qcom,rpmh: Combine PM6150L and PM8150L if-then commit: ed479907ff79007548c3bd1aed387f8cf0a62065 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml index f879ccbb3767..5f9ae89a220d 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.yaml @@ -329,19 +329,29 @@ allOf: compatible: enum: - qcom,pm8550-rpmh-regulators - - qcom,pm8550ve-rpmh-regulators - - qcom,pm8550vs-rpmh-regulators then: properties: + vdd-l1-l4-l10-supply: true vdd-l2-l13-l14-supply: true vdd-l5-l16-supply: true vdd-l6-l7-supply: true vdd-l8-l9-supply: true patternProperties: - "^vdd-l([1-4]|1[0-7])-supply$": true + "^vdd-l(3|1[1-7])-supply$": true "^vdd-s[1-6]-supply$": true "^vdd-bob[1-2]-supply$": true + - if: + properties: + compatible: + enum: + - qcom,pm8550ve-rpmh-regulators + - qcom,pm8550vs-rpmh-regulators + then: + patternProperties: + "^vdd-l[1-3]-supply$": true + "^vdd-s[1-6]-supply$": true + - if: properties: compatible: