diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2024-08-27 15:09:45 +0300 |
| commit | 4461e9e5c374f8c11fee8e4a0e3290b072cfd538 (patch) | |
| tree | 3bb5c91e53e98e6b80020e63d2d3ec14f94c0533 /arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | |
| parent | 3f53d7e442197b7e7d56b470b02dfd37a8bc5c46 (diff) | |
| parent | 5be63fc19fcaa4c236b307420483578a56986a37 (diff) | |
| download | linux-4461e9e5c374f8c11fee8e4a0e3290b072cfd538.tar.xz | |
Merge v6.11-rc5 into drm-next
amdgpu pr conconflicts due to patches cherry-picked to -fixes, I might
as well catch up with a backmerge and handle them all. Plus both misc
and intel maintainers asked for a backmerge anyway.
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi')
| -rw-r--r-- | arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi index 359f53f3e019..5bef31b8577b 100644 --- a/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi +++ b/arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi @@ -138,12 +138,6 @@ vin-supply = <®_1v8>; }; - /* - * By default we enable CTRL_SLEEP_MOCI#, this is required to have - * peripherals on the carrier board powered. - * If more granularity or power saving is required this can be disabled - * in the carrier board device tree files. - */ reg_force_sleep_moci: regulator-force-sleep-moci { compatible = "regulator-fixed"; enable-active-high; |