Hi,
On 12/12/2018 23:03, Bjorn Helgaas wrote:
> On Wed, Dec 12, 2018 at 12:13:26PM +0100, Gustavo Pimentel wrote:
>> Create and add Synopsys device id (0xedda) to pci id list, since this id
>> is now being use on two different drivers (pci_endpoint_test.ko and
>> dw-edma-pcie.ko).
>
> Please run "git log --oneline include/linux/pci_ids.h" and make your
> subject line match, i.e.,
>
> PCI: Add Synopsys endpoint EDDA Device ID
>
> Also, if you want, you can reorder this to add the ID first and use it
> in drivers/misc/pci_endpoint_test.c, and then just use it from the
> first appearance of drivers/dma/dw-edma/dw-edma-pcie.c. Either way is
> fine.
>
> For the include/linux/pci_ids.h change,
Ok, I'll change it.
Thanks.
>
> Acked-by: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>
>> Signed-off-by: Gustavo Pimentel <gustavo.pimentel@xxxxxxxxxxxx>
>> Cc: Kishon Vijay Abraham I <kishon@xxxxxx>
>> Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx>
>> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@xxxxxxx>
>> Cc: Joao Pinto <jpinto@xxxxxxxxxxxx>
>> ---
>> drivers/dma/dw-edma/dw-edma-pcie.c | 2 +-
>> drivers/misc/pci_endpoint_test.c | 2 +-
>> include/linux/pci_ids.h | 1 +
>> 3 files changed, 3 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/dma/dw-edma/dw-edma-pcie.c b/drivers/dma/dw-edma/dw-edma-pcie.c
>> index f29a861..50e0db4 100644
>> --- a/drivers/dma/dw-edma/dw-edma-pcie.c
>> +++ b/drivers/dma/dw-edma/dw-edma-pcie.c
>> @@ -280,7 +280,7 @@ static const struct dev_pm_ops dw_edma_pcie_dev_pm_ops = {
>> };
>>
>> static const struct pci_device_id dw_edma_pcie_id_table[] = {
>> - { PCI_DEVICE_DATA(SYNOPSYS, 0xedda, &snps_edda_data) },
>> + { PCI_DEVICE_DATA(SYNOPSYS, EDDA, &snps_edda_data) },
>> { }
>> };
>> MODULE_DEVICE_TABLE(pci, dw_edma_pcie_id_table);
>> diff --git a/drivers/misc/pci_endpoint_test.c b/drivers/misc/pci_endpoint_test.c
>> index 896e2df..d27efe838 100644
>> --- a/drivers/misc/pci_endpoint_test.c
>> +++ b/drivers/misc/pci_endpoint_test.c
>> @@ -788,7 +788,7 @@ static void pci_endpoint_test_remove(struct pci_dev *pdev)
>> static const struct pci_device_id pci_endpoint_test_tbl[] = {
>> { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_DRA74x) },
>> { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_DRA72x) },
>> - { PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS, 0xedda) },
>> + { PCI_DEVICE_DATA(SYNOPSYS, EDDA, NULL) },
>> { }
>> };
>> MODULE_DEVICE_TABLE(pci, pci_endpoint_test_tbl);
>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index 69f0abe..57f17dd 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2358,6 +2358,7 @@
>> #define PCI_DEVICE_ID_CENATEK_IDE 0x0001
>>
>> #define PCI_VENDOR_ID_SYNOPSYS 0x16c3
>> +#define PCI_DEVICE_ID_SYNOPSYS_EDDA 0xedda
>>
>> #define PCI_VENDOR_ID_VITESSE 0x1725
>> #define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174
>> --
>> 2.7.4
>>
