summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2021-10-22 01:51:36 +0100
committerMark Brown <broonie@kernel.org>2021-10-22 01:51:36 +0100
commit0627d75a18ea28d7422d3476352265399c86d7d6 (patch)
tree4e7a33d06609e88466562aaa1560e0f1920ca5ff /Documentation
parent6aed787cf7461462eeb03edbcf56fa149ef6ea93 (diff)
parent4c1ef56bd9c7a60efdeac9f1478b5467fb47c093 (diff)
downloadlinux-stable-0627d75a18ea28d7422d3476352265399c86d7d6.tar.gz
linux-stable-0627d75a18ea28d7422d3476352265399c86d7d6.tar.bz2
linux-stable-0627d75a18ea28d7422d3476352265399c86d7d6.zip
Merge series "regulator: Introduce UniPhier NX1 SoC support" from Kunihiko Hayashi <hayashi.kunihiko@socionext.com>:
This series includes the patches to add basic support for new UniPhier NX1 SoC. NX1 SoC also has the same kinds of controls as the other UniPhier SoCs. Kunihiko Hayashi (2): dt-bindings: regulator: uniphier: Add binding for NX1 SoC regulator: uniphier: Add USB-VBUS compatible string for NX1 SoC .../devicetree/bindings/regulator/socionext,uniphier-regulator.yaml | 1 + drivers/regulator/uniphier-regulator.c | 4 ++++ 2 files changed, 5 insertions(+) -- 2.7.4
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
index 861d5f3c79e8..1218f21ba320 100644
--- a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
@@ -27,6 +27,7 @@ properties:
- socionext,uniphier-pxs2-usb3-regulator
- socionext,uniphier-ld20-usb3-regulator
- socionext,uniphier-pxs3-usb3-regulator
+ - socionext,uniphier-nx1-usb3-regulator
reg:
maxItems: 1