Skip to content

Commit 98e9523

Browse files
eilnjannau
authored andcommitted
media: apple: isp: Set platform_id in bootargs
Signed-off-by: Eileen Yoon <eyn@gmx.com>
1 parent dce376f commit 98e9523

3 files changed

Lines changed: 6 additions & 3 deletions

File tree

drivers/media/platform/apple/isp/isp-drv.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -243,6 +243,7 @@ static void apple_isp_remove(struct platform_device *pdev)
243243
}
244244

245245
static const struct apple_isp_hw apple_isp_hw_t8103 = {
246+
.platform_id = 0x1,
246247
.pmu_base = 0x23b704000,
247248

248249
.dsid_clr_base0 = 0x200014000,
@@ -265,6 +266,7 @@ static const struct apple_isp_hw apple_isp_hw_t8103 = {
265266
};
266267

267268
static const struct apple_isp_hw apple_isp_hw_t6000 = {
269+
.platform_id = 0x3,
268270
.pmu_base = 0x28e584000,
269271

270272
.dsid_clr_base0 = 0x200014000,
@@ -287,6 +289,7 @@ static const struct apple_isp_hw apple_isp_hw_t6000 = {
287289
};
288290

289291
static const struct apple_isp_hw apple_isp_hw_t8110 = {
292+
.platform_id = 0xe, // J413AP
290293
.pmu_base = 0x23b704000,
291294

292295
.dsid_clr_base0 = 0x200014000, // TODO

drivers/media/platform/apple/isp/isp-drv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ struct isp_channel {
6363
};
6464

6565
struct apple_isp_hw {
66+
u32 platform_id;
6667
u64 pmu_base;
6768

6869
u64 dsid_clr_base0;

drivers/media/platform/apple/isp/isp-fw.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ struct isp_firmware_bootargs {
4444
u64 shared_size;
4545
u64 extra_iova;
4646
u64 extra_size;
47-
u32 unk4;
47+
u32 platform_id;
4848
u32 pad_40[7];
4949
u32 ipc_size;
5050
u32 pad_60[5];
@@ -268,10 +268,9 @@ static int isp_firmware_boot_stage2(struct apple_isp *isp)
268268
args.shared_size = 0x10000000 - isp->fw.heap_top;
269269
args.extra_iova = isp->extra_surf->iova;
270270
args.extra_size = isp->extra_surf->size;
271-
args.unk4 = 0x3;
271+
args.platform_id = isp->hw->platform_id;
272272
//args.pad_40[1] = 0x3128000;
273273
//args.pad_40[3] = 0x48000;
274-
args.pad_40[5] = 0x90;
275274
args.unk5 = 0x40;
276275
//args.pad_7c[3] = 0x3b54000;
277276
args.unk7 = 0x1;

0 commit comments

Comments
 (0)