Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: dts: qcom: apq8064: Declare all pm8921 regulators

Consolidate all labeling of regulators into the core 8064 dtsi file to
make them available from all other dts files.

Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: Andy Gross <agross@codeaurora.org>

authored by

Bjorn Andersson and committed by
Andy Gross
2bce6e26 24a9baf9

+64 -18
+8 -8
arch/arm/boot/dts/qcom-apq8064-cm-qs600.dts
··· 54 54 55 55 56 56 /* Buck SMPS */ 57 - pm8921_s1: s1 { 57 + s1 { 58 58 regulator-always-on; 59 59 regulator-min-microvolt = <1225000>; 60 60 regulator-max-microvolt = <1225000>; ··· 62 62 bias-pull-down; 63 63 }; 64 64 65 - pm8921_s3: s3 { 65 + s3 { 66 66 regulator-min-microvolt = <1000000>; 67 67 regulator-max-microvolt = <1400000>; 68 68 qcom,switch-mode-frequency = <4800000>; 69 69 }; 70 70 71 - pm8921_s4: s4 { 71 + s4 { 72 72 regulator-min-microvolt = <1800000>; 73 73 regulator-max-microvolt = <1800000>; 74 74 qcom,switch-mode-frequency = <3200000>; 75 75 }; 76 76 77 - pm8921_s7: s7 { 77 + s7 { 78 78 regulator-min-microvolt = <1300000>; 79 79 regulator-max-microvolt = <1300000>; 80 80 qcom,switch-mode-frequency = <3200000>; 81 81 }; 82 82 83 - pm8921_l3: l3 { 83 + l3 { 84 84 regulator-min-microvolt = <3050000>; 85 85 regulator-max-microvolt = <3300000>; 86 86 bias-pull-down; 87 87 }; 88 88 89 - pm8921_l4: l4 { 89 + l4 { 90 90 regulator-min-microvolt = <1000000>; 91 91 regulator-max-microvolt = <1800000>; 92 92 bias-pull-down; 93 93 }; 94 94 95 - pm8921_l5: l5 { 95 + l5 { 96 96 regulator-min-microvolt = <2750000>; 97 97 regulator-max-microvolt = <3000000>; 98 98 bias-pull-down; 99 99 }; 100 100 101 - pm8921_l23: l23 { 101 + l23 { 102 102 regulator-min-microvolt = <1700000>; 103 103 regulator-max-microvolt = <1900000>; 104 104 bias-pull-down;
+10 -10
arch/arm/boot/dts/qcom-apq8064-ifc6410.dts
··· 64 64 65 65 66 66 /* Buck SMPS */ 67 - pm8921_s1: s1 { 67 + s1 { 68 68 regulator-always-on; 69 69 regulator-min-microvolt = <1225000>; 70 70 regulator-max-microvolt = <1225000>; ··· 72 72 bias-pull-down; 73 73 }; 74 74 75 - pm8921_s3: s3 { 75 + s3 { 76 76 regulator-min-microvolt = <1000000>; 77 77 regulator-max-microvolt = <1400000>; 78 78 qcom,switch-mode-frequency = <4800000>; 79 79 }; 80 80 81 - pm8921_s4: s4 { 81 + s4 { 82 82 regulator-min-microvolt = <1800000>; 83 83 regulator-max-microvolt = <1800000>; 84 84 qcom,switch-mode-frequency = <3200000>; 85 85 }; 86 86 87 - pm8921_s7: s7 { 87 + s7 { 88 88 regulator-min-microvolt = <1300000>; 89 89 regulator-max-microvolt = <1300000>; 90 90 qcom,switch-mode-frequency = <3200000>; 91 91 }; 92 92 93 - pm8921_l3: l3 { 93 + l3 { 94 94 regulator-min-microvolt = <3050000>; 95 95 regulator-max-microvolt = <3300000>; 96 96 bias-pull-down; 97 97 }; 98 98 99 - pm8921_l4: l4 { 99 + l4 { 100 100 regulator-min-microvolt = <1000000>; 101 101 regulator-max-microvolt = <1800000>; 102 102 bias-pull-down; 103 103 }; 104 104 105 - pm8921_l5: l5 { 105 + l5 { 106 106 regulator-min-microvolt = <2750000>; 107 107 regulator-max-microvolt = <3000000>; 108 108 bias-pull-down; 109 109 }; 110 110 111 - pm8921_l6: l6 { 111 + l6 { 112 112 regulator-min-microvolt = <2950000>; 113 113 regulator-max-microvolt = <2950000>; 114 114 bias-pull-down; 115 115 }; 116 116 117 - pm8921_l23: l23 { 117 + l23 { 118 118 regulator-min-microvolt = <1700000>; 119 119 regulator-max-microvolt = <1900000>; 120 120 bias-pull-down; 121 121 }; 122 122 123 - pm8921_lvs1: lvs1 { 123 + lvs1 { 124 124 bias-pull-down; 125 125 }; 126 126 };
+46
arch/arm/boot/dts/qcom-apq8064.dtsi
··· 480 480 regulators { 481 481 compatible = "qcom,rpm-pm8921-regulators"; 482 482 483 + pm8921_s1: s1 {}; 484 + pm8921_s2: s2 {}; 485 + pm8921_s3: s3 {}; 486 + pm8921_s4: s4 {}; 487 + pm8921_s7: s7 {}; 488 + pm8921_s8: s8 {}; 489 + 490 + pm8921_l1: l1 {}; 491 + pm8921_l2: l2 {}; 492 + pm8921_l3: l3 {}; 493 + pm8921_l4: l4 {}; 494 + pm8921_l5: l5 {}; 495 + pm8921_l6: l6 {}; 496 + pm8921_l7: l7 {}; 497 + pm8921_l8: l8 {}; 498 + pm8921_l9: l9 {}; 499 + pm8921_l10: l10 {}; 500 + pm8921_l11: l11 {}; 501 + pm8921_l12: l12 {}; 502 + pm8921_l14: l14 {}; 503 + pm8921_l15: l15 {}; 504 + pm8921_l16: l16 {}; 505 + pm8921_l17: l17 {}; 506 + pm8921_l18: l18 {}; 507 + pm8921_l21: l21 {}; 508 + pm8921_l22: l22 {}; 509 + pm8921_l23: l23 {}; 510 + pm8921_l24: l24 {}; 511 + pm8921_l25: l25 {}; 512 + pm8921_l26: l26 {}; 513 + pm8921_l27: l27 {}; 514 + pm8921_l28: l28 {}; 515 + pm8921_l29: l29 {}; 516 + 517 + pm8921_lvs1: lvs1 {}; 518 + pm8921_lvs2: lvs2 {}; 519 + pm8921_lvs3: lvs3 {}; 520 + pm8921_lvs4: lvs4 {}; 521 + pm8921_lvs5: lvs5 {}; 522 + pm8921_lvs6: lvs6 {}; 523 + pm8921_lvs7: lvs7 {}; 524 + 525 + pm8921_usb_switch: usb-switch {}; 526 + 483 527 pm8921_hdmi_switch: hdmi-switch { 484 528 bias-pull-down; 485 529 }; 530 + 531 + pm8921_ncp: ncp {}; 486 532 }; 487 533 }; 488 534