Skip to content

media: apple: isp: Use temporal-filter setting from DT #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcan merged 1 commit into from
Oct 7, 2023
Merged

media: apple: isp: Use temporal-filter setting from DT #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions drivers/media/platform/apple/isp/isp-cam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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;

Expand Down
9 changes: 5 additions & 4 deletions drivers/media/platform/apple/isp/isp-drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,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");
Expand Down Expand Up @@ -391,7 +396,6 @@ static const struct apple_isp_hw apple_isp_hw_t8103 = {

.scl1 = false,
.lpdp = false,
.temporal_filter = 0,
.meta_size = ISP_META_SIZE_T8103,
};

Expand Down Expand Up @@ -420,7 +424,6 @@ static const struct apple_isp_hw apple_isp_hw_t6000 = {

.scl1 = false,
.lpdp = false,
.temporal_filter = 0,
.meta_size = ISP_META_SIZE_T8103,
};

Expand All @@ -443,7 +446,6 @@ static const struct apple_isp_hw apple_isp_hw_t8112 = {

.scl1 = false,
.lpdp = false,
.temporal_filter = 1,
.meta_size = ISP_META_SIZE_T8112,
};

Expand All @@ -466,7 +468,6 @@ static const struct apple_isp_hw apple_isp_hw_t6020 = {

.scl1 = true,
.lpdp = true,
.temporal_filter = 0,
.meta_size = ISP_META_SIZE_T8112,
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/apple/isp/isp-drv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ struct apple_isp_hw {
u32 meta_size;
bool scl1;
bool lpdp;
u32 temporal_filter;
};

enum isp_sensor_id {
Expand Down Expand Up @@ -182,6 +181,7 @@ struct apple_isp {
struct device *dev;
const struct apple_isp_hw *hw;
u32 platform_id;
u32 temporal_filter;
struct isp_preset *presets;
int num_presets;

Expand Down