fixup! media: apple: isp: Parse firmware version from device tree

marcan · marcan · commit 4f2ec7168732 · 2023-10-12T02:19:02.000+09:00
Signed-off-by: Hector Martin &lt;marcan@marcan.st&gt;
diff --git a/drivers/media/platform/apple/isp/isp-cmd.c b/drivers/media/platform/apple/isp/isp-cmd.c
@@ -262,7 +262,7 @@ int isp_cmd_ch_buffer_return(struct apple_isp *isp, u32 chan)
 int isp_cmd_ch_set_file_load(struct apple_isp *isp, u32 chan, u64 addr,
 			     u32 size)
 {
-	if (isp->hw->gen >= ISP_GEN_T8112 && isp->fw_compat != ISP_FIRMWARE_V_12_4 ) {
+	if (isp->fw_compat >= ISP_FIRMWARE_V_13_5) {
 		struct cmd_ch_set_file_load64 args = {
 			.opcode = CISP_OPCODE(CISP_CMD_CH_SET_FILE_LOAD),
 			.chan = chan,

Original file line number	Diff line number	Diff line change
`@@ -262,7 +262,7 @@ int isp_cmd_ch_buffer_return(struct apple_isp *isp, u32 chan)`
`262`	`262`	`int isp_cmd_ch_set_file_load(struct apple_isp *isp, u32 chan, u64 addr,`
`263`	`263`	`u32 size)`
`264`	`264`	`{`
`265`		`- if (isp->hw->gen >= ISP_GEN_T8112 && isp->fw_compat != ISP_FIRMWARE_V_12_4 ) {`
	`265`	`+ if (isp->fw_compat >= ISP_FIRMWARE_V_13_5) {`
`266`	`266`	`struct cmd_ch_set_file_load64 args = {`
`267`	`267`	`.opcode = CISP_OPCODE(CISP_CMD_CH_SET_FILE_LOAD),`
`268`	`268`	`.chan = chan,`