Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Documentation/devices.md
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@
### lk2nd-msm8994
- Huawei Nexus 6P - Angler
- LG G4 - h815
- LG Nexus 5X - Bullhead

### lk2nd-msm8996

Expand Down
16 changes: 16 additions & 0 deletions lk2nd/device/dts/msm8994/msm8992-lg-bullhead.dts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
// SPDX-License-Identifier: BSD-3-Clause

#include <skeleton64.dtsi>
#include <lk2nd.dtsi>

/ {
qcom,msm-id = <QCOM_ID_MSM8992 0>, <QCOM_ID_APQ8092 0>;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

APQ phone?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah it's msm8992 with internal modem.

The bootloader seems to favor LG G4 dts over it's own one tho.

That happens cause LG build the Nexus 5X and it reuses their G4's LK.

Doesn't lk2nd have like that match thingy we can set to match to bullheads cmdline ?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, this and lg-h815 both use 2916 dtb, just that one is written as hex... Then you need to combine them into a single file and introduce matching rules for both devices, yes. So bullhead and h815 will share a file.

But here I was asking which of two msm-id are correct: MSM8992 (LTE) or APQ8092 (WiFI only soc)?

Copy link
Author

@Dominduchami Dominduchami Mar 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, I see, this and lg-h815 both use 2916 dtb, just that one is written as hex... Then you need to combine them into a single file and introduce matching rules for both devices, yes. So bullhead and h815 will share a file.

Is there an example of that being done before?

But here I was asking which of two msm-id are correct: MSM8992 (LTE) or APQ8092 (WiFI only soc)?

Should be msm8992, although the stock dtb seems to specify both?

Copy link
Member

@TravMurav TravMurav Mar 4, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there an example of that being done before?

many many other dts files in other platforms are combined, can see samsung as the most blatant offender :)

Should be msm8992

if it works with just MSM, then let's drop the other one. downstream dtsi usually just defines all of them and OEMs never fix it.

qcom,board-id = <2916 0>;
qcom,pmic-id = <0x10009 0x1000a 0x0 0x0>;
};

&lk2nd {
model = "LG Nexus 5X";
compatible = "lg,bullhead";
lk2nd,dtb-files = "msm8992-lg-bullhead";
};
1 change: 1 addition & 0 deletions lk2nd/device/dts/msm8994/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ LOCAL_DIR := $(GET_LOCAL_DIR)
ADTBS += \
$(LOCAL_DIR)/msm8992-lg-h815.dtb \
$(LOCAL_DIR)/msm8994-huawei-angler.dtb \
$(LOCAL_DIR)/msm8992-lg-bullhead.dtb \