diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 12:28:15 -0500 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-09 12:28:15 -0500 |
commit | d72cf8ffe460824fdc97f0a9295a2c4e0231a562 (patch) | |
tree | 1cf0d952f5066191eb9700aae882905e8546264c /arch/arm/boot/dts/imx6q-yapp4-crux.dts | |
parent | 556f3c9ad7c101aa16a43ef4539f3aabc1d7b32e (diff) | |
parent | b6662e37772715447aeff2538444ff291e02ea31 (diff) | |
download | linux-d72cf8ffe460824fdc97f0a9295a2c4e0231a562.tar.gz |
Merge tag 'kvm-s390-master-6.1-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD
A PCI allocation fix and a PV clock fix.
Diffstat (limited to 'arch/arm/boot/dts/imx6q-yapp4-crux.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-yapp4-crux.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6q-yapp4-crux.dts b/arch/arm/boot/dts/imx6q-yapp4-crux.dts index 15f4824a5142..bddf3822ebf7 100644 --- a/arch/arm/boot/dts/imx6q-yapp4-crux.dts +++ b/arch/arm/boot/dts/imx6q-yapp4-crux.dts @@ -33,6 +33,10 @@ status = "okay"; }; +®_pu { + regulator-always-on; +}; + ®_usb_h1_vbus { status = "okay"; }; |