Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 45df70cb authored by Russell King's avatar Russell King Committed by Gregory CLEMENT
Browse files

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.

[gregory.clement@free-electrons.com: use commit log from Thomas]

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: default avatarGregory CLEMENT <gregory.clement@free-electrons.com>
parent 31ec18e0

arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts

+10 −2
Original line number Diff line number Diff line
@@ -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";