Commit 560e8050 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-fix-v6.11-merge-window' of...

Merge tag 'regulator-fix-v6.11-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "These two commits clean up the excessively loose dependencies for the
  RZG2L USB VBCTRL regulator driver, ensuring it shouldn't prompt for
  people who can't use it"

* tag 'regulator-fix-v6.11-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: Further restrict RZG2L USB VBCTRL regulator dependencies
  regulator: renesas-usb-vbus-regulator: Update the default
parents 8f3f7598 e975d955
...@@ -1661,10 +1661,10 @@ config REGULATOR_UNIPHIER ...@@ -1661,10 +1661,10 @@ config REGULATOR_UNIPHIER
config REGULATOR_RZG2L_VBCTRL config REGULATOR_RZG2L_VBCTRL
tristate "Renesas RZ/G2L USB VBUS regulator driver" tristate "Renesas RZ/G2L USB VBUS regulator driver"
depends on ARCH_RZG2L || COMPILE_TEST depends on RESET_RZG2L_USBPHY_CTRL || COMPILE_TEST
depends on OF depends on OF
select REGMAP_MMIO select REGMAP_MMIO
default ARCH_RZG2L default RESET_RZG2L_USBPHY_CTRL
help help
Support for VBUS regulators implemented on Renesas RZ/G2L SoCs. Support for VBUS regulators implemented on Renesas RZ/G2L SoCs.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment