From: Russell King Date: Wed, 12 Jul 2017 12:56:55 +0000 (+0200) Subject: arm64: dts: marvell: fix USB3 regulator definition on MacchiatoBin X-Git-Tag: v4.14-rc1~66^2^2^2~13 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=45df70cbd1493b2c57c3397d625050331d1e4daf;p=platform%2Fkernel%2Flinux-exynos.git 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: Russell King Signed-off-by: Thomas Petazzoni Signed-off-by: Gregory CLEMENT --- diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dts index fe91433..da13ab2 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 + / { 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";