diff options
| author | Russell King <[email protected]> | 2017-07-12 14:56:55 +0200 |
|---|---|---|
| committer | Gregory CLEMENT <[email protected]> | 2017-08-02 16:07:38 +0200 |
| commit | 45df70cbd1493b2c57c3397d625050331d1e4daf (patch) | |
| tree | 69ac50ed9f5c490eb9a39b718b8b44e1df15fce8 | |
| parent | 31ec18e02a63a4e80784246ea8ae019cfb2750cb (diff) | |
arm64: dts: marvell: fix USB3 regulator definition on MacchiatoBin
Due to the lack of GPIO support, the USB3 regulator definition was
left unfinished in the MacchiatoBin DT description. Now that GPIO
support is available, this commit adjusts the Device Tree to properly
describe the USB3 regulator.
[[email protected]: use commit log from Thomas]
Signed-off-by: Russell King <[email protected]>
Signed-off-by: Thomas Petazzoni <[email protected]>
Signed-off-by: Gregory CLEMENT <[email protected]>
| -rw-r--r-- | arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts index fe91433d6fcd..da13ab2103aa 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts @@ -46,6 +46,8 @@ #include "armada-8040.dtsi" +#include <dt-bindings/gpio/gpio.h> + / { model = "Marvell 8040 MACHIATOBin"; compatible = "marvell,armada8040-mcbin", "marvell,armada8040", @@ -77,11 +79,13 @@ v_5v0_usb3_hst_vbus: regulator-usb3-vbus0 { compatible = "regulator-fixed"; + enable-active-high; + gpio = <&cpm_gpio2 15 GPIO_ACTIVE_HIGH>; + pinctrl-names = "default"; + pinctrl-0 = <&cpm_xhci_vbus_pins>; regulator-name = "v_5v0_usb3_hst_vbus"; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; - /* actually GPIO controlled, but 8k has no GPIO support yet */ - regulator-always-on; status = "okay"; }; @@ -136,6 +140,10 @@ marvell,pins = "mpp37", "mpp38"; marvell,function = "i2c0"; }; + cpm_xhci_vbus_pins: xhci0-vbus-pins { + marvell,pins = "mpp47"; + marvell,function = "gpio"; + }; cpm_sdhci_pins: sdhci-pins { marvell,pins = "mpp55", "mpp56", "mpp57", "mpp58", "mpp59", "mpp60", "mpp61"; |