* [PATCH v2 1/2 RESEND] parport: parport_serial: Add Brainboxes BAR details
[not found] <BBParportSerialV2>
@ 2023-11-02 21:07 ` Cameron Williams
2023-11-04 9:45 ` Sudip Mukherjee
[not found] ` <20231102210745.1107-1-cang1@live.co.uk>
1 sibling, 1 reply; 5+ messages in thread
From: Cameron Williams @ 2023-11-02 21:07 UTC (permalink / raw)
To: sudip.mukherjee, sudipm.mukherjee, linux-kernel; +Cc: Cameron Williams, stable
Add BAR/enum entries for Brainboxes serial/parallel cards.
Cc: stable@vger.kernel.org
Signed-off-by: Cameron Williams <cang1@live.co.uk>
---
Looks like this slipped through the grate the first time. Cc LKML and stable this time.
v1 - v2:
This is a re-submission for [1] which splits the changes into two patches.
[1] https://lore.kernel.org/all/DU0PR02MB7899033E7E81EAF3694BC20AC4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
drivers/parport/parport_serial.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 9f5d784cd95d..11989368611a 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -65,6 +65,10 @@ enum parport_pc_pci_cards {
sunix_5069a,
sunix_5079a,
sunix_5099a,
+ brainboxes_uc257,
+ brainboxes_is300,
+ brainboxes_uc414,
+ brainboxes_px263,
};
/* each element directly indexed from enum list, above */
@@ -158,6 +162,10 @@ static struct parport_pc_pci cards[] = {
/* sunix_5069a */ { 1, { { 1, 2 }, } },
/* sunix_5079a */ { 1, { { 1, 2 }, } },
/* sunix_5099a */ { 1, { { 1, 2 }, } },
+ /* brainboxes_uc257 */ { 1, { { 3, -1 }, } },
+ /* brainboxes_is300 */ { 1, { { 3, -1 }, } },
+ /* brainboxes_uc414 */ { 1, { { 3, -1 }, } },
+ /* brainboxes_px263 */ { 1, { { 3, -1 }, } },
};
static struct pci_device_id parport_serial_pci_tbl[] = {
--
2.42.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2 2/2 RESEND] parport: parport_serial: Add Brainboxes device IDs and geometry
[not found] ` <20231102210745.1107-1-cang1@live.co.uk>
@ 2023-11-02 21:07 ` Cameron Williams
2023-11-04 9:46 ` Sudip Mukherjee
0 siblings, 1 reply; 5+ messages in thread
From: Cameron Williams @ 2023-11-02 21:07 UTC (permalink / raw)
To: sudip.mukherjee, sudipm.mukherjee, linux-kernel; +Cc: Cameron Williams, stable
Add device IDs for the Brainboxes UC-203, UC-257, UC-414, UC-475,
IS-300/IS-500 and PX-263/PX-295 and define the relevant "geometry"
for the cards.
This patch requires part 1 of this series.
Cc: stable@vger.kernel.org
Signed-off-by: Cameron Williams <cang1@live.co.uk>
---
Looks like this slipped through the grate the first time. Cc LKML and stable this time.
v1 - v2:
This is a re-submission for [1] with the changes separated into different patches.
Part 1 of this series is required for this patch.
[1] https://lore.kernel.org/all/DU0PR02MB7899033E7E81EAF3694BC20AC4F8A@DU0PR02MB7899.eurprd02.prod.outlook.com/
drivers/parport/parport_serial.c | 56 ++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index 11989368611a..e89585051fde 100644
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -285,6 +285,38 @@ static struct pci_device_id parport_serial_pci_tbl[] = {
{ PCI_VENDOR_ID_SUNIX, PCI_DEVICE_ID_SUNIX_1999, PCI_VENDOR_ID_SUNIX,
0x0104, 0, 0, sunix_5099a },
+ /* Brainboxes UC-203 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0bc1,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0bc2,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+
+ /* Brainboxes UC-257 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0861,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0862,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0863,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+
+ /* Brainboxes UC-414 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0e61,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc414 },
+
+ /* Brainboxes UC-475 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0981,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+ { PCI_VENDOR_ID_INTASHIELD, 0x0982,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_uc257 },
+
+ /* Brainboxes IS-300/IS-500 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x0da0,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_is300 },
+
+ /* Brainboxes PX-263/PX-295 */
+ { PCI_VENDOR_ID_INTASHIELD, 0x402c,
+ PCI_ANY_ID, PCI_ANY_ID, 0, 0, brainboxes_px263 },
+
{ 0, } /* terminate list */
};
MODULE_DEVICE_TABLE(pci,parport_serial_pci_tbl);
@@ -550,6 +582,30 @@ static struct pciserial_board pci_parport_serial_boards[] = {
.base_baud = 921600,
.uart_offset = 0x8,
},
+ [brainboxes_uc257] = {
+ .flags = FL_BASE2,
+ .num_ports = 2,
+ .base_baud = 115200,
+ .uart_offset = 8,
+ },
+ [brainboxes_is300] = {
+ .flags = FL_BASE2,
+ .num_ports = 1,
+ .base_baud = 115200,
+ .uart_offset = 8,
+ },
+ [brainboxes_uc414] = {
+ .flags = FL_BASE2,
+ .num_ports = 4,
+ .base_baud = 115200,
+ .uart_offset = 8,
+ },
+ [brainboxes_px263] = {
+ .flags = FL_BASE2,
+ .num_ports = 4,
+ .base_baud = 921600,
+ .uart_offset = 8,
+ },
};
struct parport_serial_private {
--
2.42.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2 RESEND] parport: parport_serial: Add Brainboxes BAR details
2023-11-02 21:07 ` [PATCH v2 1/2 RESEND] parport: parport_serial: Add Brainboxes BAR details Cameron Williams
@ 2023-11-04 9:45 ` Sudip Mukherjee
2023-11-04 10:13 ` Greg Kroah-Hartman
0 siblings, 1 reply; 5+ messages in thread
From: Sudip Mukherjee @ 2023-11-04 9:45 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: sudip.mukherjee, linux-kernel, stable, Cameron Williams
On Thu, 2 Nov 2023 at 21:08, Cameron Williams <cang1@live.co.uk> wrote:
>
> Add BAR/enum entries for Brainboxes serial/parallel cards.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Cameron Williams <cang1@live.co.uk>
Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Greg, can you please take this series after the merge window is over.
--
Regards
Sudip
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 2/2 RESEND] parport: parport_serial: Add Brainboxes device IDs and geometry
2023-11-02 21:07 ` [PATCH v2 2/2 RESEND] parport: parport_serial: Add Brainboxes device IDs and geometry Cameron Williams
@ 2023-11-04 9:46 ` Sudip Mukherjee
0 siblings, 0 replies; 5+ messages in thread
From: Sudip Mukherjee @ 2023-11-04 9:46 UTC (permalink / raw)
To: Greg Kroah-Hartman
Cc: sudip.mukherjee, linux-kernel, stable, Cameron Williams
On Thu, 2 Nov 2023 at 21:08, Cameron Williams <cang1@live.co.uk> wrote:
>
> Add device IDs for the Brainboxes UC-203, UC-257, UC-414, UC-475,
> IS-300/IS-500 and PX-263/PX-295 and define the relevant "geometry"
> for the cards.
> This patch requires part 1 of this series.
>
> Cc: stable@vger.kernel.org
> Signed-off-by: Cameron Williams <cang1@live.co.uk>
Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
--
Regards
Sudip
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2 1/2 RESEND] parport: parport_serial: Add Brainboxes BAR details
2023-11-04 9:45 ` Sudip Mukherjee
@ 2023-11-04 10:13 ` Greg Kroah-Hartman
0 siblings, 0 replies; 5+ messages in thread
From: Greg Kroah-Hartman @ 2023-11-04 10:13 UTC (permalink / raw)
To: Sudip Mukherjee; +Cc: sudip.mukherjee, linux-kernel, stable, Cameron Williams
On Sat, Nov 04, 2023 at 09:45:31AM +0000, Sudip Mukherjee wrote:
> On Thu, 2 Nov 2023 at 21:08, Cameron Williams <cang1@live.co.uk> wrote:
> >
> > Add BAR/enum entries for Brainboxes serial/parallel cards.
> >
> > Cc: stable@vger.kernel.org
> > Signed-off-by: Cameron Williams <cang1@live.co.uk>
>
> Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
>
> Greg, can you please take this series after the merge window is over.
Will do, thanks!
greg k-h
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-11-04 10:14 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <BBParportSerialV2>
2023-11-02 21:07 ` [PATCH v2 1/2 RESEND] parport: parport_serial: Add Brainboxes BAR details Cameron Williams
2023-11-04 9:45 ` Sudip Mukherjee
2023-11-04 10:13 ` Greg Kroah-Hartman
[not found] ` <20231102210745.1107-1-cang1@live.co.uk>
2023-11-02 21:07 ` [PATCH v2 2/2 RESEND] parport: parport_serial: Add Brainboxes device IDs and geometry Cameron Williams
2023-11-04 9:46 ` Sudip Mukherjee
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox