Skip to content

Commit 0a8aa3d

Browse files
jannaumarcan
authored andcommitted
isp: Declare 13.6.2 firmware as 13.5 compatible on t600x/t602x
Tested on t6001-j314c. Signed-off-by: Janne Grunau <[email protected]>
1 parent 630c627 commit 0a8aa3d

2 files changed

Lines changed: 14 additions & 1 deletion

File tree

src/isp.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ int isp_init(void)
126126
heap_top = 0xe00000;
127127
break;
128128
case V13_5:
129+
case V13_6_2:
129130
heap_top = 0xf00000;
130131
break;
131132
default:
@@ -136,6 +137,7 @@ int isp_init(void)
136137
case ISP_VER_T6020:
137138
switch (os_firmware.version) {
138139
case V13_5:
140+
case V13_6_2:
139141
heap_top = 0xf00000;
140142
break;
141143
default:

src/kboot.c

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1930,7 +1930,18 @@ static int dt_set_isp_fwdata(void)
19301930
if (firmware_set_fdt(dt, fdt_node, "apple,firmware-version", &os_firmware) < 0)
19311931
bail("FDT: Could not set apple,firmware-version for %s\n", fdt_path);
19321932

1933-
if (firmware_set_fdt(dt, fdt_node, "apple,firmware-compat", &os_firmware) < 0)
1933+
const struct fw_version_info *compat;
1934+
1935+
switch (os_firmware.version) {
1936+
case V13_6_2:
1937+
compat = &fw_versions[V13_5];
1938+
break;
1939+
default:
1940+
compat = &os_firmware;
1941+
break;
1942+
}
1943+
1944+
if (firmware_set_fdt(dt, fdt_node, "apple,firmware-compat", compat) < 0)
19341945
bail("FDT: Could not set apple,firmware-compat for %s\n", fdt_path);
19351946

19361947
if (isp_get_heap(&phys, &iova, &size)) {

0 commit comments

Comments
 (0)