diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:16:38 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:16:38 +0300 |
| commit | d6560052c2f73db59834e9a3c0aba20579aa7059 (patch) | |
| tree | f446d04ca3c3f4fc354f3969dfcda550f39757e0 /arch | |
| parent | 05a6fb94a6e1774eb529e1365ddc2783de614e88 (diff) | |
| parent | f03e2a72e5e8772ba0c2a0fc4539e4ffd03d411b (diff) | |
| download | linux-d6560052c2f73db59834e9a3c0aba20579aa7059.tar.xz | |
Merge tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator updates from Mark Brown:
"Quite an active release for driver specific updates but very little
going on at the subsystem level this time for the regulator API.
Summary:
- Overhaul of the Qualcomm LABIBB driver.
- Allow use of regulator_sync_voltage() on coupled regulators.
- Support for Action ATC260x, Mediatek DVSRC and MT6315, Qualcomm
PCM8180/c and PM8009-1 and Richtek RT4831
- Removal of the AB3100 driver"
* tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (49 commits)
regulator: bd718x7, bd71828, Fix dvs voltage levels
regulator: pca9450: Add sd-vsel GPIO
regulator: pca9450: Enable system reset on WDOG_B assertion
regulator: pca9450: Add SD_VSEL GPIO for LDO5
regulator: qcom-rpmh: fix pm8009 ldo7
regulator: mt6315: Add support for MT6315 regulator
regulator: document binding for MT6315 regulator
regulator: dt-bindings: Document charger-supply for max8997
regulator: qcom-labibb: Use disable_irq_nosync from isr
regulator: pf8x00: Fix typo for PF8200 chip name
regulator: pf8x00: set ramp_delay for bucks
regulator: core: Avoid debugfs: Directory ... already present! error
regulator: pf8x00: Add suspend support
regulator: Make regulator_sync_voltage() usable by coupled regulators
regulator: s5m8767: Drop regulators OF node reference
regulator: qcom-rpmh: Add pmc8180 and pmc8180c
regulator: qcom-rpmh: Add pmc8180 and pmc8180c
regulator: s5m8767: Fix reference count leak
regulator: remove ab3100 driver
regulator: axp20x: Fix reference cout leak
...
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts index 26a4a5a6871e..2f0528d01299 100644 --- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts +++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts @@ -232,7 +232,7 @@ &apps_rsc { pm8009-rpmh-regulators { - compatible = "qcom,pm8009-rpmh-regulators"; + compatible = "qcom,pm8009-1-rpmh-regulators"; qcom,pmic-id = "f"; vdd-s1-supply = <&vph_pwr>; @@ -241,6 +241,13 @@ vdd-l5-l6-supply = <&vreg_bob>; vdd-l7-supply = <&vreg_s4a_1p8>; + vreg_s2f_0p95: smps2 { + regulator-name = "vreg_s2f_0p95"; + regulator-min-microvolt = <900000>; + regulator-max-microvolt = <952000>; + regulator-initial-mode = <RPMH_REGULATOR_MODE_AUTO>; + }; + vreg_l1f_1p1: ldo1 { regulator-name = "vreg_l1f_1p1"; regulator-min-microvolt = <1104000>; |