diff options
| author | Olof Johansson <olof@lixom.net> | 2021-06-23 18:45:21 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2021-06-23 18:45:23 -0700 |
| commit | 6b4670af9f49c76f9be7f3ef2d1654dfee04a4de (patch) | |
| tree | f7c71875b664963ec4c1d277e6dc5aba2b3c5459 /arch/arm/boot/dts/am5718.dtsi | |
| parent | 777cf27fb22669a50196c023676ec60de36c91b7 (diff) | |
| parent | 093a474ce10d8ea3db3ef2922aca5a38f34bab1b (diff) | |
Merge tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/soc
Non-urgent fixes for omaps for v5.14 merge window
Warn and block suspend for am335x unless the PM related modules and
firmware are loaded and warn otherwise. Otherwise we easily end up
with a suspended system with nothing capable of waking it up.
We also drop a duplicated prototype for am33xx_init_early().
* tag 'omap-for-v5.14/fixes-not-urgent-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Block suspend for am3 and am4 if PM is not configured
ARM: OMAP2+: remove duplicated prototype
ARM: dts: dra7: Fix duplicate USB4 target module node
ARM: OMAP1: ams-delta: remove unused function ams_delta_camera_power
bus: ti-sysc: Fix flakey idling of uarts and stop using swsup_sidle_act
bus: ti-sysc: Fix am335x resume hang for usb otg module
ARM: OMAP2+: Fix build warning when mmc_omap is not built
ARM: OMAP1: isp1301-omap: Add missing gpiod_add_lookup_table function
ARM: OMAP1: Fix use of possibly uninitialized irq variable
bus: ti-sysc: Fix missing quirk flags for sata
Link: https://lore.kernel.org/r/pull-1624002812-396117@atomide.com
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/am5718.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/am5718.dtsi | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/am5718.dtsi b/arch/arm/boot/dts/am5718.dtsi index ebf4d3cc1cfb..6d7530a48c73 100644 --- a/arch/arm/boot/dts/am5718.dtsi +++ b/arch/arm/boot/dts/am5718.dtsi @@ -17,17 +17,13 @@ * VCP1, VCP2 * MLB * ISS - * USB3, USB4 + * USB3 */ &usb3_tm { status = "disabled"; }; -&usb4_tm { - status = "disabled"; -}; - &atl_tm { status = "disabled"; }; |