diff options
author | Olof Johansson <olof@lixom.net> | 2018-01-04 23:06:32 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2018-01-04 23:06:32 -0800 |
commit | 38b45e518655f8334b395ebe0be4ac238f598e3d (patch) | |
tree | 34d671cb38c6d2ea8b81eea2ed7022d6b63bc580 /arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | |
parent | 8db4e1faac7462e371364978dbe357c1c22e9e40 (diff) | |
parent | 1cadb0c341079785182a8d00d12ecb0bbef935fb (diff) | |
download | linux-38b45e518655f8334b395ebe0be4ac238f598e3d.tar.bz2 |
Merge tag 'omap-for-v4.16/dt-pt2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Second set of device tree changes for omaps for v4.16 merge window
This branch mostly configures more hardware support:
- Clean-up dts files to remove leading 0x and 0s from binding notation
to remove more dtc compiler warnings
- A series of am437x updates for backlight, to fix inverted pad
pull macro, and to configure power management related OPPs
- Configure n950 and droid 4 command mode LCD panels
- Updates to pandora and gta04 LCD panels
- Add support for am574x-idk
- A series of changes to configure more dra7 related PCIe features
- A series of fixes for am335x-boneblue for WLAN, UARTs and CAN
configuration
- A series of changes to configure dra7 OPPs and VDD supplies
* tag 'omap-for-v4.16/dt-pt2-v2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: (29 commits)
Revert "ARM: dts: dra7: Add properties to enable PCIe x2 lane mode"
ARM: dts: am572x-idk: Add cpu0 vdd supply
ARM: dts: am571x-idk: Add cpu0 vdd supply
ARM: dts: dra72-evm-tps65917: Add cpu0 vdd supply
ARM: dts: dra7-evm: Add cpu0 vdd supply
ARM: dts: am57xx-beagle-x15-common: Add cpu0 vdd supply
ARM: dts: dra7: Enable 1.5 GHz operation for the CPU
ARM: dts: dra7: Add MPU OPP supply node
ARM: dts: dra7: Add vbb-supply to cpu and additional voltages
ARM: dts: am335x-boneblue: enable can
ARM: dts: am335x-boneblue: enable usarts
ARM: dts: am335x-boneblue: fix wl1835 IRQ pin
ARM: dts: dra7: Remove deprecated PCI compatible string
ARM: dts: dra76-evm: Enable x2 PCIe lanes
ARM: dts: DRA72x: Use PCIe compatible specific to dra72
ARM: dts: DRA74x: Use PCIe compatible specific to dra74
ARM: dts: dra7: Add properties to enable PCIe x2 lane mode
ARM: dts: am57xx: Add support for am574x-idk
ARM: dts: am43x-epos-evm: Hook dcdc2 as the cpu0-supply
ARM: dts: am437x-idk-evm: Disable OPP50 for MPU
...
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi')
-rw-r--r-- | arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi index 74d1d0dab336..ab60035bc50c 100644 --- a/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi +++ b/arch/arm/boot/dts/am57xx-beagle-x15-common.dtsi @@ -388,7 +388,7 @@ }; &cpu0 { - cpu0-supply = <&smps12_reg>; + vdd-supply = <&smps12_reg>; voltage-tolerance = <1>; }; |