Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b70ac771 authored by David Miller's avatar David Miller Committed by Linus Torvalds
Browse files

serial: allow 8250 to be used on sparc 



This requires three changes:

1) Remove !SPARC restriction in Kconfig.

2) Move Sparc specific serial drivers before 8250, so that serial
   console devices don't change names on us, even if 8250 finds
   devices.

3) Since the Sparc specific serial drivers try to use the
   same major/minor device namespace as 8250, some coordination
   is necessary.  Use the sunserial_*() layer routines to allocate
   minor number space within TTY_MAJOR when CONFIG_SPARC.

   This has no effect on other platforms.

Thanks to Josip Rodin for bringing up this issue and testing
plus debugging various revisions of this patch.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b5d674ab

arch/sparc/include/asm/serial.h

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#ifndef __SPARC_SERIAL_H

#define __SPARC_SERIAL_H



#define BASE_BAUD ( 1843200 / 16 )



#endif /* __SPARC_SERIAL_H */

drivers/serial/8250.c

+17 −4
Original line number Diff line number Diff line
@@ -44,6 +44,10 @@ 


#include "8250.h"



#ifdef CONFIG_SPARC

#include "suncore.h"

#endif



/*

 * Configuration:

 *   share_irqs - whether we pass IRQF_SHARED to request_irq().  This option
@@ -2676,7 +2680,6 @@ static struct uart_driver serial8250_reg = { 
	.dev_name		= "ttyS",

	.major			= TTY_MAJOR,

	.minor			= 64,

	.nr			= UART_NR,

	.cons			= SERIAL8250_CONSOLE,

};
@@ -2958,10 +2961,12 @@ static int __init serial8250_init(void) 
		"%d ports, IRQ sharing %sabled\n", nr_uarts,

		share_irqs ? "en" : "dis");



	for (i = 0; i < NR_IRQS; i++)

		spin_lock_init(&irq_lists[i].lock);



#ifdef CONFIG_SPARC

	ret = sunserial_register_minors(&serial8250_reg, UART_NR);

#else

	serial8250_reg.nr = UART_NR;

	ret = uart_register_driver(&serial8250_reg);

#endif

	if (ret)

		goto out;
@@ -2986,7 +2991,11 @@ static int __init serial8250_init(void) 
 put_dev:

	platform_device_put(serial8250_isa_devs);

 unreg_uart_drv:

#ifdef CONFIG_SPARC

	sunserial_unregister_minors(&serial8250_reg, UART_NR);

#else

	uart_unregister_driver(&serial8250_reg);

#endif

 out:

	return ret;

}
@@ -3005,7 +3014,11 @@ static void __exit serial8250_exit(void) 
	platform_driver_unregister(&serial8250_isa_driver);

	platform_device_unregister(isa_dev);



#ifdef CONFIG_SPARC

	sunserial_unregister_minors(&serial8250_reg, UART_NR);

#else

	uart_unregister_driver(&serial8250_reg);

#endif

}



module_init(serial8250_init);

drivers/serial/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ menu "Serial drivers" 
# The new 8250/16550 serial drivers

config SERIAL_8250

	tristate "8250/16550 and compatible serial support"

	depends on (BROKEN || !SPARC)

	select SERIAL_CORE

	---help---

	  This selects whether you want to include the driver for the standard

drivers/serial/Makefile

+10 −5
Original line number Diff line number Diff line
@@ -4,6 +4,16 @@ 


obj-$(CONFIG_SERIAL_CORE) += serial_core.o

obj-$(CONFIG_SERIAL_21285) += 21285.o



# These Sparc drivers have to appear before others such as 8250

# which share ttySx minor node space.  Otherwise console device

# names change and other unplesantries.

obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o

obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o

obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o

obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o

obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o



obj-$(CONFIG_SERIAL_8250) += 8250.o

obj-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o

obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
@@ -31,12 +41,7 @@ obj-$(CONFIG_SERIAL_S3C2400) += s3c2400.o 
obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o

obj-$(CONFIG_SERIAL_S3C2412) += s3c2412.o

obj-$(CONFIG_SERIAL_S3C2440) += s3c2440.o

obj-$(CONFIG_SERIAL_SUNCORE) += suncore.o

obj-$(CONFIG_SERIAL_SUNHV) += sunhv.o

obj-$(CONFIG_SERIAL_SUNZILOG) += sunzilog.o

obj-$(CONFIG_SERIAL_IP22_ZILOG) += ip22zilog.o

obj-$(CONFIG_SERIAL_SUNSU) += sunsu.o

obj-$(CONFIG_SERIAL_SUNSAB) += sunsab.o

obj-$(CONFIG_SERIAL_MUX) += mux.o

obj-$(CONFIG_SERIAL_68328) += 68328serial.o

obj-$(CONFIG_SERIAL_68360) += 68360serial.o