Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-9]: src/sys/arch/arm/samsung Pull up following revision(s) (reque...
details: https://anonhg.NetBSD.org/src/rev/4093d92d8182
branches: netbsd-9
changeset: 963736:4093d92d8182
user: martin <martin%NetBSD.org@localhost>
date: Sat Mar 21 20:01:01 2020 +0000
description:
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
diffstat:
sys/arch/arm/samsung/exynos5410_clock.c | 8 ++++----
sys/arch/arm/samsung/exynos5422_clock.c | 8 ++++----
sys/arch/arm/samsung/exynos_gpio.c | 6 +++---
sys/arch/arm/samsung/exynos_pinctrl.c | 6 +++---
sys/arch/arm/samsung/exynos_uart.c | 6 +++---
5 files changed, 17 insertions(+), 17 deletions(-)
diffs (153 lines):
diff -r 39f435522146 -r 4093d92d8182 sys/arch/arm/samsung/exynos5410_clock.c
--- a/sys/arch/arm/samsung/exynos5410_clock.c Sat Mar 21 16:02:38 2020 +0000
+++ b/sys/arch/arm/samsung/exynos5410_clock.c Sat Mar 21 20:01:01 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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 @@
&clk_parent->base);
const uint32_t v = CLOCK_READ(sc, epll->con0_reg);
-
+
return PLL_FREQ(rate_parent, v);
}
diff -r 39f435522146 -r 4093d92d8182 sys/arch/arm/samsung/exynos5422_clock.c
--- a/sys/arch/arm/samsung/exynos5422_clock.c Sat Mar 21 16:02:38 2020 +0000
+++ b/sys/arch/arm/samsung/exynos5422_clock.c Sat Mar 21 20:01:01 2020 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
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 @@
&clk_parent->base);
const uint32_t v = CLOCK_READ(sc, epll->con0_reg);
-
+
return PLL_FREQ(rate_parent, v);
}
diff -r 39f435522146 -r 4093d92d8182 sys/arch/arm/samsung/exynos_gpio.c
--- a/sys/arch/arm/samsung/exynos_gpio.c Sat Mar 21 16:02:38 2020 +0000
+++ b/sys/arch/arm/samsung/exynos_gpio.c Sat Mar 21 20:01:01 2020 +0000
@@ -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 @@
result);
return NULL;
}
-
+
sc->sc_dev = parent->sc_dev;
sc->sc_bst = &armv7_generic_bs_tag;
sc->sc_bsh = parent->sc_bsh;
diff -r 39f435522146 -r 4093d92d8182 sys/arch/arm/samsung/exynos_pinctrl.c
--- a/sys/arch/arm/samsung/exynos_pinctrl.c Sat Mar 21 16:02:38 2020 +0000
+++ b/sys/arch/arm/samsung/exynos_pinctrl.c Sat Mar 21 20:01:01 2020 +0000
@@ -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 @@
return 0;
}
-
+
static int
exynos_pinctrl_set_cfg(device_t dev, const void *data, size_t len)
{
diff -r 39f435522146 -r 4093d92d8182 sys/arch/arm/samsung/exynos_uart.c
--- a/sys/arch/arm/samsung/exynos_uart.c Sat Mar 21 16:02:38 2020 +0000
+++ b/sys/arch/arm/samsung/exynos_uart.c Sat Mar 21 20:01:01 2020 +0000
@@ -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 @@
splx(s);
}
-
+
static void
exynos_uart_cnpollc(dev_t dev, int on)
Home |
Main Index |
Thread Index |
Old Index