[PATCH 1/3] Documentation: devices.txt: Remove ttyIOC*

[PATCH 1/3] Documentation: devices.txt: Remove ttyIOC*

[Christophe Leroy]

IOC4 serial driver was removed, remove associated devices
from documentation.

Fixes: a017ef17cfd8 ("tty/serial: remove the ioc4_serial driver")
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 Documentation/admin-guide/devices.txt | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index b1b57f638b94..75a408f72402 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -2692,14 +2692,8 @@
 		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0
 		    ...
 		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3
-		 50 = /dev/ttyIOC0		Altix serial card
-		    ...
-		 81 = /dev/ttyIOC31		Altix serial card
 		 82 = /dev/ttyVR0		NEC VR4100 series SIU
 		 83 = /dev/ttyVR1		NEC VR4100 series DSIU
-		 84 = /dev/ttyIOC84		Altix ioc4 serial card
-		    ...
-		 115 = /dev/ttyIOC115		Altix ioc4 serial card
 		 116 = /dev/ttySIOC0		Altix ioc3 serial card
 		    ...
 		 147 = /dev/ttySIOC31		Altix ioc3 serial card
@@ -2762,9 +2756,6 @@
 		 46 = /dev/cucpm0		Callout device for ttyCPM0
 		    ...
 		 49 = /dev/cucpm5		Callout device for ttyCPM5
-		 50 = /dev/cuioc40		Callout device for ttyIOC40
-		    ...
-		 81 = /dev/cuioc431		Callout device for ttyIOC431
 		 82 = /dev/cuvr0		Callout device for ttyVR0
 		 83 = /dev/cuvr1		Callout device for ttyVR1
 
-- 
2.41.0

[PATCH 2/3] Documentation: devices.txt: Remove ttySIOC*

[Christophe Leroy]

IOC3 serial driver was removed, remove associated devices
from documentation.

Fixes: 9c860e4cf708 ("tty/serial: remove the ioc3_serial driver")
Cc: Christoph Hellwig <hch@lst.de>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 Documentation/admin-guide/devices.txt | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index 75a408f72402..1ba5b7c4973c 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -2694,9 +2694,6 @@
 		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3
 		 82 = /dev/ttyVR0		NEC VR4100 series SIU
 		 83 = /dev/ttyVR1		NEC VR4100 series DSIU
-		 116 = /dev/ttySIOC0		Altix ioc3 serial card
-		    ...
-		 147 = /dev/ttySIOC31		Altix ioc3 serial card
 		 148 = /dev/ttyPSC0		PPC PSC - port 0
 		    ...
 		 153 = /dev/ttyPSC5		PPC PSC - port 5
-- 
2.41.0

[PATCH 3/3] Documentation: devices.txt: Fix minors for ttyCPM*

[Christophe Leroy]

ttyCPM* devices belong to CPM_UART driver at the first place
and that driver provides 6 ports.

Fixes: e29c3f81eb89 ("Documentation: devices.txt: reconcile serial/ucc_uart minor numers")
Cc: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
---
 Documentation/admin-guide/devices.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
index 1ba5b7c4973c..839054923530 100644
--- a/Documentation/admin-guide/devices.txt
+++ b/Documentation/admin-guide/devices.txt
@@ -2691,7 +2691,7 @@
 		 45 = /dev/ttyMM1		Marvell MPSC - port 1 (obsolete unused)
 		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0
 		    ...
-		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3
+		 51 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5
 		 82 = /dev/ttyVR0		NEC VR4100 series SIU
 		 83 = /dev/ttyVR1		NEC VR4100 series DSIU
 		 148 = /dev/ttyPSC0		PPC PSC - port 0
@@ -2752,7 +2752,7 @@
 		 43 = /dev/ttycusmx2		Callout device for ttySMX2
 		 46 = /dev/cucpm0		Callout device for ttyCPM0
 		    ...
-		 49 = /dev/cucpm5		Callout device for ttyCPM5
+		 51 = /dev/cucpm5		Callout device for ttyCPM5
 		 82 = /dev/cuvr0		Callout device for ttyVR0
 		 83 = /dev/cuvr1		Callout device for ttyVR1
 
-- 
2.41.0

Re: [PATCH 3/3] Documentation: devices.txt: Fix minors for ttyCPM*

[Randy Dunlap]

Hi,

On 8/13/23 23:02, Christophe Leroy wrote:
> ttyCPM* devices belong to CPM_UART driver at the first place
> and that driver provides 6 ports.
> 
> Fixes: e29c3f81eb89 ("Documentation: devices.txt: reconcile serial/ucc_uart minor numers")
> Cc: Randy Dunlap <rdunlap@infradead.org>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>

Reviewed-by: Randy Dunlap <rdunlap@infradead.org>

I had this on my todo list. Thanks for getting to it before I did.

> ---
>   Documentation/admin-guide/devices.txt | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/admin-guide/devices.txt b/Documentation/admin-guide/devices.txt
> index 1ba5b7c4973c..839054923530 100644
> --- a/Documentation/admin-guide/devices.txt
> +++ b/Documentation/admin-guide/devices.txt
> @@ -2691,7 +2691,7 @@
>   		 45 = /dev/ttyMM1		Marvell MPSC - port 1 (obsolete unused)
>   		 46 = /dev/ttyCPM0		PPC CPM (SCC or SMC) - port 0
>   		    ...
> -		 49 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 3
> +		 51 = /dev/ttyCPM5		PPC CPM (SCC or SMC) - port 5
>   		 82 = /dev/ttyVR0		NEC VR4100 series SIU
>   		 83 = /dev/ttyVR1		NEC VR4100 series DSIU
>   		 148 = /dev/ttyPSC0		PPC PSC - port 0
> @@ -2752,7 +2752,7 @@
>   		 43 = /dev/ttycusmx2		Callout device for ttySMX2
>   		 46 = /dev/cucpm0		Callout device for ttyCPM0
>   		    ...
> -		 49 = /dev/cucpm5		Callout device for ttyCPM5
> +		 51 = /dev/cucpm5		Callout device for ttyCPM5
>   		 82 = /dev/cuvr0		Callout device for ttyVR0
>   		 83 = /dev/cuvr1		Callout device for ttyVR1
>   

Re: [PATCH 1/3] Documentation: devices.txt: Remove ttyIOC*

[Jonathan Corbet]

Christophe Leroy <christophe.leroy@csgroup.eu> writes:

> IOC4 serial driver was removed, remove associated devices
> from documentation.
>
> Fixes: a017ef17cfd8 ("tty/serial: remove the ioc4_serial driver")
> Cc: Christoph Hellwig <hch@lst.de>
> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> ---
>  Documentation/admin-guide/devices.txt | 9 ---------
>  1 file changed, 9 deletions(-)

This doesn't apply to docs-next, seemingly as the result of a change
that went through Greg's tree, so these should follow the same path,
methinks.

Thanks,

jon

Re: [PATCH 1/3] Documentation: devices.txt: Remove ttyIOC*

[Greg Kroah-Hartman]

On Fri, Aug 18, 2023 at 11:42:56AM -0600, Jonathan Corbet wrote:
> Christophe Leroy <christophe.leroy@csgroup.eu> writes:
> 
> > IOC4 serial driver was removed, remove associated devices
> > from documentation.
> >
> > Fixes: a017ef17cfd8 ("tty/serial: remove the ioc4_serial driver")
> > Cc: Christoph Hellwig <hch@lst.de>
> > Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
> > ---
> >  Documentation/admin-guide/devices.txt | 9 ---------
> >  1 file changed, 9 deletions(-)
> 
> This doesn't apply to docs-next, seemingly as the result of a change
> that went through Greg's tree, so these should follow the same path,
> methinks.

I'll be glad to take it, thanks.

greg k-h