From a0063b17796d1aa781faccde2b501b3ecc91a968 Mon Sep 17 00:00:00 2001
From: Stephan Gerhold <stephan@gerhold.net>
Date: Thu, 19 Sep 2024 19:20:16 +0200
Subject: [PATCH] Revert "lk2nd: device: dts: Fix boot on motorola-harpia"

Looks like this is not needed after all with the "model" property added to
the appended DTB. This avoids having to build a custom image for
bq-piccolo.

This reverts commit 17dd46ee8b0c6867de87a22f6dc367863e04d9d4.
---
 Documentation/devices.md                      | 2 +-
 lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts | 7 -------
 lk2nd/device/dts/msm8916/rules.mk             | 3 +++
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/Documentation/devices.md b/Documentation/devices.md
index 9f5580683..cee87336c 100644
--- a/Documentation/devices.md
+++ b/Documentation/devices.md
@@ -9,7 +9,7 @@
 - Asus Zenfone 2 Laser (1080p) - Z00T
 - Asus Zenfone 2 Laser ZE500KL - Z00E
 - Asus Zenfone Max ZC550KL (2016) - Z010D
-- BQ Aquaris M5 - piccolo (quirky - see comment in `lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts`)
+- BQ Aquaris M5 - piccolo
 - BQ Aquaris X5 - paella, picmt
 - DragonBoard 410c - apq8016-sbc
 - GPLUS FL8005A
diff --git a/lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts b/lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts
index 15ed5f115..846b6f73c 100644
--- a/lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts
+++ b/lk2nd/device/dts/msm8916/msm8939-qrd-skuk.dts
@@ -9,13 +9,6 @@
 };
 
 &lk2nd {
-	/*
-	 * To build for bq-piccolo with the stock bootloader,
-	 * add LK2ND_ADTBS="msm8939-qrd-skuk.dtb" to your make cmdline.
-	 * bq-piccolo is the only device that needs appended DTB (ADTBS)
-	 * at the moment. Adding it by default breaks other devices like
-	 * motorola-harpia.
-	 */
 	bq-piccolo {
 		model = "BQ Aquaris M5 (Longcheer L9100)";
 		compatible = "longcheer,l9100";
diff --git a/lk2nd/device/dts/msm8916/rules.mk b/lk2nd/device/dts/msm8916/rules.mk
index 09f87c410..51b8207fa 100644
--- a/lk2nd/device/dts/msm8916/rules.mk
+++ b/lk2nd/device/dts/msm8916/rules.mk
@@ -1,6 +1,9 @@
 # SPDX-License-Identifier: BSD-3-Clause
 LOCAL_DIR := $(GET_LOCAL_DIR)
 
+ADTBS += \
+	$(LOCAL_DIR)/msm8939-qrd-skuk.dtb  \
+
 QCDTBS += \
 	$(LOCAL_DIR)/apq8016-samsung.dtb \
 	$(LOCAL_DIR)/apq8016-sbc.dtb \