summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-03-12 15:29:57 +0100
committerArnd Bergmann <arnd@arndb.de>2018-03-12 15:29:57 +0100
commit314700625873d0aec520a739861ea91d8ebbe986 (patch)
treea2e37c539b4a7d1d3b155e1bfeec727d95eed3ac /arch
parentARM: ux500: Fix PMU IRQ regression (diff)
parentARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name (diff)
downloadlinux-314700625873d0aec520a739861ea91d8ebbe986.tar.xz
linux-314700625873d0aec520a739861ea91d8ebbe986.zip
Merge tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes
Pull "i.MX fixes for 4.16, 2nd round" from Shawn Guo: - Fix a copy-paste error in imx7d-sdb device tree, which results in two usb-otg regulators are both named "regulator-usb-otg1-vbus" and override each other. * tag 'imx-fixes-4.16-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: ARM: dts: imx7d-sdb: Fix regulator-usb-otg2-vbus node name
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/imx7d-sdb.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts
index a7a5dc7b2700..e7d2db839d70 100644
--- a/arch/arm/boot/dts/imx7d-sdb.dts
+++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -82,7 +82,7 @@
enable-active-high;
};
- reg_usb_otg2_vbus: regulator-usb-otg1-vbus {
+ reg_usb_otg2_vbus: regulator-usb-otg2-vbus {
compatible = "regulator-fixed";
regulator-name = "usb_otg2_vbus";
regulator-min-microvolt = <5000000>;