Message ID | 20250424-qcs8300_iris-v5-2-f118f505c300@quicinc.com |
---|---|
State | Superseded |
Headers | show |
Series | media: qcom: iris: add support for QCS8300 | expand |
On 4/24/2025 2:20 PM, Vikash Garodia wrote: > Fix the order of compatible strings to make it in alpha numeric order. > > Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org> > Signed-off-by: Vikash Garodia <quic_vgarodia@quicinc.com> > --- > drivers/media/platform/qcom/iris/iris_probe.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c > index 7cd8650fbe9c09598670530103e3d5edf32953e7..fa3b9c9b1493e4165f8c6d9c1cc0b76d3dfa9b7b 100644 > --- a/drivers/media/platform/qcom/iris/iris_probe.c > +++ b/drivers/media/platform/qcom/iris/iris_probe.c > @@ -335,16 +335,16 @@ static const struct dev_pm_ops iris_pm_ops = { > }; > > static const struct of_device_id iris_dt_match[] = { > +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) > + { > + .compatible = "qcom,sm8250-venus", > + .data = &sm8250_data, > + }, > +#endif > { > .compatible = "qcom,sm8550-iris", > .data = &sm8550_data, > }, > -#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) > - { > - .compatible = "qcom,sm8250-venus", > - .data = &sm8250_data, > - }, > -#endif > { > .compatible = "qcom,sm8650-iris", > .data = &sm8650_data, > Reviewed-by: Dikshita Agarwal <quic_dikshita@quicinc.com>
diff --git a/drivers/media/platform/qcom/iris/iris_probe.c b/drivers/media/platform/qcom/iris/iris_probe.c index 7cd8650fbe9c09598670530103e3d5edf32953e7..fa3b9c9b1493e4165f8c6d9c1cc0b76d3dfa9b7b 100644 --- a/drivers/media/platform/qcom/iris/iris_probe.c +++ b/drivers/media/platform/qcom/iris/iris_probe.c @@ -335,16 +335,16 @@ static const struct dev_pm_ops iris_pm_ops = { }; static const struct of_device_id iris_dt_match[] = { +#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) + { + .compatible = "qcom,sm8250-venus", + .data = &sm8250_data, + }, +#endif { .compatible = "qcom,sm8550-iris", .data = &sm8550_data, }, -#if (!IS_ENABLED(CONFIG_VIDEO_QCOM_VENUS)) - { - .compatible = "qcom,sm8250-venus", - .data = &sm8250_data, - }, -#endif { .compatible = "qcom,sm8650-iris", .data = &sm8650_data,