The patch regulator: dt-bindings: Sort the compatibles and nodes has been applied to the regulator tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-5.4 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 >From c6e20fa49818381dfa7288fad4c33b84408aab54 Mon Sep 17 00:00:00 2001 From: Vinod Koul <vkoul@xxxxxxxxxx> Date: Fri, 9 Aug 2019 13:06:13 +0530 Subject: [PATCH] regulator: dt-bindings: Sort the compatibles and nodes It helps to keep sorted order for compatibles and nodes, so sort them Suggested-by: Bjorn Andersson <bjorn.andersson@xxxxxxxxxx> Signed-off-by: Vinod Koul <vkoul@xxxxxxxxxx> Link: https://lore.kernel.org/r/20190809073616.1235-1-vkoul@xxxxxxxxxx Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> --- .../regulator/qcom,rpmh-regulator.txt | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt index 1a9cab50503a..bab9f71140b8 100644 --- a/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt +++ b/Documentation/devicetree/bindings/regulator/qcom,rpmh-regulator.txt @@ -22,12 +22,12 @@ RPMh resource. The names used for regulator nodes must match those supported by a given PMIC. Supported regulator node names: - PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 - PMI8998: bob PM8005: smps1 - smps4 + PM8009: smps1 - smps2, ldo1 - ldo7 PM8150: smps1 - smps10, ldo1 - ldo18 PM8150L: smps1 - smps8, ldo1 - ldo11, bob, flash, rgb - PM8009: smps1 - smps2, ld01 - ldo7 + PM8998: smps1 - smps13, ldo1 - ldo28, lvs1 - lvs2 + PMI8998: bob ======================== First Level Nodes - PMIC @@ -36,12 +36,13 @@ First Level Nodes - PMIC - compatible Usage: required Value type: <string> - Definition: Must be one of: "qcom,pm8998-rpmh-regulators", - "qcom,pmi8998-rpmh-regulators" or - "qcom,pm8005-rpmh-regulators" or - "qcom,pm8150-rpmh-regulators" or - "qcom,pm8150l-rpmh-regulators" or - "qcom,pm8009-rpmh-regulators". + Definition: Must be one of below: + "qcom,pm8005-rpmh-regulators" + "qcom,pm8009-rpmh-regulators" + "qcom,pm8150-rpmh-regulators" + "qcom,pm8150l-rpmh-regulators" + "qcom,pm8998-rpmh-regulators" + "qcom,pmi8998-rpmh-regulators" - qcom,pmic-id Usage: required -- 2.20.1