fixup! media: apple: isp: t8112 fixes...

temporal-filter setting is platform dependent so move it to DT.

Signed-off-by: Janne Grunau <[email protected]>

Author: jannau

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

@@ -403,7 +403,7 @@ static int isp_ch_configure_capture(struct apple_isp *isp, u32 ch)
 	if (err)
 		return err;
 
-	err = isp_cmd_apple_ch_temporal_filter_start(isp, ch, isp->hw->temporal_filter);
+	err = isp_cmd_apple_ch_temporal_filter_start(isp, ch, isp->temporal_filter);
 	if (err)
 		return err;
 
@@ -443,7 +443,7 @@ static int isp_ch_configure_capture(struct apple_isp *isp, u32 ch)
 	if (err)
 		return err;
 
-	err = isp_cmd_apple_ch_temporal_filter_start(isp, ch, isp->hw->temporal_filter);
+	err = isp_cmd_apple_ch_temporal_filter_start(isp, ch, isp->temporal_filter);
 	if (err)
 		return err;
 

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

@@ -322,6 +322,11 @@ static int apple_isp_probe(struct platform_device *pdev)
 		return err;
 	}
 
+	err = of_property_read_u32(dev->of_node, "apple,temporal-filter",
+				   &isp->temporal_filter);
+	if (err)
+		isp->temporal_filter = 0;
+
 	err = apple_isp_init_presets(isp);
 	if (err) {
 		dev_err(dev, "failed to initialize presets\n");
@@ -462,7 +467,6 @@ static const struct apple_isp_hw apple_isp_hw_t8103 = {
 
 	.scl1 = false,
 	.lpdp = false,
-	.temporal_filter = 0,
 	.meta_size = ISP_META_SIZE_T8103,
 };
 
@@ -491,7 +495,6 @@ static const struct apple_isp_hw apple_isp_hw_t6000 = {
 
 	.scl1 = false,
 	.lpdp = false,
-	.temporal_filter = 0,
 	.meta_size = ISP_META_SIZE_T8103,
 };
 
@@ -514,7 +517,6 @@ static const struct apple_isp_hw apple_isp_hw_t8112 = {
 
 	.scl1 = false,
 	.lpdp = false,
-	.temporal_filter = 1,
 	.meta_size = ISP_META_SIZE_T8112,
 };
 
@@ -537,7 +539,6 @@ static const struct apple_isp_hw apple_isp_hw_t6020 = {
 
 	.scl1 = true,
 	.lpdp = true,
-	.temporal_filter = 0,
 	.meta_size = ISP_META_SIZE_T8112,
 };
 

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

@@ -121,7 +121,6 @@ struct apple_isp_hw {
 	u32 meta_size;
 	bool scl1;
 	bool lpdp;
-	u32 temporal_filter;
 };
 
 enum isp_sensor_id {
@@ -190,6 +189,7 @@ struct apple_isp {
 	const struct apple_isp_hw *hw;
 	enum isp_firmware_version fw_compat;
 	u32 platform_id;
+	u32 temporal_filter;
 	struct isp_preset *presets;
 	int num_presets;