Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 13 Jan 2015 15:04:29 +0000 (UTC)
From:      Ruslan Bukin <br@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r277132 - in head/sys: arm/samsung/exynos dev/uart
Message-ID:  <201501131504.t0DF4TCG049283@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: br
Date: Tue Jan 13 15:04:28 2015
New Revision: 277132
URL: https://svnweb.freebsd.org/changeset/base/277132

Log:
  Rename Exynos UART driver. No functional change.
  
  Submitted by:	Michal Meloun <meloun@miracle.cz>

Modified:
  head/sys/arm/samsung/exynos/exynos_uart.c
  head/sys/dev/uart/uart.h
  head/sys/dev/uart/uart_bus_fdt.c

Modified: head/sys/arm/samsung/exynos/exynos_uart.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos_uart.c	Tue Jan 13 14:26:05 2015	(r277131)
+++ head/sys/arm/samsung/exynos/exynos_uart.c	Tue Jan 13 15:04:28 2015	(r277132)
@@ -50,17 +50,17 @@ __FBSDID("$FreeBSD$");
 #define	DEF_CLK		100000000
 
 static int sscomspeed(long, long);
-static int s3c24x0_uart_param(struct uart_bas *, int, int, int, int);
+static int exynos4210_uart_param(struct uart_bas *, int, int, int, int);
 
 /*
  * Low-level UART interface.
  */
-static int s3c2410_probe(struct uart_bas *bas);
-static void s3c2410_init(struct uart_bas *bas, int, int, int, int);
-static void s3c2410_term(struct uart_bas *bas);
-static void s3c2410_putc(struct uart_bas *bas, int);
-static int s3c2410_rxready(struct uart_bas *bas);
-static int s3c2410_getc(struct uart_bas *bas, struct mtx *mtx);
+static int exynos4210_probe(struct uart_bas *bas);
+static void exynos4210_init(struct uart_bas *bas, int, int, int, int);
+static void exynos4210_term(struct uart_bas *bas);
+static void exynos4210_putc(struct uart_bas *bas, int);
+static int exynos4210_rxready(struct uart_bas *bas);
+static int exynos4210_getc(struct uart_bas *bas, struct mtx *mtx);
 
 extern SLIST_HEAD(uart_devinfo_list, uart_devinfo) uart_sysdevs;
 
@@ -76,7 +76,7 @@ sscomspeed(long speed, long frequency)
 }
 
 static int
-s3c24x0_uart_param(struct uart_bas *bas, int baudrate, int databits,
+exynos4210_uart_param(struct uart_bas *bas, int baudrate, int databits,
     int stopbits, int parity)
 {
 	int brd, ulcon;
@@ -127,38 +127,38 @@ s3c24x0_uart_param(struct uart_bas *bas,
 	return (0);
 }
 
-struct uart_ops uart_s3c2410_ops = {
-	.probe = s3c2410_probe,
-	.init = s3c2410_init,
-	.term = s3c2410_term,
-	.putc = s3c2410_putc,
-	.rxready = s3c2410_rxready,
-	.getc = s3c2410_getc,
+struct uart_ops uart_exynos4210_ops = {
+	.probe = exynos4210_probe,
+	.init = exynos4210_init,
+	.term = exynos4210_term,
+	.putc = exynos4210_putc,
+	.rxready = exynos4210_rxready,
+	.getc = exynos4210_getc,
 };
 
 static int
-s3c2410_probe(struct uart_bas *bas)
+exynos4210_probe(struct uart_bas *bas)
 {
 
 	return (0);
 }
 
 static void
-s3c2410_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
+exynos4210_init(struct uart_bas *bas, int baudrate, int databits, int stopbits,
     int parity)
 {
 
 	if (bas->rclk == 0)
 		bas->rclk = DEF_CLK;
 
-	KASSERT(bas->rclk != 0, ("s3c2410_init: Invalid rclk"));
+	KASSERT(bas->rclk != 0, ("exynos4210_init: Invalid rclk"));
 
 	uart_setreg(bas, SSCOM_UCON, 0);
 	uart_setreg(bas, SSCOM_UFCON,
 	    UFCON_TXTRIGGER_8 | UFCON_RXTRIGGER_8 |
 	    UFCON_TXFIFO_RESET | UFCON_RXFIFO_RESET |
 	    UFCON_FIFO_ENABLE);
-	s3c24x0_uart_param(bas, baudrate, databits, stopbits, parity);
+	exynos4210_uart_param(bas, baudrate, databits, stopbits, parity);
 
 	/* Enable UART. */
 	uart_setreg(bas, SSCOM_UCON, UCON_TXMODE_INT | UCON_RXMODE_INT |
@@ -167,13 +167,13 @@ s3c2410_init(struct uart_bas *bas, int b
 }
 
 static void
-s3c2410_term(struct uart_bas *bas)
+exynos4210_term(struct uart_bas *bas)
 {
 	/* XXX */
 }
 
 static void
-s3c2410_putc(struct uart_bas *bas, int c)
+exynos4210_putc(struct uart_bas *bas, int c)
 {
 
 	while ((bus_space_read_4(bas->bst, bas->bsh, SSCOM_UFSTAT) &
@@ -184,7 +184,7 @@ s3c2410_putc(struct uart_bas *bas, int c
 }
 
 static int
-s3c2410_rxready(struct uart_bas *bas)
+exynos4210_rxready(struct uart_bas *bas)
 {
 
 	return ((uart_getreg(bas, SSCOM_UTRSTAT) & UTRSTAT_RXREADY) ==
@@ -192,7 +192,7 @@ s3c2410_rxready(struct uart_bas *bas)
 }
 
 static int
-s3c2410_getc(struct uart_bas *bas, struct mtx *mtx)
+exynos4210_getc(struct uart_bas *bas, struct mtx *mtx)
 {
 	int utrstat;
 
@@ -205,34 +205,34 @@ s3c2410_getc(struct uart_bas *bas, struc
 	return (bus_space_read_1(bas->bst, bas->bsh, SSCOM_URXH));
 }
 
-static int s3c2410_bus_probe(struct uart_softc *sc);
-static int s3c2410_bus_attach(struct uart_softc *sc);
-static int s3c2410_bus_flush(struct uart_softc *, int);
-static int s3c2410_bus_getsig(struct uart_softc *);
-static int s3c2410_bus_ioctl(struct uart_softc *, int, intptr_t);
-static int s3c2410_bus_ipend(struct uart_softc *);
-static int s3c2410_bus_param(struct uart_softc *, int, int, int, int);
-static int s3c2410_bus_receive(struct uart_softc *);
-static int s3c2410_bus_setsig(struct uart_softc *, int);
-static int s3c2410_bus_transmit(struct uart_softc *);
-
-static kobj_method_t s3c2410_methods[] = {
-	KOBJMETHOD(uart_probe,		s3c2410_bus_probe),
-	KOBJMETHOD(uart_attach, 	s3c2410_bus_attach),
-	KOBJMETHOD(uart_flush,		s3c2410_bus_flush),
-	KOBJMETHOD(uart_getsig,		s3c2410_bus_getsig),
-	KOBJMETHOD(uart_ioctl,		s3c2410_bus_ioctl),
-	KOBJMETHOD(uart_ipend,		s3c2410_bus_ipend),
-	KOBJMETHOD(uart_param,		s3c2410_bus_param),
-	KOBJMETHOD(uart_receive,	s3c2410_bus_receive),
-	KOBJMETHOD(uart_setsig,		s3c2410_bus_setsig),
-	KOBJMETHOD(uart_transmit,	s3c2410_bus_transmit),
+static int exynos4210_bus_probe(struct uart_softc *sc);
+static int exynos4210_bus_attach(struct uart_softc *sc);
+static int exynos4210_bus_flush(struct uart_softc *, int);
+static int exynos4210_bus_getsig(struct uart_softc *);
+static int exynos4210_bus_ioctl(struct uart_softc *, int, intptr_t);
+static int exynos4210_bus_ipend(struct uart_softc *);
+static int exynos4210_bus_param(struct uart_softc *, int, int, int, int);
+static int exynos4210_bus_receive(struct uart_softc *);
+static int exynos4210_bus_setsig(struct uart_softc *, int);
+static int exynos4210_bus_transmit(struct uart_softc *);
+
+static kobj_method_t exynos4210_methods[] = {
+	KOBJMETHOD(uart_probe,		exynos4210_bus_probe),
+	KOBJMETHOD(uart_attach, 	exynos4210_bus_attach),
+	KOBJMETHOD(uart_flush,		exynos4210_bus_flush),
+	KOBJMETHOD(uart_getsig,		exynos4210_bus_getsig),
+	KOBJMETHOD(uart_ioctl,		exynos4210_bus_ioctl),
+	KOBJMETHOD(uart_ipend,		exynos4210_bus_ipend),
+	KOBJMETHOD(uart_param,		exynos4210_bus_param),
+	KOBJMETHOD(uart_receive,	exynos4210_bus_receive),
+	KOBJMETHOD(uart_setsig,		exynos4210_bus_setsig),
+	KOBJMETHOD(uart_transmit,	exynos4210_bus_transmit),
 
 	{0, 0 }
 };
 
 int
-s3c2410_bus_probe(struct uart_softc *sc)
+exynos4210_bus_probe(struct uart_softc *sc)
 {
 
 	sc->sc_txfifosz = 16;
@@ -242,7 +242,7 @@ s3c2410_bus_probe(struct uart_softc *sc)
 }
 
 static int
-s3c2410_bus_attach(struct uart_softc *sc)
+exynos4210_bus_attach(struct uart_softc *sc)
 {
 
 	sc->sc_hwiflow = 0;
@@ -252,7 +252,7 @@ s3c2410_bus_attach(struct uart_softc *sc
 }
 
 static int
-s3c2410_bus_transmit(struct uart_softc *sc)
+exynos4210_bus_transmit(struct uart_softc *sc)
 {
 	int i;
 	int reg;
@@ -260,7 +260,7 @@ s3c2410_bus_transmit(struct uart_softc *
 	uart_lock(sc->sc_hwmtx);
 
 	for (i = 0; i < sc->sc_txdatasz; i++) {
-		s3c2410_putc(&sc->sc_bas, sc->sc_txbuf[i]);
+		exynos4210_putc(&sc->sc_bas, sc->sc_txbuf[i]);
 		uart_barrier(&sc->sc_bas);
 	}
 
@@ -277,14 +277,14 @@ s3c2410_bus_transmit(struct uart_softc *
 }
 
 static int
-s3c2410_bus_setsig(struct uart_softc *sc, int sig)
+exynos4210_bus_setsig(struct uart_softc *sc, int sig)
 {
 
 	return (0);
 }
 
 static int
-s3c2410_bus_receive(struct uart_softc *sc)
+exynos4210_bus_receive(struct uart_softc *sc)
 {
 	struct uart_bas *bas;
 
@@ -297,7 +297,7 @@ s3c2410_bus_receive(struct uart_softc *s
 }
 
 static int
-s3c2410_bus_param(struct uart_softc *sc, int baudrate, int databits,
+exynos4210_bus_param(struct uart_softc *sc, int baudrate, int databits,
     int stopbits, int parity)
 {
 	int error;
@@ -305,10 +305,10 @@ s3c2410_bus_param(struct uart_softc *sc,
 	if (sc->sc_bas.rclk == 0)
 		sc->sc_bas.rclk = DEF_CLK;
 
-	KASSERT(sc->sc_bas.rclk != 0, ("s3c2410_init: Invalid rclk"));
+	KASSERT(sc->sc_bas.rclk != 0, ("exynos4210_init: Invalid rclk"));
 
 	uart_lock(sc->sc_hwmtx);
-	error = s3c24x0_uart_param(&sc->sc_bas, baudrate, databits, stopbits,
+	error = exynos4210_uart_param(&sc->sc_bas, baudrate, databits, stopbits,
 	    parity);
 	uart_unlock(sc->sc_hwmtx);
 
@@ -316,7 +316,7 @@ s3c2410_bus_param(struct uart_softc *sc,
 }
 
 static int
-s3c2410_bus_ipend(struct uart_softc *sc)
+exynos4210_bus_ipend(struct uart_softc *sc)
 {
 	uint32_t ints;
 	uint32_t txempty, rxready;
@@ -352,31 +352,31 @@ s3c2410_bus_ipend(struct uart_softc *sc)
 }
 
 static int
-s3c2410_bus_flush(struct uart_softc *sc, int what)
+exynos4210_bus_flush(struct uart_softc *sc, int what)
 {
 
 	return (0);
 }
 
 static int
-s3c2410_bus_getsig(struct uart_softc *sc)
+exynos4210_bus_getsig(struct uart_softc *sc)
 {
 
 	return (0);
 }
 
 static int
-s3c2410_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
+exynos4210_bus_ioctl(struct uart_softc *sc, int request, intptr_t data)
 {
 
 	return (EINVAL);
 }
 
-struct uart_class uart_s3c2410_class = {
-	"s3c2410 class",
-	s3c2410_methods,
+struct uart_class uart_exynos4210_class = {
+	"exynos4210 class",
+	exynos4210_methods,
 	1,
-	.uc_ops = &uart_s3c2410_ops,
+	.uc_ops = &uart_exynos4210_ops,
 	.uc_range = 8,
 	.uc_rclk = 0,
 };

Modified: head/sys/dev/uart/uart.h
==============================================================================
--- head/sys/dev/uart/uart.h	Tue Jan 13 14:26:05 2015	(r277131)
+++ head/sys/dev/uart/uart.h	Tue Jan 13 15:04:28 2015	(r277132)
@@ -78,6 +78,7 @@ extern struct uart_class uart_cdnc_class
 extern struct uart_class uart_ti8250_class __attribute__((weak));
 extern struct uart_class uart_vybrid_class __attribute__((weak));
 extern struct uart_class at91_usart_class __attribute__((weak));
+extern struct uart_class uart_exynos4210_class __attribute__((weak));
 
 #ifdef FDT
 struct ofw_compat_data;

Modified: head/sys/dev/uart/uart_bus_fdt.c
==============================================================================
--- head/sys/dev/uart/uart_bus_fdt.c	Tue Jan 13 14:26:05 2015	(r277131)
+++ head/sys/dev/uart/uart_bus_fdt.c	Tue Jan 13 15:04:28 2015	(r277132)
@@ -74,7 +74,7 @@ static struct ofw_compat_data compat_dat
 	{"atmel,at91rm9200-usart",(uintptr_t)&at91_usart_class},
 	{"atmel,at91sam9260-usart",(uintptr_t)&at91_usart_class},
 	{"cadence,uart",	(uintptr_t)&uart_cdnc_class},
-	{"exynos",		(uintptr_t)&uart_s3c2410_class},
+	{"exynos",		(uintptr_t)&uart_exynos4210_class},
 	{"fsl,imx6q-uart",	(uintptr_t)&uart_imx_class},
 	{"fsl,imx53-uart",	(uintptr_t)&uart_imx_class},
 	{"fsl,imx51-uart",	(uintptr_t)&uart_imx_class},



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501131504.t0DF4TCG049283>