github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-05 21:15:53 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

i.MX fixes for 4.16, 2nd round:

Browse Source 
- 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.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJaoiVxAAoJEFBXWFqHsHzOnu4H/Rx0n2o4jwFXeoQmwdGJoOkj
 oo3LTjtAossU3ePuzgLhPooSaXXaCRDuTTIyiURFj8CmO2tkYuyjmwd0VI4QNPhC
 I+dHUfpYgNpvpFd0gZDkGnYnptXf5sQ+lMdNhneqyOxwF8xQTwnMhwYvfkb1CIu/
 3Q3vOTDes/K07+L9rTPihO0h8A3738WyR6PmTPP00sQTzYU+29pVKMYoS4u01c1A
 PFcyfbY3Sggbd/NRexGpWyMPD6QQa7WUx3lwoTdOinT0XqQ9tG2TqZzQ5yhDrh24
 sHzJVD0dWqJL717+IY7cEp4ma78JFGmO62C6nwWGfh4uJ/g4qmP7aAaDA5bfsDU=
 =pBTN
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Arnd Bergmann 2018-03-12 15:29:57 +01:00
commit 3147006258
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/boot/dts/imx7d-sdb.dts
View File

@ -82,7 +82,7 @@ reg_usb_otg1_vbus: regulator-usb-otg1-vbus {
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>;