* [Xenomai] [PATCH] drivers/can: Add PCAN-PCI Express OEM ID.
@ 2018-08-29 10:00 Sebastian Smolorz
2018-09-03 17:10 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Sebastian Smolorz @ 2018-08-29 10:00 UTC (permalink / raw)
To: xenomai
---
kernel/drivers/can/sja1000/rtcan_peak_pci.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/kernel/drivers/can/sja1000/rtcan_peak_pci.c b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
index 3da1657..0fdc598 100644
--- a/kernel/drivers/can/sja1000/rtcan_peak_pci.c
+++ b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
@@ -78,6 +78,7 @@ struct rtcan_peak_pci
#define PEAK_PC_104P_DEVICE_ID 0x0006 // PCAN-PC/104+ cards
#define PEAK_PCI_104E_DEVICE_ID 0x0007 // PCAN-PCI/104 Express cards
#define PEAK_MPCIE_DEVICE_ID 0x0008 // The miniPCIe slot cards
+#define PEAK_PCIE_OEM_ID 0x0009 // PCAN-PCI Express OEM
#define PCI_CONFIG_PORT_SIZE 0x1000 // size of the config io-memory
#define PCI_PORT_SIZE 0x0400 // size of a channel io-memory
@@ -90,6 +91,7 @@ static struct pci_device_id peak_pci_tbl[] = {
{PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
{PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
{PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
+ {PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
{ }
};
MODULE_DEVICE_TABLE (pci, peak_pci_tbl);
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Xenomai] [PATCH] drivers/can: Add PCAN-PCI Express OEM ID.
2018-08-29 10:00 [Xenomai] [PATCH] drivers/can: Add PCAN-PCI Express OEM ID Sebastian Smolorz
@ 2018-09-03 17:10 ` Jan Kiszka
2018-09-27 7:05 ` Jan Kiszka
0 siblings, 1 reply; 3+ messages in thread
From: Jan Kiszka @ 2018-09-03 17:10 UTC (permalink / raw)
To: Sebastian Smolorz, xenomai
On 2018-08-29 12:00, Sebastian Smolorz wrote:
> ---
> kernel/drivers/can/sja1000/rtcan_peak_pci.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/kernel/drivers/can/sja1000/rtcan_peak_pci.c b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
> index 3da1657..0fdc598 100644
> --- a/kernel/drivers/can/sja1000/rtcan_peak_pci.c
> +++ b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
> @@ -78,6 +78,7 @@ struct rtcan_peak_pci
> #define PEAK_PC_104P_DEVICE_ID 0x0006 // PCAN-PC/104+ cards
> #define PEAK_PCI_104E_DEVICE_ID 0x0007 // PCAN-PCI/104 Express cards
> #define PEAK_MPCIE_DEVICE_ID 0x0008 // The miniPCIe slot cards
> +#define PEAK_PCIE_OEM_ID 0x0009 // PCAN-PCI Express OEM
>
> #define PCI_CONFIG_PORT_SIZE 0x1000 // size of the config io-memory
> #define PCI_PORT_SIZE 0x0400 // size of a channel io-memory
> @@ -90,6 +91,7 @@ static struct pci_device_id peak_pci_tbl[] = {
> {PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> {PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> {PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
> + {PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
> { }
> };
> MODULE_DEVICE_TABLE (pci, peak_pci_tbl);
>
Thanks, applied to next.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Xenomai] [PATCH] drivers/can: Add PCAN-PCI Express OEM ID.
2018-09-03 17:10 ` Jan Kiszka
@ 2018-09-27 7:05 ` Jan Kiszka
0 siblings, 0 replies; 3+ messages in thread
From: Jan Kiszka @ 2018-09-27 7:05 UTC (permalink / raw)
To: Sebastian Smolorz, xenomai
On 03.09.18 19:10, Jan Kiszka wrote:
> On 2018-08-29 12:00, Sebastian Smolorz wrote:
>> ---
>> kernel/drivers/can/sja1000/rtcan_peak_pci.c | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/kernel/drivers/can/sja1000/rtcan_peak_pci.c
>> b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
>> index 3da1657..0fdc598 100644
>> --- a/kernel/drivers/can/sja1000/rtcan_peak_pci.c
>> +++ b/kernel/drivers/can/sja1000/rtcan_peak_pci.c
>> @@ -78,6 +78,7 @@ struct rtcan_peak_pci
>> #define PEAK_PC_104P_DEVICE_ID 0x0006 // PCAN-PC/104+ cards
>> #define PEAK_PCI_104E_DEVICE_ID 0x0007 // PCAN-PCI/104 Express cards
>> #define PEAK_MPCIE_DEVICE_ID 0x0008 // The miniPCIe slot cards
>> +#define PEAK_PCIE_OEM_ID 0x0009 // PCAN-PCI Express OEM
>> #define PCI_CONFIG_PORT_SIZE 0x1000 // size of the config io-memory
>> #define PCI_PORT_SIZE 0x0400 // size of a channel io-memory
>> @@ -90,6 +91,7 @@ static struct pci_device_id peak_pci_tbl[] = {
>> {PEAK_PCI_VENDOR_ID, PEAK_PC_104P_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>> {PEAK_PCI_VENDOR_ID, PEAK_PCI_104E_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>> {PEAK_PCI_VENDOR_ID, PEAK_CPCI_DEVICE_ID, PCI_ANY_ID, PCI_ANY_ID,},
>> + {PEAK_PCI_VENDOR_ID, PEAK_PCIE_OEM_ID, PCI_ANY_ID, PCI_ANY_ID,},
>> { }
>> };
>> MODULE_DEVICE_TABLE (pci, peak_pci_tbl);
>>
>
> Thanks, applied to next.
...and to stable. Trivial enough.
Jan
--
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-09-27 7:05 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-08-29 10:00 [Xenomai] [PATCH] drivers/can: Add PCAN-PCI Express OEM ID Sebastian Smolorz
2018-09-03 17:10 ` Jan Kiszka
2018-09-27 7:05 ` Jan Kiszka
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.