diff options
| author | Mark Brown | 2021-10-22 01:51:36 +0100 |
|---|---|---|
| committer | Mark Brown | 2021-10-22 01:51:36 +0100 |
| commit | 0627d75a18ea28d7422d3476352265399c86d7d6 (patch) | |
| tree | 4e7a33d06609e88466562aaa1560e0f1920ca5ff | |
| parent | 6aed787cf7461462eeb03edbcf56fa149ef6ea93 (diff) | |
| parent | 4c1ef56bd9c7a60efdeac9f1478b5467fb47c093 (diff) | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml | 1 | ||||
| -rw-r--r-- | drivers/regulator/uniphier-regulator.c | 4 |
2 files changed, 5 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 diff --git a/drivers/regulator/uniphier-regulator.c b/drivers/regulator/uniphier-regulator.c index e75b0973e325..39a68b01fc38 100644 --- a/drivers/regulator/uniphier-regulator.c +++ b/drivers/regulator/uniphier-regulator.c @@ -199,6 +199,10 @@ static const struct of_device_id uniphier_regulator_match[] = { .compatible = "socionext,uniphier-pxs3-usb3-regulator", .data = &uniphier_pxs2_usb3_data, }, + { + .compatible = "socionext,uniphier-nx1-usb3-regulator", + .data = &uniphier_pxs2_usb3_data, + }, { /* Sentinel */ }, }; MODULE_DEVICE_TABLE(of, uniphier_regulator_match); |