Module Name: src
Committed By: skrll
Date: Thu Nov 26 12:56:35 UTC 2020
Modified Files:
src/sys/arch/arm/imx: files.imx23 imx23_pinctrl.c
src/sys/arch/evbarm/gemini: gemini_machdep.c
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/imx/files.imx23
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/imx/imx23_pinctrl.c
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/gemini/gemini_machdep.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.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/imx/files.imx23
diff -u src/sys/arch/arm/imx/files.imx23:1.4 src/sys/arch/arm/imx/files.imx23:1.5
--- src/sys/arch/arm/imx/files.imx23:1.4 Sat Jan 10 12:18:09 2015
+++ src/sys/arch/arm/imx/files.imx23 Thu Nov 26 12:56:34 2020
@@ -1,4 +1,4 @@
-# $Id: files.imx23,v 1.4 2015/01/10 12:18:09 jmcneill Exp $
+# $Id: files.imx23,v 1.5 2020/11/26 12:56:34 skrll Exp $
#
# Freescale i.MX23 applications processor configuration info.
#
@@ -85,7 +85,7 @@ file arch/arm/imx/imx23_usb.c imxusbc
attach ehci at imxusbc with imxehci
file arch/arm/imx/imxusb.c imxehci
-# RTC
+# RTC
device rtc
attach rtc at apbx
file arch/arm/imx/imx23_rtc.c rtc
Index: src/sys/arch/arm/imx/imx23_pinctrl.c
diff -u src/sys/arch/arm/imx/imx23_pinctrl.c:1.2 src/sys/arch/arm/imx/imx23_pinctrl.c:1.3
--- src/sys/arch/arm/imx/imx23_pinctrl.c:1.2 Fri Oct 18 04:09:01 2019
+++ src/sys/arch/arm/imx/imx23_pinctrl.c Thu Nov 26 12:56:34 2020
@@ -1,4 +1,4 @@
-/* $Id: imx23_pinctrl.c,v 1.2 2019/10/18 04:09:01 msaitoh Exp $ */
+/* $Id: imx23_pinctrl.c,v 1.3 2020/11/26 12:56:34 skrll Exp $ */
/*
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -386,7 +386,7 @@ pinctrl_attach(device_t parent, device_t
sc->sc_dev = self;
sc->sc_iot = aa->aa_iot;
-
+
if (pinctrl_attached) {
aprint_error_dev(sc->sc_dev, "already attached\n");
return;
@@ -428,7 +428,7 @@ pinctrl_attach(device_t parent, device_t
gpiobus_aa.gba_pins = sc->pins;
config_found_ia(self, "gpiobus", &gpiobus_aa, gpiobus_print);
-
+
return;
}
@@ -439,7 +439,7 @@ pinctrl_activate(device_t self, enum dev
return EOPNOTSUPP;
}
-static void
+static void
pinctrl_init(struct pinctrl_softc *sc)
{
_sc = sc;
@@ -499,7 +499,7 @@ pinctrl_reset(struct pinctrl_softc *sc)
* MAXI boards. We configure this pin to logic 1.
*/
void
-pinctrl_en_usb(void)
+pinctrl_en_usb(void)
{
struct pinctrl_softc *sc = _sc;
@@ -537,7 +537,7 @@ pinctrl_gp_pin_read(void *cookie, int pi
value = 1;
else
value = 0;
-
+
return value;
}
Index: src/sys/arch/evbarm/gemini/gemini_machdep.c
diff -u src/sys/arch/evbarm/gemini/gemini_machdep.c:1.31 src/sys/arch/evbarm/gemini/gemini_machdep.c:1.32
--- src/sys/arch/evbarm/gemini/gemini_machdep.c:1.31 Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/gemini/gemini_machdep.c Thu Nov 26 12:56:34 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: gemini_machdep.c,v 1.31 2019/07/16 14:41:45 skrll Exp $ */
+/* $NetBSD: gemini_machdep.c,v 1.32 2020/11/26 12:56:34 skrll Exp $ */
/* adapted from:
* NetBSD: sdp24xx_machdep.c,v 1.4 2008/08/27 11:03:10 matt Exp
@@ -129,7 +129,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.31 2019/07/16 14:41:45 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gemini_machdep.c,v 1.32 2020/11/26 12:56:34 skrll Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -485,7 +485,7 @@ static const struct pmap_devmap devmap[]
.pd_cache = PTE_NOCACHE
},
-#if defined(MEMORY_DISK_DYNAMIC)
+#if defined(MEMORY_DISK_DYNAMIC)
/* Ramdisk */
{
.pd_va = _A(GEMINI_RAMDISK_VBASE),
@@ -493,7 +493,7 @@ static const struct pmap_devmap devmap[]
.pd_size = _S(GEMINI_RAMDISK_SIZE),
.pd_prot = VM_PROT_READ|VM_PROT_WRITE,
.pd_cache = PTE_NOCACHE
- },
+ },
#endif
{0} /* list terminator */
@@ -799,7 +799,7 @@ consinit(void)
panic("Serial console can not be initialized.");
}
-#elif CONSADDR==0x478003f8
+#elif CONSADDR==0x478003f8
# include <arm/gemini/gemini_lpcvar.h>
/*
* console initialization for lpc com console
Index: src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.9 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.10
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.9 Tue Jul 16 14:41:45 2019
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Thu Nov 26 12:56:34 2020
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.9 2019/07/16 14:41:45 skrll Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.10 2020/11/26 12:56:34 skrll Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -217,7 +217,7 @@ cpu_reboot(int howto, char *bootstr)
static int cpu_reboot_called = 0;
boothowto |= howto;
-
+
/*
* If this is the first invocation of cpu_reboot() and the RB_NOSYNC
* flag is not set in howto; sync and unmount the system disks by
@@ -351,7 +351,7 @@ power_vddio_from_dcdc(int target, int br
/* Enable PWDN_BRNOUT. */
REG_WR(PWR_CTRL_C, HW_POWER_CTRL_VDDIO_BO_IRQ);
-
+
tmp_r = REG_RD(PWR_VDDIOCTRL);
tmp_r |= HW_POWER_VDDIOCTRL_PWDN_BRNOUT;
REG_WR(PWR_VDDIOCTRL, tmp_r);
@@ -391,7 +391,7 @@ void set_io_frac(unsigned int frac)
{
uint8_t *io_frac;
uint32_t tmp_r;
-
+
io_frac = (uint8_t *)(CLKCTRL_FRAC);
io_frac++; /* emi */
io_frac++; /* pix */
