Skip to content

media: ipu7: set CSI2 port count by hardware version #105

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

Open
khaiwenng wants to merge 1 commit into
base: main
Choose a base branch
from
Open

media: ipu7: set CSI2 port count by hardware version #105

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
7 changes: 4 additions & 3 deletions drivers/media/pci/intel/ipu7/ipu7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2110,9 +2110,10 @@ static const struct ipu_buttress_ctrl ipu8_psys_buttress_ctrl = {
};

void ipu_internal_pdata_init(struct ipu_isys_internal_pdata *isys_ipdata,
struct ipu_psys_internal_pdata *psys_ipdata)
struct ipu_psys_internal_pdata *psys_ipdata,
u8 hw_ver)
{
isys_ipdata->csi2.nports = ARRAY_SIZE(ipu7_csi_offsets);
isys_ipdata->csi2.nports = is_ipu7(hw_ver) ? 4 : 3;
isys_ipdata->csi2.offsets = ipu7_csi_offsets;
isys_ipdata->num_parallel_streams = IPU7_ISYS_NUM_STREAMS;
psys_ipdata->hw_variant.spc_offset = IPU7_PSYS_SPC_OFFSET;
Expand Down Expand Up @@ -2571,7 +2572,7 @@ static int ipu7_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
return -ENODEV;
}

ipu_internal_pdata_init(isys_ipdata, psys_ipdata);
ipu_internal_pdata_init(isys_ipdata, psys_ipdata, isp->hw_ver);

isys_base = isp->base + isys_ipdata->hw_variant.offset;
psys_base = isp->base + psys_ipdata->hw_variant.offset;
Expand Down
3 changes: 2 additions & 1 deletion drivers/media/pci/intel/ipu7/ipu7.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,7 @@ struct ipu7_psys_pdata {
int request_cpd_fw(const struct firmware **firmware_p, const char *name,
struct device *device);
void ipu_internal_pdata_init(struct ipu_isys_internal_pdata *isys_ipdata,
struct ipu_psys_internal_pdata *psys_ipdata);
struct ipu_psys_internal_pdata *psys_ipdata,
u8 hw_ver);
void ipu7_dump_fw_error_log(const struct ipu7_bus_device *adev);
#endif /* IPU7_H */
Loading