diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 16:37:13 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2020-04-21 16:37:13 +0300 |
| commit | 3bda03865fcaf5e30248bf4b7b37a81f6966caf9 (patch) | |
| tree | 40e1edb696326bfbd028afc271e7272d87b6b506 /arch/arm/boot/dts/rk3036-kylin.dts | |
| parent | 7f4b5cde24094127ace370c3c6b82fef65d9f71f (diff) | |
| parent | 2a173ec993baa6a97e7b0fb89240200a88d90746 (diff) | |
| download | linux-3bda03865fcaf5e30248bf4b7b37a81f6966caf9.tar.xz | |
Merge tag 'kvm-s390-master-5.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvm-master
KVM: s390: Fix for 5.7 and maintainer update
- Silence false positive lockdep warning
- add Claudio as reviewer
Diffstat (limited to 'arch/arm/boot/dts/rk3036-kylin.dts')
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index fb3cf005cc90..2ff9f152d29b 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -319,7 +319,7 @@ bus-width = <4>; cap-sd-highspeed; cap-sdio-irq; - default-sample-phase = <90>; + rockchip,default-sample-phase = <90>; keep-power-in-suspend; mmc-pwrseq = <&sdio_pwrseq>; non-removable; |