Repository navigation
media: apple: isp: restore J613 camera capture on 14.7 firmware #199
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -421,10 +421,18 @@ | |
| if (err) | ||
| isp->temporal_filter = 0; | ||
|
|
||
| /* J613 firmware 14.7 stalls capture with temporal filter 1. */ | ||
| if (of_machine_is_compatible("apple,j613") && | ||
| isp->fw_compat == ISP_FIRMWARE_V_14_7 && | ||
| isp->temporal_filter == 1) { | ||
| dev_info(dev, "using temporal filter 0 on J613 firmware 14.7\n"); | ||
| isp->temporal_filter = 0; | ||
| } | ||
|
|
||
| err = apple_isp_init_presets(isp); | ||
| if (err) { | ||
| dev_err(dev, "failed to initialize presets\n"); | ||
| goto free_isp; | ||
| } | ||
|
|
||
| err = apple_isp_attach_genpd(isp); | ||
|
|
@@ -670,11 +678,11 @@ | |
| .scl1 = true, | ||
| .lpdp = true, | ||
| .meta_size = ISP_META_SIZE_T8112, | ||
| }; | ||
|
|
||
| static const struct apple_isp_hw apple_isp_hw_t8122 = { | ||
| .gen = ISP_GEN_T8112, | ||
| .pmu_base = 0x2d07040000, | ||
| .pmu_base = 0x2d0704000, | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Right: PMGR |
||
|
|
||
| .dsid_count = 1, | ||
| .dsid_clr_base0 = 0x2221c4000, | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: this gates on ISP firmware-compat, not the OS firmware version, so "firmware-compat 14.7" here and in the comment at
:424would be more precise.