summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/arch/armv7/omap/amdisplay.c12
-rw-r--r--sys/arch/armv7/omap/amdisplayreg.h4
-rw-r--r--sys/arch/armv7/omap/dmtimer.c4
-rw-r--r--sys/arch/armv7/omap/gptimer.c6
-rw-r--r--sys/arch/armv7/omap/intc.c10
-rw-r--r--sys/arch/armv7/omap/intc.h4
-rw-r--r--sys/arch/armv7/omap/nxphdmi.c6
-rw-r--r--sys/arch/armv7/omap/omdisplay.c18
-rw-r--r--sys/arch/armv7/omap/omehcivar.h6
-rw-r--r--sys/arch/armv7/omap/omusbtll.c4
-rw-r--r--sys/arch/armv7/omap/sitara_cm.h4
-rw-r--r--sys/arch/armv7/omap/ti_iic.c4
12 files changed, 41 insertions, 41 deletions
diff --git a/sys/arch/armv7/omap/amdisplay.c b/sys/arch/armv7/omap/amdisplay.c
index ced05666f04..dbeae388cb0 100644
--- a/sys/arch/armv7/omap/amdisplay.c
+++ b/sys/arch/armv7/omap/amdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdisplay.c,v 1.9 2019/04/10 22:18:39 ians Exp $ */
+/* $OpenBSD: amdisplay.c,v 1.10 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2016 Ian Sutton <ians@openbsd.org>
*
@@ -317,7 +317,7 @@ amdisplay_attach(struct device *parent, struct device *self, void *args)
| LCD_LCDDMA_CTRL_FRAME_MODE);
reg |= (0x4 << LCD_LCDDMA_CTRL_BURST_SIZE_SHAMT)
| LCD_LCDDMA_CTRL_FRAME_MODE;
- HWRITE4(sc, LCD_LCDDMA_CTRL, reg);
+ HWRITE4(sc, LCD_LCDDMA_CTRL, reg);
/* set framebuffer location + bounds */
HWRITE4(sc, LCD_LCDDMA_FB0, sc->sc_fb0_dma_segs[0].ds_addr);
@@ -413,16 +413,16 @@ amdisplay_intr(void *arg)
HSET4(sc, LCD_RASTER_CTRL, LCD_RASTER_CTRL_LCDEN);
}
- if (ISSET(reg, LCD_IRQ_FUF)) {
+ if (ISSET(reg, LCD_IRQ_FUF)) {
DPRINTF(15, ("%s: FIFO underflow\n", DEVNAME(sc)));
}
-
+
if (ISSET(reg, LCD_IRQ_SYNC)) {
sc->sc_flags |= LCD_RESET_PENDING;
DPRINTF(18, ("%s: sync lost\n", DEVNAME(sc)));
}
- if (ISSET(reg, LCD_IRQ_RR_DONE)) {
+ if (ISSET(reg, LCD_IRQ_RR_DONE)) {
DPRINTF(21, ("%s: frame done\n", DEVNAME(sc)));
HWRITE4(sc, LCD_LCDDMA_FB0, sc->sc_fb0_dma_segs[0].ds_addr);
HWRITE4(sc, LCD_LCDDMA_FB0_CEIL, (sc->sc_fb0_dma_segs[0].ds_addr
@@ -540,7 +540,7 @@ amdisplay_conf_crt_timings(struct amdisplay_softc *sc)
/* Lines per panel */
timing1 |= (height & 0x3ff);
- timing2 |= ((height >> 10 ) & 1)
+ timing2 |= ((height >> 10 ) & 1)
<< LCD_RASTER_TIMING_2_LPP_B10_SHAMT;
/* waveform settings */
diff --git a/sys/arch/armv7/omap/amdisplayreg.h b/sys/arch/armv7/omap/amdisplayreg.h
index b79c3c69504..f7ff175e280 100644
--- a/sys/arch/armv7/omap/amdisplayreg.h
+++ b/sys/arch/armv7/omap/amdisplayreg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: amdisplayreg.h,v 1.4 2017/08/31 21:39:25 ians Exp $ */
+/* $OpenBSD: amdisplayreg.h,v 1.5 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2016 Ian Sutton <ians@openbsd.org>
*
@@ -76,7 +76,7 @@
#define LCD_RASTER_SUBPANEL_HOLS (0x1 << 29)
#define LCD_RASTER_SUBPANEL_LPPT (0x2FF << 16)
#define LCD_RASTER_SUBPANEL_DPDLSB (0xFFFF << 0)
-#define LCD_RASTER_SUBPANEL_LPPT_SHAMT
+#define LCD_RASTER_SUBPANEL_LPPT_SHAMT
#define LCD_RASTER_SUBPANEL_2 0x3C
#define LCD_RASTER_SUBPANEL2_LPPT_B10 (0x1 << 8)
#define LCD_RASTER_SUBPANEL2_DPDMSB (0xFF << 0)
diff --git a/sys/arch/armv7/omap/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c
index db1eb32ad23..f636c11ab0a 100644
--- a/sys/arch/armv7/omap/dmtimer.c
+++ b/sys/arch/armv7/omap/dmtimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dmtimer.c,v 1.7 2017/09/08 05:36:51 deraadt Exp $ */
+/* $OpenBSD: dmtimer.c,v 1.8 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
* Copyright (c) 2013 Raphael Graf <r@undefined.ch>
@@ -304,7 +304,7 @@ dmtimer_cpu_initclocks()
sc->sc_ticks_per_intr = sc->sc_ticks_per_second / hz;
sc->sc_ticks_err_cnt = sc->sc_ticks_per_second % hz;
- sc->sc_ticks_err_sum = 0;
+ sc->sc_ticks_err_sum = 0;
/* establish interrupts */
arm_intr_establish(sc->sc_irq, IPL_CLOCK, dmtimer_intr,
diff --git a/sys/arch/armv7/omap/gptimer.c b/sys/arch/armv7/omap/gptimer.c
index 86432693960..7605845d5e2 100644
--- a/sys/arch/armv7/omap/gptimer.c
+++ b/sys/arch/armv7/omap/gptimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gptimer.c,v 1.6 2019/05/06 03:30:10 mlarkin Exp $ */
+/* $OpenBSD: gptimer.c,v 1.7 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -111,7 +111,7 @@ void gptimer_delay(u_int);
void gptimer_setstatclockrate(int newhz);
bus_space_tag_t gptimer_iot;
-bus_space_handle_t gptimer_ioh0, gptimer_ioh1;
+bus_space_handle_t gptimer_ioh0, gptimer_ioh1;
int gptimer_irq = 0;
u_int gptimer_get_timecount(struct timecounter *);
@@ -177,7 +177,7 @@ gptimer_attach(struct device *parent, struct device *self, void *args)
gptimer_setstatclockrate, NULL);
}
-/*
+/*
* See comment in arm/xscale/i80321_clock.c
*
* counter is count up, but with autoreload timers it is not possible
diff --git a/sys/arch/armv7/omap/intc.c b/sys/arch/armv7/omap/intc.c
index a68a5be5741..2b334395a42 100644
--- a/sys/arch/armv7/omap/intc.c
+++ b/sys/arch/armv7/omap/intc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: intc.c,v 1.7 2016/08/06 18:21:34 patrick Exp $ */
+/* $OpenBSD: intc.c,v 1.8 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -231,7 +231,7 @@ intc_calc_mask(void)
for (; i <= IPL_HIGH; i++)
intc_imask[INTC_IRQ_TO_REG(irq)][i] |=
1 << INTC_IRQ_TO_REGi(irq);
- /* XXX - set enable/disable, priority */
+ /* XXX - set enable/disable, priority */
bus_space_write_4(intc_iot, intc_ioh, INTC_ILRn(irq),
INTC_ILR_PRIs(NIPL-max)|INTC_ILR_IRQ);
}
@@ -276,7 +276,7 @@ intc_splraise(int new)
new = old;
intc_setipl(new);
-
+
return (old);
}
@@ -295,7 +295,7 @@ intc_setipl(int new)
volatile static int recursed = 0;
if (recursed == 0) {
recursed = 1;
- if (new != 12)
+ if (new != 12)
printf("setipl %d\n", new);
recursed = 0;
}
@@ -342,7 +342,7 @@ intc_irq_handler(void *frame)
else
arg = frame;
- if (ih->ih_func(arg))
+ if (ih->ih_func(arg))
ih->ih_count.ec_count++;
}
diff --git a/sys/arch/armv7/omap/intc.h b/sys/arch/armv7/omap/intc.h
index bc0a59f514a..c4c7f691354 100644
--- a/sys/arch/armv7/omap/intc.h
+++ b/sys/arch/armv7/omap/intc.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: intc.h,v 1.2 2014/03/29 18:09:28 guenther Exp $ */
+/* $OpenBSD: intc.h,v 1.3 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -46,7 +46,7 @@ find_first_bit( uint32_t bits )
int count;
/* since CLZ is available only on ARMv5, this isn't portable
- * to all ARM CPUs. This file is for OMAPINTC processor.
+ * to all ARM CPUs. This file is for OMAPINTC processor.
*/
asm( "clz %0, %1" : "=r" (count) : "r" (bits) );
return 31-count;
diff --git a/sys/arch/armv7/omap/nxphdmi.c b/sys/arch/armv7/omap/nxphdmi.c
index 322fb3e2d61..b904f49b438 100644
--- a/sys/arch/armv7/omap/nxphdmi.c
+++ b/sys/arch/armv7/omap/nxphdmi.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: nxphdmi.c,v 1.5 2017/09/11 05:44:22 jsg Exp $ */
+/* $OpenBSD: nxphdmi.c,v 1.6 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2016 Ian Sutton <ians@openbsd.org>
* All rights reserved.
@@ -229,11 +229,11 @@
#define CEC_FRO_IM_CLK_CTRL_GHOST_DIS (1 << 7)
#define CEC_FRO_IM_CLK_CTRL_IMCLK_SEL (1 << 1)
-/* EDID reading */
+/* EDID reading */
#define EDID_LENGTH 0x80
#define MAX_READ_ATTEMPTS 100
-/* EDID fields */
+/* EDID fields */
#define EDID_MODES0 35
#define EDID_MODES1 36
#define EDID_TIMING_START 38
diff --git a/sys/arch/armv7/omap/omdisplay.c b/sys/arch/armv7/omap/omdisplay.c
index 7fe18c08881..7935b36ce19 100644
--- a/sys/arch/armv7/omap/omdisplay.c
+++ b/sys/arch/armv7/omap/omdisplay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omdisplay.c,v 1.5 2014/07/12 18:44:41 tedu Exp $ */
+/* $OpenBSD: omdisplay.c,v 1.6 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2007 Dale Rahn <drahn@openbsd.org>
*
@@ -618,7 +618,7 @@ omdisplay_ioctl(void *v, u_long cmd, caddr_t data, int flag, struct proc *p)
case WSDISPLAYIO_LINEBYTES:
if (scr != NULL)
*(u_int *)data = scr->rinfo.ri_stride;
- else
+ else
*(u_int *)data = 0;
break;
@@ -652,7 +652,7 @@ omdisplay_burner(void *v, u_int on, u_int flags)
int
omdisplay_show_screen(void *v, void *cookie, int waitok,
- void (*cb)(void *, int, int), void *cbarg)
+ void (*cb)(void *, int, int), void *cbarg)
{
struct omdisplay_softc *sc = v;
struct rasops_info *ri = cookie;
@@ -661,7 +661,7 @@ omdisplay_show_screen(void *v, void *cookie, int waitok,
old = sc->sc_active;
if (old == scr)
return 0;
-
+
if (old != NULL)
; /* Stop old screen */
@@ -826,7 +826,7 @@ omdisplay_set_backlight(int on)
omdisplay_set_brightness(omdisplay_get_brightness());
}
}
-
+
void
omdisplay_blank(int blank)
{
@@ -1023,8 +1023,8 @@ omdisplay_initialize(struct omdisplay_softc *sc,
scr->segs[0].ds_addr);
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_BA0, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_BA1, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_SIZE, 0);
+ bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_BA1, 0);
+ bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_SIZE, 0);
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_ATTRIBUTES, 0);
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID1_FIFO_THRESHOLD,
0xc00040); /* XXX */
@@ -1092,7 +1092,7 @@ omdisplay_initialize(struct omdisplay_softc *sc,
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID2_CONV_COEF1, 0);
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID2_CONV_COEF2, 0);
bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID2_CONV_COEF3, 0);
- bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID2_CONV_COEF4, 0);
+ bus_space_write_4(sc->sc_iot, sc->sc_dcioh, DISPC_VID2_CONV_COEF4, 0);
omdisplay_start(sc);
}
@@ -1264,7 +1264,7 @@ omdisplay_new_screen(struct omdisplay_softc *sc,
sizeof (splash) > scr->buf_size ? scr->buf_size : sizeof (splash));
/* map memory for DMA */
- if (bus_dmamap_create(dma_tag, 1024 * 1024 * 2, 1,
+ if (bus_dmamap_create(dma_tag, 1024 * 1024 * 2, 1,
1024 * 1024 * 2, 0, busdma_flag, &scr->dma))
goto bad;
error = bus_dmamap_load(dma_tag, scr->dma,
diff --git a/sys/arch/armv7/omap/omehcivar.h b/sys/arch/armv7/omap/omehcivar.h
index 8eed72d4a5a..0f2b4013514 100644
--- a/sys/arch/armv7/omap/omehcivar.h
+++ b/sys/arch/armv7/omap/omehcivar.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: omehcivar.h,v 1.1 2013/09/04 14:38:31 patrick Exp $ */
+/* $OpenBSD: omehcivar.h,v 1.2 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Misc
@@ -170,7 +170,7 @@
#define UHH_HOSTCONFIG_AUTOPPD_ON_OVERCUR_EN (1UL << 1)
#define UHH_HOSTCONFIG_P1_ULPI_BYPASS (1UL << 0)
-/* The following are on rev2 (OMAP44xx) of the EHCI only */
+/* The following are on rev2 (OMAP44xx) of the EHCI only */
#define UHH_SYSCONFIG_IDLEMODE_MASK (3UL << 2)
#define UHH_SYSCONFIG_IDLEMODE_NOIDLE (1UL << 2)
#define UHH_SYSCONFIG_STANDBYMODE_MASK (3UL << 4)
@@ -215,7 +215,7 @@
#define ULPI_DEBUG 0x15
#define ULPI_SCRATCH 0x16
-/*
+/*
* Values of UHH_REVISION - Note: these are not given in the TRM but taken
* from the linux OMAP EHCI driver (thanks guys). It has been verified on
* a Panda and Beagle board.
diff --git a/sys/arch/armv7/omap/omusbtll.c b/sys/arch/armv7/omap/omusbtll.c
index 3ab75532b93..18a744c7d4e 100644
--- a/sys/arch/armv7/omap/omusbtll.c
+++ b/sys/arch/armv7/omap/omusbtll.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: omusbtll.c,v 1.2 2013/11/06 19:03:07 syl Exp $ */
+/* $OpenBSD: omusbtll.c,v 1.3 2019/05/06 03:45:58 mlarkin Exp $ */
/*
* Copyright (c) 2010 Dale Rahn <drahn@openbsd.org>
*
@@ -60,7 +60,7 @@
#define USBTLL_CHANNEL_CONF_CHANMODE_SH 1
#define USBTLL_CHANNEL_CONF_CHANEN (1<<0)
-/*
+/*
ULPI_VENDOR_ID_LO_(i) (0x0800 + (0x100 * (i)))
ULPI_VENDOR_ID_HI_(i) (0x0801 + (0x100 * (i)))
ULPI_PRODUCT_ID_LO_(i) (0x0802 + (0x100 * (i)))
diff --git a/sys/arch/armv7/omap/sitara_cm.h b/sys/arch/armv7/omap/sitara_cm.h
index cbe85df0894..72ef421a0ba 100644
--- a/sys/arch/armv7/omap/sitara_cm.h
+++ b/sys/arch/armv7/omap/sitara_cm.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: sitara_cm.h,v 1.3 2016/08/12 03:22:41 jsg Exp $ */
+/* $OpenBSD: sitara_cm.h,v 1.4 2019/05/06 03:45:58 mlarkin Exp $ */
/* $NetBSD: sitara_cm.h,v 1.1 2013/04/17 14:31:02 bouyer Exp $ */
/*
* Copyright (c) 2010
@@ -64,7 +64,7 @@ struct sitara_cm_device {
struct sitara_cm_padconf *padconf;
};
-int sitara_cm_padconf_set(const char *padname, const char *muxmode,
+int sitara_cm_padconf_set(const char *padname, const char *muxmode,
unsigned int state);
int sitara_cm_padconf_get(const char *padname, const char **muxmode,
unsigned int *state);
diff --git a/sys/arch/armv7/omap/ti_iic.c b/sys/arch/armv7/omap/ti_iic.c
index 8eeb6bd7fd4..84d1891cf6a 100644
--- a/sys/arch/armv7/omap/ti_iic.c
+++ b/sys/arch/armv7/omap/ti_iic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ti_iic.c,v 1.10 2016/08/19 05:25:08 jsg Exp $ */
+/* $OpenBSD: ti_iic.c,v 1.11 2019/05/06 03:45:58 mlarkin Exp $ */
/* $NetBSD: ti_iic.c,v 1.4 2013/04/25 13:04:27 rkujawa Exp $ */
/*
@@ -364,7 +364,7 @@ ti_iic_op(struct ti_iic_softc *sc, i2c_addr_t addr, ti_i2cop_t op,
int err, retry;
KASSERT(op == TI_I2CREAD || op == TI_I2CWRITE);
- DPRINTF(("ti_iic_op: addr %#x op %#x buf %p buflen %#x flags %#x\n",
+ DPRINTF(("ti_iic_op: addr %#x op %#x buf %p buflen %#x flags %#x\n",
addr, op, buf, (unsigned int) buflen, flags));
mask = I2C_IRQSTATUS_ARDY | I2C_IRQSTATUS_NACK | I2C_IRQSTATUS_AL;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 23:36:05 +0000