On Thu Jul 23 13:09:52 2026 +0200, Hans de Goede wrote:
> The qcs8300 phys are identical to the sa8775p's phys drop the duplicate
> info and use csiphy_res_8775p[] for the qcs8300_resources.
>
> The only difference is that the qcs8300 has 3 phys vs 4 phys for
> the sa8775p, so explicitly set csiphy_num to 3 rather then using
> ARRAY_SIZE().
>
> Reviewed-by: Bryan O'Donoghue <[email protected]>
> Reviewed-by: Loic Poulain <[email protected]>
> Signed-off-by: Hans de Goede <[email protected]>
> Reviewed-by: Vladimir Zapolskiy <[email protected]>
> Signed-off-by: Bryan O'Donoghue <[email protected]>
Patch committed.
Thanks,
Bryan O'Donoghue
drivers/media/platform/qcom/camss/camss.c | 70 +------------------------------
1 file changed, 2 insertions(+), 68 deletions(-)
---
diff --git a/drivers/media/platform/qcom/camss/camss.c
b/drivers/media/platform/qcom/camss/camss.c
index ef0ade46a9c2..c54185c93a8a 100644
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -3647,72 +3647,6 @@ static const struct resources_icc icc_res_sm8650[] = {
},
};
-static const struct camss_subdev_resources csiphy_res_8300[] = {
- /* CSIPHY0 */
- {
- .regulators = {
- { .supply = "vdda-phy", .init_load_uA = 15900 },
- { .supply = "vdda-pll", .init_load_uA = 8900 }
- },
-
- .clock = { "csiphy_rx", "csiphy0", "csiphy0_timer" },
- .clock_rate = {
- { 400000000 },
- { 0 },
- { 400000000 },
- },
- .reg = { "csiphy0" },
- .interrupt = { "csiphy0" },
- .csiphy = {
- .id = 0,
- .hw_ops = &csiphy_ops_3ph_1_0,
- .formats = &csiphy_formats_sdm845,
- }
- },
- /* CSIPHY1 */
- {
- .regulators = {
- { .supply = "vdda-phy", .init_load_uA = 15900 },
- { .supply = "vdda-pll", .init_load_uA = 8900 }
- },
-
- .clock = { "csiphy_rx", "csiphy1", "csiphy1_timer" },
- .clock_rate = {
- { 400000000 },
- { 0 },
- { 400000000 },
- },
- .reg = { "csiphy1" },
- .interrupt = { "csiphy1" },
- .csiphy = {
- .id = 1,
- .hw_ops = &csiphy_ops_3ph_1_0,
- .formats = &csiphy_formats_sdm845,
- }
- },
- /* CSIPHY2 */
- {
- .regulators = {
- { .supply = "vdda-phy", .init_load_uA = 15900 },
- { .supply = "vdda-pll", .init_load_uA = 8900 }
- },
-
- .clock = { "csiphy_rx", "csiphy2", "csiphy2_timer" },
- .clock_rate = {
- { 400000000 },
- { 0 },
- { 400000000 },
- },
- .reg = { "csiphy2" },
- .interrupt = { "csiphy2" },
- .csiphy = {
- .id = 2,
- .hw_ops = &csiphy_ops_3ph_1_0,
- .formats = &csiphy_formats_sdm845,
- }
- },
-};
-
static const struct camss_subdev_resources csiphy_res_8775p[] = {
/* CSIPHY0 */
{
@@ -5704,13 +5638,13 @@ static const struct camss_resources qcm2290_resources =
{
static const struct camss_resources qcs8300_resources = {
.version = CAMSS_8300,
.pd_name = "top",
- .csiphy_res = csiphy_res_8300,
+ .csiphy_res = csiphy_res_8775p,
.tpg_res = tpg_res_8775p,
.csid_res = csid_res_8775p,
.csid_wrapper_res = &csid_wrapper_res_sm8550,
.vfe_res = vfe_res_8775p,
.icc_res = icc_res_sa8775p,
- .csiphy_num = ARRAY_SIZE(csiphy_res_8300),
+ .csiphy_num = 3, /* qcs8300 only has 3 phys vs 4 phys for the sa8775p */
.tpg_num = ARRAY_SIZE(tpg_res_8775p),
.csid_num = ARRAY_SIZE(csid_res_8775p),
.vfe_num = ARRAY_SIZE(vfe_res_8775p),
_______________________________________________
linuxtv-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
