From 84782f01881d1c809e6d812b36130c0e549a4937 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Sun, 11 Jun 2023 17:30:52 -0400 Subject: [PATCH] arch: arm64: boot: dts: devkits*: Switch to no-AVB DTS * Not a damn clue why, but completely broken without this. Change-Id: I04123a7cdec2bd8efe69ee08f66e10533ab0e73d (cherry picked from commit 831cf5201a191c09fce160e7852f96ae76d8035c) --- arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts | 2 +- arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts index 5118294587d8..6f0cc3165797 100644 --- a/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts +++ b/arch/arm64/boot/dts/amlogic/g12a_s905y2_radxa0.dts @@ -18,7 +18,7 @@ /dts-v1/; #include "mesong12a_deadpool.dtsi" -#include "partition_mbox_dynamic_deadpool.dtsi" +#include "partition_mbox_dynamic_deadpool_noavb.dtsi" / { model = "Amlogic"; diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts index 86c81a589916..08809c6c16fb 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_bananapim5.dts @@ -18,7 +18,7 @@ /dts-v1/; #include "mesonsm1.dtsi" -#include "partition_mbox_dynamic_deadpool.dtsi" +#include "partition_mbox_dynamic_deadpool_noavb.dtsi" #include "mesonsm1_skt-panel.dtsi" / { diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts index d017c942a970..7ddcab85014a 100644 --- a/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts +++ b/arch/arm64/boot/dts/amlogic/sm1_s905y3_odroidc4.dts @@ -18,7 +18,7 @@ /dts-v1/; #include "mesonsm1.dtsi" -#include "partition_mbox_dynamic_deadpool.dtsi" +#include "partition_mbox_dynamic_deadpool_noavb.dtsi" #include "mesonsm1_skt-panel.dtsi" / { -- 2.20.1