Skip to content

Commit 7c619cb

Browse files
committed
fix: recognize motorolla dtb's
1 parent 0b491a3 commit 7c619cb

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

lk2nd/device/dts/msm8953/msm8953-motorola-sanders.dts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "msm8953-motorola.dtsi"
44

55
/ {
6+
model = "sanders";
67
qcom,board-id = <0x4B 0x8100>,
78
<0x4B 0x8200>,
89
<0x4B 0x8300>,

platform/msm_shared/dev_tree.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1430,6 +1430,9 @@ int dev_tree_validate(struct dt_table *table, unsigned int page_size, uint32_t *
14301430
dt_entry_size = sizeof(struct dt_entry_v2);
14311431
} else if (table->version == DEV_TREE_VERSION_V3) {
14321432
dt_entry_size = DEV_TREE_DT_ENTRY_SIZE_V3;
1433+
if (table->extended) {
1434+
dt_entry_size += 0x20; /* 32 bytes for extended data */
1435+
}
14331436
} else {
14341437
dprintf(CRITICAL, "ERROR: Unsupported version (%d) in DT table \n",
14351438
table->version);
@@ -1943,6 +1946,10 @@ int dev_tree_get_entry_info(struct dt_table *table, struct dt_entry *dt_entry_in
19431946
cur_dt_entry->board_hw_subtype = (cur_dt_entry->variant_id >> 0x18);
19441947

19451948
table_ptr += DEV_TREE_DT_ENTRY_SIZE_V3;
1949+
if (table->extended) {
1950+
cur_dt_entry->idx = i;
1951+
table_ptr += 0x20; /* 32 bytes for extended data */
1952+
}
19461953
break;
19471954
default:
19481955
dprintf(CRITICAL, "ERROR: Unsupported version (%d) in DT table \n",

platform/msm_shared/include/dev_tree.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,15 @@ struct dt_entry
169169
uint32_t offset;
170170
uint32_t size;
171171
uint32_t idx;
172+
/* char model[0x20]; */
172173
};
173174

174175
struct dt_table
175176
{
176177
uint32_t magic;
177-
uint32_t version;
178+
uint8_t version;
179+
uint8_t extended;
180+
uint16_t reserved;
178181
uint32_t num_entries;
179182
};
180183

0 commit comments

Comments
 (0)