diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 17:07:32 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-01-05 17:07:32 +0100 |
commit | 7c179f9dff18423b18490dfc6b301301d223b16d (patch) | |
tree | 81e2f13028e236ab3515ca9d6d2f5f4260a82021 /Documentation/devicetree/bindings/power | |
parent | b55eb1ae91e986ff75b1cd6ff8889d056ad68a10 (diff) | |
parent | 84a82ef70e1eb2a7a90bc19eed27cb27a8e4c54c (diff) |
Merge tag 'imx-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into next/dt
Pull "i.MX device tree changes for 4.16" from Shawn Guo:
- A few random updates for vf610-zii board: correct switch EEPROM size,
enable edma1, correct GPIO expander interrupt, add PHYs for switch2
device.
- LS1021A device tree updates: add reboot and QSPI device nodes, label
USB controllers, specify interrupt-affinity for PMU, fix TMR_FIPER1
setting, enable esdhc device, add Moxa UC-8410A board support.
- A bunch of patches from Fabio: fix reg - unit address mismatches,
remove leading zero in unit address, move regulators out of
simple-bus, move nodes with no reg property out of bus, remove extra
clock cell, add missing phy-cells to usb-nop-xceiv, etc.
- A couple series from Hummingboard developers: re-organise device tree
files for better handling various board versions, and then add the
new hummingboard2 board support on top of that.
- Disable AC'97 input pins pad and add support for powering off for
imx6qdl-udoo board.
- Convert from fbdev to drm bindings for imx6sx-sdb and imx6sl-evk
board.
- Add device tree for Variscite DART-MX6 SoM and Carrier-board support.
- Add new board support of TS-4600 and TS-7970 from Technologic
Systems.
- A series from Stefan to update imx7-colibri device tree and then add
new version of Toradex Colibri iMX7D board with eMMC support.
- Other random updates on various board support.
* tag 'imx-dt-4.16' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux: (126 commits)
ARM: dts: imx7s: Avoid using label in unit address and reg
ARM: dts: imx51-zii-rdu1: Add missing #phy-cells to usb-nop-xceiv
ARM: dts: imx6qdl-hummingboard2: Remove leading zero in unit address
ARM: dts: ls1021a: add support for Moxa UC-8410A open platform
ARM: dts: imx51-babbage: Fix the 26MHz clock modelling
ARM: dts: vf610-zii-dev-rev-b: add PHYs for switch2
ARM: dts: vf610-zii-dev-rev-b: fix interrupt for GPIO expander
ARM: dts: vf610-zii-dev: enable edma1
ARM: dts: ls1021a-twr: Remove extra clock cell
ARM: dts: ls1021a-qds: Remove extra clock cell
ARM: dts: imx53: add srtc node
dt-bindings: imx-gpcv2: Fix the unit address
ARM: imx: dts: Use lower case for bindings notation
ARM: dts: imx6q-h100: use usdhc2 VSELECT
ARM: dts: imx6sx: Add support for PCI power domain
ARM: dts: imx6sx: Fix PCI non-prefetchable memory range
ARM: dts: imx6qdl-hummingboard2: rename regulators to match schematic
ARM: dts: imx6qdl-hummingboard2: add v1.5 som with eMMC
ARM: dts: imx6qdl-hummingboard2: add v1.5 som without eMMC
ARM: dts: imx6qdl-hummingboard2: add PWM3 support
...
Diffstat (limited to 'Documentation/devicetree/bindings/power')
-rw-r--r-- | Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt index 02f45c65fd87..9acce75b29ab 100644 --- a/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt +++ b/Documentation/devicetree/bindings/power/fsl,imx-gpcv2.txt @@ -44,10 +44,10 @@ Example: #address-cells = <1>; #size-cells = <0>; - pgc_pcie_phy: power-domain@3 { + pgc_pcie_phy: power-domain@1 { #power-domain-cells = <0>; - reg = <IMX7_POWER_DOMAIN_PCIE_PHY>; + reg = <1>; power-supply = <®_1p0d>; }; }; |