Module Name: src
Committed By: martin
Date: Sat Mar 21 20:01:01 UTC 2020
Modified Files:
src/sys/arch/arm/samsung [netbsd-9]: exynos5410_clock.c
exynos5422_clock.c exynos_gpio.c exynos_pinctrl.c exynos_uart.c
Log Message:
Pull up following revision(s) (requested by skrll in ticket #796):
sys/arch/arm/samsung/exynos_pinctrl.c: revision 1.16
sys/arch/arm/samsung/exynos5410_clock.c: revision 1.6
sys/arch/arm/samsung/exynos_gpio.c: revision 1.26
sys/arch/arm/samsung/exynos_uart.c: revision 1.3
sys/arch/arm/samsung/exynos5422_clock.c: revision 1.15
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/arm/samsung/exynos5410_clock.c
cvs rdiff -u -r1.13 -r1.13.4.1 src/sys/arch/arm/samsung/exynos5422_clock.c
cvs rdiff -u -r1.25 -r1.25.4.1 src/sys/arch/arm/samsung/exynos_gpio.c
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 src/sys/arch/arm/samsung/exynos_pinctrl.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/arm/samsung/exynos_uart.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/samsung/exynos5410_clock.c
diff -u src/sys/arch/arm/samsung/exynos5410_clock.c:1.4 src/sys/arch/arm/samsung/exynos5410_clock.c:1.4.4.1
--- src/sys/arch/arm/samsung/exynos5410_clock.c:1.4 Sun Sep 9 07:21:18 2018
+++ src/sys/arch/arm/samsung/exynos5410_clock.c Sat Mar 21 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5410_clock.c,v 1.4 2018/09/09 07:21:18 aymeric Exp $ */
+/* $NetBSD: exynos5410_clock.c,v 1.4.4.1 2020/03/21 20:01:01 martin Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos5410_clock.c,v 1.4 2018/09/09 07:21:18 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5410_clock.c,v 1.4.4.1 2020/03/21 20:01:01 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -448,7 +448,7 @@ exynos5410_clock_attach(device_t parent,
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
-
+
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
aprint_error(": couldn't map %#llx: %d",
@@ -583,7 +583,7 @@ exynos5410_clock_get_rate_pll(struct exy
&clk_parent->base);
const uint32_t v = CLOCK_READ(sc, epll->con0_reg);
-
+
return PLL_FREQ(rate_parent, v);
}
Index: src/sys/arch/arm/samsung/exynos5422_clock.c
diff -u src/sys/arch/arm/samsung/exynos5422_clock.c:1.13 src/sys/arch/arm/samsung/exynos5422_clock.c:1.13.4.1
--- src/sys/arch/arm/samsung/exynos5422_clock.c:1.13 Sun Sep 9 07:21:18 2018
+++ src/sys/arch/arm/samsung/exynos5422_clock.c Sat Mar 21 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos5422_clock.c,v 1.13 2018/09/09 07:21:18 aymeric Exp $ */
+/* $NetBSD: exynos5422_clock.c,v 1.13.4.1 2020/03/21 20:01:01 martin Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.13 2018/09/09 07:21:18 aymeric Exp $");
+__KERNEL_RCSID(0, "$NetBSD: exynos5422_clock.c,v 1.13.4.1 2020/03/21 20:01:01 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -625,7 +625,7 @@ exynos5422_clock_attach(device_t parent,
sc->sc_dev = self;
sc->sc_bst = faa->faa_bst;
-
+
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
aprint_error(": couldn't map %#llx: %d",
@@ -760,7 +760,7 @@ exynos5422_clock_get_rate_pll(struct exy
&clk_parent->base);
const uint32_t v = CLOCK_READ(sc, epll->con0_reg);
-
+
return PLL_FREQ(rate_parent, v);
}
Index: src/sys/arch/arm/samsung/exynos_gpio.c
diff -u src/sys/arch/arm/samsung/exynos_gpio.c:1.25 src/sys/arch/arm/samsung/exynos_gpio.c:1.25.4.1
--- src/sys/arch/arm/samsung/exynos_gpio.c:1.25 Wed Jul 4 22:16:42 2018
+++ src/sys/arch/arm/samsung/exynos_gpio.c Sat Mar 21 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_gpio.c,v 1.25 2018/07/04 22:16:42 jmcneill Exp $ */
+/* $NetBSD: exynos_gpio.c,v 1.25.4.1 2020/03/21 20:01:01 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.25 2018/07/04 22:16:42 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_gpio.c,v 1.25.4.1 2020/03/21 20:01:01 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -292,7 +292,7 @@ exynos_gpio_bank_config(struct exynos_pi
result);
return NULL;
}
-
+
sc->sc_dev = parent->sc_dev;
sc->sc_bst = &armv7_generic_bs_tag;
sc->sc_bsh = parent->sc_bsh;
Index: src/sys/arch/arm/samsung/exynos_pinctrl.c
diff -u src/sys/arch/arm/samsung/exynos_pinctrl.c:1.13.4.1 src/sys/arch/arm/samsung/exynos_pinctrl.c:1.13.4.2
--- src/sys/arch/arm/samsung/exynos_pinctrl.c:1.13.4.1 Thu Oct 3 17:23:11 2019
+++ src/sys/arch/arm/samsung/exynos_pinctrl.c Sat Mar 21 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_pinctrl.c,v 1.13.4.1 2019/10/03 17:23:11 martin Exp $ */
+/* $NetBSD: exynos_pinctrl.c,v 1.13.4.2 2020/03/21 20:01:01 martin Exp $ */
/*-
* Copyright (c) 2015 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include "gpio.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.13.4.1 2019/10/03 17:23:11 martin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_pinctrl.c,v 1.13.4.2 2020/03/21 20:01:01 martin Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -178,7 +178,7 @@ exynos_do_config(struct exynos_pinctrl_c
return 0;
}
-
+
static int
exynos_pinctrl_set_cfg(device_t dev, const void *data, size_t len)
{
Index: src/sys/arch/arm/samsung/exynos_uart.c
diff -u src/sys/arch/arm/samsung/exynos_uart.c:1.2 src/sys/arch/arm/samsung/exynos_uart.c:1.2.6.1
--- src/sys/arch/arm/samsung/exynos_uart.c:1.2 Tue Sep 11 10:05:31 2018
+++ src/sys/arch/arm/samsung/exynos_uart.c Sat Mar 21 20:01:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: exynos_uart.c,v 1.2 2018/09/11 10:05:31 jmcneill Exp $ */
+/* $NetBSD: exynos_uart.c,v 1.2.6.1 2020/03/21 20:01:01 martin Exp $ */
/*-
* Copyright (c) 2013-2018 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.2 2018/09/11 10:05:31 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_uart.c,v 1.2.6.1 2020/03/21 20:01:01 martin Exp $");
#define cn_trap() \
do { \
@@ -301,7 +301,7 @@ exynos_uart_cnputc(dev_t dev, int c)
splx(s);
}
-
+
static void
exynos_uart_cnpollc(dev_t dev, int on)
