projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'arc-5.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
[linux-2.6-microblaze.git]
/
arch
/
arm64
/
boot
/
dts
/
freescale
/
imx8mm-venice-gw71xx.dtsi
diff --git
a/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
b/arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
index
905b68a
..
8e4a0ce
100644
(file)
--- a/
arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
+++ b/
arch/arm64/boot/dts/freescale/imx8mm-venice-gw71xx.dtsi
@@
-46,7
+46,7
@@
pinctrl-0 = <&pinctrl_reg_usb1_en>;
compatible = "regulator-fixed";
regulator-name = "usb_otg1_vbus";
pinctrl-0 = <&pinctrl_reg_usb1_en>;
compatible = "regulator-fixed";
regulator-name = "usb_otg1_vbus";
- gpio = <&gpio1 1
2
GPIO_ACTIVE_HIGH>;
+ gpio = <&gpio1 1
0
GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
@@
-156,7
+156,8
@@
pinctrl_reg_usb1_en: regusb1grp {
fsl,pins = <
pinctrl_reg_usb1_en: regusb1grp {
fsl,pins = <
- MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x41
+ MX8MM_IOMUXC_GPIO1_IO10_GPIO1_IO10 0x41
+ MX8MM_IOMUXC_GPIO1_IO12_GPIO1_IO12 0x141
MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC 0x41
>;
};
MX8MM_IOMUXC_GPIO1_IO13_USB1_OTG_OC 0x41
>;
};