diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-08 02:06:52 +0300 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2021-01-08 02:06:52 +0300 |
| commit | bc351f07260533cc1b3987339551decd00ddd52e (patch) | |
| tree | 3b6f396681f08dacc8dd24ce2c586ea2195e825d /arch/arm/boot/dts/sun8i-s3-pinecube.dts | |
| parent | d45f89f7437d0f2c8275b4434096164db106384d (diff) | |
| parent | 9aa418792f5f11ef5d6f72265e1f8ae07efd5784 (diff) | |
| download | linux-bc351f07260533cc1b3987339551decd00ddd52e.tar.xz | |
Merge branch 'kvm-master' into kvm-next
Fixes to get_mmio_spte, destined to 5.10 stable branch.
Diffstat (limited to 'arch/arm/boot/dts/sun8i-s3-pinecube.dts')
| -rw-r--r-- | arch/arm/boot/dts/sun8i-s3-pinecube.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sun8i-s3-pinecube.dts b/arch/arm/boot/dts/sun8i-s3-pinecube.dts index 9bab6b7f4014..4aa0ee897a0a 100644 --- a/arch/arm/boot/dts/sun8i-s3-pinecube.dts +++ b/arch/arm/boot/dts/sun8i-s3-pinecube.dts @@ -10,7 +10,7 @@ / { model = "PineCube IP Camera"; - compatible = "pine64,pinecube", "allwinner,sun8i-s3"; + compatible = "pine64,pinecube", "sochip,s3", "allwinner,sun8i-v3"; aliases { serial0 = &uart2; |