media: qcom: camss: Sort camss version enums and compatible strings

Sort CAMSS version enums and compatible strings alphanumerically.

Signed-off-by: Suresh Vankadara <quic_svankada@quicinc.com>
Signed-off-by: Trishansh Bhardwaj <quic_tbhardwa@quicinc.com>
Signed-off-by: Vikram Sharma <quic_vikramsa@quicinc.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>

diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index df7e93a5a4f6e2cf74a652a752adc4d25c7b38b4..7d2490c9de015bf88e92abfdeb2c4d8e827d5032 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -505,10 +505,6 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
        u32 val;
 
        switch (csiphy->camss->res->version) {
-       case CAMSS_845:
-               r = &lane_regs_sdm845[0][0];
-               array_size = ARRAY_SIZE(lane_regs_sdm845[0]);
-               break;
        case CAMSS_8250:
                r = &lane_regs_sm8250[0][0];
                array_size = ARRAY_SIZE(lane_regs_sm8250[0]);
@@ -517,6 +513,10 @@ static void csiphy_gen2_config_lanes(struct csiphy_device *csiphy,
                r = &lane_regs_sc8280xp[0][0];
                array_size = ARRAY_SIZE(lane_regs_sc8280xp[0]);
                break;
+       case CAMSS_845:
+               r = &lane_regs_sdm845[0][0];
+               array_size = ARRAY_SIZE(lane_regs_sdm845[0]);
+               break;
        default:
                WARN(1, "unknown cspi version\n");
                return;
@@ -557,9 +557,9 @@ static bool csiphy_is_gen2(u32 version)
        bool ret = false;
 
        switch (version) {
-       case CAMSS_845:
        case CAMSS_8250:
        case CAMSS_8280XP:
+       case CAMSS_845:
                ret = true;
                break;
        }

diff --git a/drivers/media/platform/qcom/camss/camss-vfe.c b/drivers/media/platform/qcom/camss/camss-vfe.c
index 80a62ba11295042802cbaec617fb87c492ea6a55..fb3234c65403fa4dc5992b97e7c3fada2e949183 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -334,11 +334,11 @@ static u32 vfe_src_pad_code(struct vfe_line *line, u32 sink_code,
                        return sink_code;
                }
                break;
-       case CAMSS_8x96:
        case CAMSS_660:
-       case CAMSS_845:
+       case CAMSS_8x96:
        case CAMSS_8250:
        case CAMSS_8280XP:
+       case CAMSS_845:
                switch (sink_code) {
                case MEDIA_BUS_FMT_YUYV8_1X16:
                {
@@ -1693,9 +1693,9 @@ static int vfe_bpl_align(struct vfe_device *vfe)
        int ret = 8;
 
        switch (vfe->camss->res->version) {
-       case CAMSS_845:
        case CAMSS_8250:
        case CAMSS_8280XP:
+       case CAMSS_845:
                ret = 16;
                break;
        default:

diff --git a/drivers/media/platform/qcom/camss/camss.c b/drivers/media/platform/qcom/camss/camss.c
index 67fb11cbe8651a2f5cc69917afde8644d3333240..789e1b80f25e0eb3de05d7b674525cf512e1c93c 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.c
+++ b/drivers/media/platform/qcom/camss/camss.c
@@ -2689,10 +2689,10 @@ static const struct of_device_id camss_dt_match[] = {
        { .compatible = "qcom,msm8916-camss", .data = &msm8916_resources },
        { .compatible = "qcom,msm8953-camss", .data = &msm8953_resources },
        { .compatible = "qcom,msm8996-camss", .data = &msm8996_resources },
+       { .compatible = "qcom,sc8280xp-camss", .data = &sc8280xp_resources },
        { .compatible = "qcom,sdm660-camss", .data = &sdm660_resources },
        { .compatible = "qcom,sdm845-camss", .data = &sdm845_resources },
        { .compatible = "qcom,sm8250-camss", .data = &sm8250_resources },
-       { .compatible = "qcom,sc8280xp-camss", .data = &sc8280xp_resources },
        { }
 };
 

diff --git a/drivers/media/platform/qcom/camss/camss.h b/drivers/media/platform/qcom/camss/camss.h
index 9da7f48f5dd762d27521d449051892e956693970..ffce0a0edbc5de550bf22aec2deef30660624b2c 100644 (file)
--- a/drivers/media/platform/qcom/camss/camss.h
+++ b/drivers/media/platform/qcom/camss/camss.h
@@ -77,13 +77,13 @@ enum pm_domain {
 };
 
 enum camss_version {
+       CAMSS_660,
        CAMSS_8x16,
        CAMSS_8x53,
        CAMSS_8x96,
-       CAMSS_660,
-       CAMSS_845,
        CAMSS_8250,
        CAMSS_8280XP,
+       CAMSS_845,
 };
 
 enum icc_count {