Skip to content

Commit 9cf693a

Browse files
eilnjannau
authored andcommitted
media: apple: isp: IMX558 initial support
Signed-off-by: Eileen Yoon <eyn@gmx.com>
1 parent 4041d48 commit 9cf693a

2 files changed

Lines changed: 57 additions & 2 deletions

File tree

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,13 @@ static const struct isp_setfile isp_setfiles[] = {
7878
[ISP_VD56G0_6221_01] = {0xd56, 0x62210102, "isp/6221_01XX.dat", 0x1b80},
7979
[ISP_VD56G0_6222_01] = {0xd56, 0x62220102, "isp/6222_01XX.dat", 0x1b80},
8080
};
81-
// clang-format on
8281

8382
// one day we will do this intelligently
8483
static const struct isp_preset isp_presets[] = {
85-
[ISP_IMX248_1820_01] = { 0, 1280, 720, 8, 8, 1280, 720, 1296, 736 },
84+
[ISP_IMX248_1820_01] = {0, 1280, 720, 8, 8, 1280, 720, 1296, 736}, // J293AP
85+
[ISP_IMX558_1921_01] = {1, 1920, 1080, 0, 0, 1920, 1080, 1920, 1080}, // J316sAP, J415AP
8686
};
87+
// clang-format on
8788

8889
static int isp_ch_get_sensor_id(struct apple_isp *isp, u32 ch)
8990
{

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

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,60 @@ static const struct apple_isp_hw apple_isp_hw_t8103 = {
292292
.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
293293
};
294294

295+
static const struct apple_isp_hw apple_isp_hw_t6000 = {
296+
.pmu_base = 0x28e584000,
297+
298+
.dsid_clr_base0 = 0x200014000,
299+
.dsid_clr_base1 = 0x200054000,
300+
.dsid_clr_base2 = 0x200094000,
301+
.dsid_clr_base3 = 0x2000d4000,
302+
.dsid_clr_range0 = 0x1000,
303+
.dsid_clr_range1 = 0x1000,
304+
.dsid_clr_range2 = 0x1000,
305+
.dsid_clr_range3 = 0x1000,
306+
307+
.clock_scratch = 0x28e3d0868,
308+
.clock_base = 0x0,
309+
.clock_bit = 0x0,
310+
.clock_size = 0x8,
311+
.bandwidth_scratch = 0x28e3d0980,
312+
.bandwidth_base = 0x0,
313+
.bandwidth_bit = 0x0,
314+
.bandwidth_size = 0x8,
315+
316+
.stream_command = DART_T8020_STREAM_COMMAND,
317+
.stream_select = DART_T8020_STREAM_SELECT,
318+
.ttbr = DART_T8020_TTBR,
319+
.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
320+
};
321+
322+
static const struct apple_isp_hw apple_isp_hw_t8110 = {
323+
.pmu_base = 0x23b704000,
324+
325+
.dsid_clr_base0 = 0x200014000, // TODO
326+
.dsid_clr_base1 = 0x200054000,
327+
.dsid_clr_base2 = 0x200094000,
328+
.dsid_clr_base3 = 0x2000d4000,
329+
.dsid_clr_range0 = 0x1000,
330+
.dsid_clr_range1 = 0x1000,
331+
.dsid_clr_range2 = 0x1000,
332+
.dsid_clr_range3 = 0x1000,
333+
334+
.clock_scratch = 0x23b3d0560,
335+
.clock_base = 0x0,
336+
.clock_bit = 0x0,
337+
.clock_size = 0x8,
338+
.bandwidth_scratch = 0x23b3d05d0,
339+
.bandwidth_base = 0x0,
340+
.bandwidth_bit = 0x0,
341+
.bandwidth_size = 0x8,
342+
343+
.stream_command = DART_T8020_STREAM_COMMAND, // TODO
344+
.stream_select = DART_T8020_STREAM_SELECT,
345+
.ttbr = DART_T8020_TTBR,
346+
.stream_command_invalidate = DART_T8020_STREAM_COMMAND_INVALIDATE,
347+
};
348+
295349
static const struct of_device_id apple_isp_of_match[] = {
296350
{ .compatible = "apple,t8103-isp", .data = &apple_isp_hw_t8103 },
297351
{},

0 commit comments

Comments
 (0)