media: qcom: camss: remove duplicated csiphy_formats_sc7280 data

It's sufficient to have just one previously set csiphy_formats_sdm845 data.

Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Bryan O'Donoghue <bod@kernel.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.c b/drivers/media/platform/qcom/camss/camss-csiphy.c
index c622efcc92ff3781d7fc3ace0253c2d64c91e847..2de97f58f9ae4f91e8bba39dcadf92bea8cf6f73 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.c
@@ -103,11 +103,6 @@ const struct csiphy_formats csiphy_formats_8x96 = {
        .formats = formats_8x96
 };
 
-const struct csiphy_formats csiphy_formats_sc7280 = {
-       .nformats = ARRAY_SIZE(formats_sdm845),
-       .formats = formats_sdm845
-};
-
 const struct csiphy_formats csiphy_formats_sdm845 = {
        .nformats = ARRAY_SIZE(formats_sdm845),
        .formats = formats_sdm845

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy.h b/drivers/media/platform/qcom/camss/camss-csiphy.h
index ab91273303b9e3c67c4bcefe1e3a67e1a47bf14f..895f80003c441dcacf98435f91567f90afa29279 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy.h
+++ b/drivers/media/platform/qcom/camss/camss-csiphy.h
@@ -126,7 +126,6 @@ void msm_csiphy_unregister_entity(struct csiphy_device *csiphy);
 
 extern const struct csiphy_formats csiphy_formats_8x16;
 extern const struct csiphy_formats csiphy_formats_8x96;
-extern const struct csiphy_formats csiphy_formats_sc7280;
 extern const struct csiphy_formats csiphy_formats_sdm845;
 
 extern const struct csiphy_hw_ops csiphy_ops_2ph_1_0;

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index f76773dbd296b4fcb41e2842e0d2130a0ba7d756..8c844ebf9cb677774caa5d22608be4cffb48ebd6 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -1481,7 +1481,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = {
                .csiphy = {
                        .id = 0,
                        .hw_ops = &csiphy_ops_3ph_1_0,
-                       .formats = &csiphy_formats_sc7280
+                       .formats = &csiphy_formats_sdm845,
                }
        },
        /* CSIPHY1 */
@@ -1496,7 +1496,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = {
                .csiphy = {
                        .id = 1,
                        .hw_ops = &csiphy_ops_3ph_1_0,
-                       .formats = &csiphy_formats_sc7280
+                       .formats = &csiphy_formats_sdm845,
                }
        },
        /* CSIPHY2 */
@@ -1511,7 +1511,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = {
                .csiphy = {
                        .id = 2,
                        .hw_ops = &csiphy_ops_3ph_1_0,
-                       .formats = &csiphy_formats_sc7280
+                       .formats = &csiphy_formats_sdm845,
                }
        },
        /* CSIPHY3 */
@@ -1526,7 +1526,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = {
                .csiphy = {
                        .id = 3,
                        .hw_ops = &csiphy_ops_3ph_1_0,
-                       .formats = &csiphy_formats_sc7280
+                       .formats = &csiphy_formats_sdm845,
                }
        },
        /* CSIPHY4 */
@@ -1541,7 +1541,7 @@ static const struct camss_subdev_resources csiphy_res_7280[] = {
                .csiphy = {
                        .id = 4,
                        .hw_ops = &csiphy_ops_3ph_1_0,
-                       .formats = &csiphy_formats_sc7280
+                       .formats = &csiphy_formats_sdm845,
                }
        },
 };