On 26.12.2022 19:54, Petr Vorel wrote: > From: Petr Vorel <petr.vorel@xxxxxxxxx> > > It's disabled on downstream [1] thus not shown on downstream dmesg. > > Removing it fixes warnings on v6.1: > > [ 0.000000] OF: reserved mem: OVERLAP DETECTED! > [ 0.000000] dfps_data_mem@3400000 (0x0000000003400000--0x0000000003401000) overlaps with memory@3400000 (0x0000000003400000--0x0000000004600000) > > [1] https://android.googlesource.com/kernel/msm.git/+/android-7.0.0_r0.17/arch/arm64/boot/dts/lge/msm8992-bullhead.dtsi#137 > > Fixes: 976d321f32dc ("arm64: dts: qcom: msm8992: Make the DT an overlay on top of 8994") > > Signed-off-by: Petr Vorel <petr.vorel@xxxxxxxxx> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx> Konrad > arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > index 123ec67fb385..4bceb362a5c0 100644 > --- a/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > +++ b/arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi > @@ -15,6 +15,9 @@ > /* cont_splash_mem has different memory mapping */ > /delete-node/ &cont_splash_mem; > > +/* disabled on downstream, conflicts with cont_splash_mem */ > +/delete-node/ &dfps_data_mem; > + > / { > model = "LG Nexus 5X"; > compatible = "lg,bullhead", "qcom,msm8992";
