From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 22 Feb 2021 17:16:38 +0000 (-0800)
Subject: Merge tag 'regulator-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.15~1719
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d6560052c2f73db59834e9a3c0aba20579aa7059;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'regulator-v5.12' of git://git./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
  ...
---

d6560052c2f73db59834e9a3c0aba20579aa7059
diff --cc arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
index 26a4a5a,7917754..2f0528d
--- a/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
+++ b/arch/arm64/boot/dts/qcom/qrb5165-rb5.dts
@@@ -225,14 -120,9 +225,14 @@@
  	};
  };
  
 +&adsp {
 +	status = "okay";
 +	firmware-name = "qcom/sm8250/adsp.mbn";
 +};
 +
  &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>;