Unverified Commit 0627d75a authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "regulator: Introduce UniPhier NX1 SoC support" from Kunihiko... 

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
parents 6aed787c 4c1ef56b

Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml

+1 −0
Original line number Diff line number Diff line
@@ -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

drivers/regulator/uniphier-regulator.c

+4 −0
Original line number Diff line number Diff line
@@ -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);