| Message ID | 20220629141000.18111-11-johan+linaro@kernel.org |
|---|---|
| State | New |
| Headers | show |
| Series | PCI: qcom: Add support for SC8280XP and SA8540P | expand |
On 29/06/2022 16:10, Johan Hovold wrote: > Sort the device-id table entries alphabetically by compatible string to > make it easier to find entries and add new ones. > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > --- > drivers/pci/controller/dwc/pcie-qcom.c | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > index 567601679465..093f4d4bc15d 100644 > --- a/drivers/pci/controller/dwc/pcie-qcom.c > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > @@ -1572,23 +1572,23 @@ static int qcom_pcie_remove(struct platform_device *pdev) > } > > static const struct of_device_id qcom_pcie_match[] = { > + { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, > { .compatible = "qcom,pcie-apq8084", .data = &cfg_1_0_0 }, > { .compatible = "qcom,pcie-ipq8064", .data = &cfg_2_1_0 }, > { .compatible = "qcom,pcie-ipq8064-v2", .data = &cfg_2_1_0 }, > - { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, > - { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, > { .compatible = "qcom,pcie-ipq8074", .data = &cfg_2_3_3 }, > { .compatible = "qcom,pcie-ipq4019", .data = &cfg_2_4_0 }, > - { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, > + { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, > { .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 }, > + { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, > + { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, > + { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sdm845", .data = &cfg_2_7_0 }, > { .compatible = "qcom,pcie-sm8150", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sm8250", .data = &cfg_1_9_0 }, > - { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, > - { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sm8450-pcie0", .data = &cfg_1_9_0 }, > { .compatible = "qcom,pcie-sm8450-pcie1", .data = &cfg_1_9_0 }, > - { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, > + { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, Idea is good but it is not sorted alphabetically (not entirely). Q goes before S. Best regards, Krzysztof
On Fri, Jul 01, 2022 at 10:40:52AM +0200, Krzysztof Kozlowski wrote: > On 29/06/2022 16:10, Johan Hovold wrote: > > Sort the device-id table entries alphabetically by compatible string to > > make it easier to find entries and add new ones. > > > > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > > --- > > drivers/pci/controller/dwc/pcie-qcom.c | 12 ++++++------ > > 1 file changed, 6 insertions(+), 6 deletions(-) > > > > diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c > > index 567601679465..093f4d4bc15d 100644 > > --- a/drivers/pci/controller/dwc/pcie-qcom.c > > +++ b/drivers/pci/controller/dwc/pcie-qcom.c > > @@ -1572,23 +1572,23 @@ static int qcom_pcie_remove(struct platform_device *pdev) > > } > > > > static const struct of_device_id qcom_pcie_match[] = { > > + { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, > > { .compatible = "qcom,pcie-apq8084", .data = &cfg_1_0_0 }, > > { .compatible = "qcom,pcie-ipq8064", .data = &cfg_2_1_0 }, > > { .compatible = "qcom,pcie-ipq8064-v2", .data = &cfg_2_1_0 }, > > - { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, > > - { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, > > { .compatible = "qcom,pcie-ipq8074", .data = &cfg_2_3_3 }, > > { .compatible = "qcom,pcie-ipq4019", .data = &cfg_2_4_0 }, > > - { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, > > + { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, > > { .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 }, > > + { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, > > + { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, > > + { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, > > { .compatible = "qcom,pcie-sdm845", .data = &cfg_2_7_0 }, > > { .compatible = "qcom,pcie-sm8150", .data = &cfg_1_9_0 }, > > { .compatible = "qcom,pcie-sm8250", .data = &cfg_1_9_0 }, > > - { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, > > - { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, > > { .compatible = "qcom,pcie-sm8450-pcie0", .data = &cfg_1_9_0 }, > > { .compatible = "qcom,pcie-sm8450-pcie1", .data = &cfg_1_9_0 }, > > - { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, > > + { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, > > Idea is good but it is not sorted alphabetically (not entirely). Q goes > before S. Heh. I blame the heat. Johan
diff --git a/drivers/pci/controller/dwc/pcie-qcom.c b/drivers/pci/controller/dwc/pcie-qcom.c index 567601679465..093f4d4bc15d 100644 --- a/drivers/pci/controller/dwc/pcie-qcom.c +++ b/drivers/pci/controller/dwc/pcie-qcom.c @@ -1572,23 +1572,23 @@ static int qcom_pcie_remove(struct platform_device *pdev) } static const struct of_device_id qcom_pcie_match[] = { + { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, { .compatible = "qcom,pcie-apq8084", .data = &cfg_1_0_0 }, { .compatible = "qcom,pcie-ipq8064", .data = &cfg_2_1_0 }, { .compatible = "qcom,pcie-ipq8064-v2", .data = &cfg_2_1_0 }, - { .compatible = "qcom,pcie-apq8064", .data = &cfg_2_1_0 }, - { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, { .compatible = "qcom,pcie-ipq8074", .data = &cfg_2_3_3 }, { .compatible = "qcom,pcie-ipq4019", .data = &cfg_2_4_0 }, - { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, + { .compatible = "qcom,pcie-msm8996", .data = &cfg_2_3_2 }, { .compatible = "qcom,pcie-sa8540p", .data = &cfg_1_9_0 }, + { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, + { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, + { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sdm845", .data = &cfg_2_7_0 }, { .compatible = "qcom,pcie-sm8150", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sm8250", .data = &cfg_1_9_0 }, - { .compatible = "qcom,pcie-sc8180x", .data = &cfg_1_9_0 }, - { .compatible = "qcom,pcie-sc8280xp", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sm8450-pcie0", .data = &cfg_1_9_0 }, { .compatible = "qcom,pcie-sm8450-pcie1", .data = &cfg_1_9_0 }, - { .compatible = "qcom,pcie-sc7280", .data = &cfg_1_9_0 }, + { .compatible = "qcom,pcie-qcs404", .data = &cfg_2_4_0 }, { } }; MODULE_DEVICE_TABLE(of, qcom_pcie_match);
Sort the device-id table entries alphabetically by compatible string to make it easier to find entries and add new ones. Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/pci/controller/dwc/pcie-qcom.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)