diff options
author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-01-19 18:04:44 +0000 |
---|---|---|
committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2021-01-19 18:04:44 +0000 |
commit | f6270c2f79688843f6ad2eacba371d7d64ea3307 (patch) | |
tree | 2fb8847b17952b1db3157416a7803c5b17716add | |
parent | e2a9fbe53d99c36f7375b6323252317c0a797696 (diff) |
s/KHZ/kHz/ and reduce dmesg spam a bit
ok tb@, deraadt@
-rw-r--r-- | sys/arch/arm/cortex/agtimer.c | 8 | ||||
-rw-r--r-- | sys/arch/arm/cortex/amptimer.c | 8 | ||||
-rw-r--r-- | sys/arch/armv7/omap/amdisplay.c | 6 | ||||
-rw-r--r-- | sys/arch/armv7/omap/dmtimer.c | 4 | ||||
-rw-r--r-- | sys/arch/armv7/omap/gptimer.c | 4 | ||||
-rw-r--r-- | sys/arch/armv7/omap/ommmc.c | 6 | ||||
-rw-r--r-- | sys/arch/armv7/omap/prcm.c | 4 | ||||
-rw-r--r-- | sys/arch/armv7/sunxi/sxitimer.c | 6 |
8 files changed, 23 insertions, 23 deletions
diff --git a/sys/arch/arm/cortex/agtimer.c b/sys/arch/arm/cortex/agtimer.c index 5afed73b59f..a2bb0be956d 100644 --- a/sys/arch/arm/cortex/agtimer.c +++ b/sys/arch/arm/cortex/agtimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: agtimer.c,v 1.10 2020/07/12 20:36:37 naddy Exp $ */ +/* $OpenBSD: agtimer.c,v 1.11 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Patrick Wildt <patrick@blueri.se> @@ -154,7 +154,7 @@ agtimer_attach(struct device *parent, struct device *self, void *aux) OF_getpropint(sc->sc_node, "clock-frequency", agtimer_frequency); sc->sc_ticks_per_second = agtimer_frequency; - printf(": tick rate %d KHz\n", sc->sc_ticks_per_second /1000); + printf(": %d kHz\n", sc->sc_ticks_per_second / 1000); /* XXX: disable user access */ @@ -263,8 +263,8 @@ agtimer_set_clockrate(int32_t new_frequency) sc->sc_ticks_per_second = agtimer_frequency; agtimer_timecounter.tc_frequency = sc->sc_ticks_per_second; - printf("agtimer0: adjusting clock: new tick rate %d KHz\n", - sc->sc_ticks_per_second /1000); + printf("agtimer0: adjusting clock: new rate %d kHz\n", + sc->sc_ticks_per_second / 1000); } void diff --git a/sys/arch/arm/cortex/amptimer.c b/sys/arch/arm/cortex/amptimer.c index 546196c5473..7f85f00b312 100644 --- a/sys/arch/arm/cortex/amptimer.c +++ b/sys/arch/arm/cortex/amptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amptimer.c,v 1.9 2020/07/14 15:34:14 patrick Exp $ */ +/* $OpenBSD: amptimer.c,v 1.10 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2011 Dale Rahn <drahn@openbsd.org> * @@ -169,7 +169,7 @@ amptimer_attach(struct device *parent, struct device *self, void *args) panic("amptimer_attach: bus_space_map priv timer failed!"); sc->sc_ticks_per_second = amptimer_frequency; - printf(": tick rate %d KHz\n", sc->sc_ticks_per_second /1000); + printf(": %d kHz\n", sc->sc_ticks_per_second / 1000); sc->sc_ioh = ioh; sc->sc_pioh = pioh; @@ -331,8 +331,8 @@ amptimer_set_clockrate(int32_t new_frequency) sc->sc_ticks_per_second = amptimer_frequency; amptimer_timecounter.tc_frequency = sc->sc_ticks_per_second; - printf("amptimer0: adjusting clock: new tick rate %d KHz\n", - sc->sc_ticks_per_second /1000); + printf("amptimer0: adjusting clock: new rate %d kHz\n", + sc->sc_ticks_per_second / 1000); } void diff --git a/sys/arch/armv7/omap/amdisplay.c b/sys/arch/armv7/omap/amdisplay.c index 8837cc294c0..eed93564ab8 100644 --- a/sys/arch/armv7/omap/amdisplay.c +++ b/sys/arch/armv7/omap/amdisplay.c @@ -1,4 +1,4 @@ -/* $OpenBSD: amdisplay.c,v 1.12 2020/05/25 09:55:48 jsg Exp $ */ +/* $OpenBSD: amdisplay.c,v 1.13 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2016 Ian Sutton <ians@openbsd.org> * @@ -47,7 +47,7 @@ int lcd_dbg_thresh = 20; #define DEVNAME(_s) ((_s)->sc_dev.dv_xname) -#define LCD_MAX_PELCLK 170000 /* KHz */ +#define LCD_MAX_PELCLK 170000 /* kHz */ #define LCD_MASTER_OSC 24000000 /* Hz */ #define LCD_M1_MAX 2048 #define LCD_M2_MAX 31 @@ -236,7 +236,7 @@ amdisplay_attach(struct device *parent, struct device *self, void *args) } i = 0; - printf("%s: %s :: %d KHz pclk\n", DEVNAME(sc), + printf("%s: %s :: %d kHz pclk\n", DEVNAME(sc), sc->sc_active_mode->name, sc->sc_active_mode->dot_clock); pel_clk *= 2000; diff --git a/sys/arch/armv7/omap/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c index f636c11ab0a..ddb4c859d65 100644 --- a/sys/arch/armv7/omap/dmtimer.c +++ b/sys/arch/armv7/omap/dmtimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: dmtimer.c,v 1.8 2019/05/06 03:45:58 mlarkin Exp $ */ +/* $OpenBSD: dmtimer.c,v 1.9 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Raphael Graf <r@undefined.ch> @@ -286,7 +286,7 @@ dmtimer_intr(void *frame) /* * would be interesting to play with trigger mode while having one timer - * in 32KHz mode, and the other timer running in sysclk mode and use + * in 32kHz mode, and the other timer running in sysclk mode and use * the high resolution speeds (matters more for delay than tick timer */ diff --git a/sys/arch/armv7/omap/gptimer.c b/sys/arch/armv7/omap/gptimer.c index edfa712bf21..5dc8c185a58 100644 --- a/sys/arch/armv7/omap/gptimer.c +++ b/sys/arch/armv7/omap/gptimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gptimer.c,v 1.10 2021/01/19 12:29:07 kettenis Exp $ */ +/* $OpenBSD: gptimer.c,v 1.11 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -270,7 +270,7 @@ gptimer_intr(void *frame) /* * would be interesting to play with trigger mode while having one timer - * in 32KHz mode, and the other timer running in sysclk mode and use + * in 32kHz mode, and the other timer running in sysclk mode and use * the high resolution speeds (matters more for delay than tick timer */ diff --git a/sys/arch/armv7/omap/ommmc.c b/sys/arch/armv7/omap/ommmc.c index 1a00cf32f70..84565f7fce2 100644 --- a/sys/arch/armv7/omap/ommmc.c +++ b/sys/arch/armv7/omap/ommmc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ommmc.c,v 1.37 2020/07/05 06:56:34 jsg Exp $ */ +/* $OpenBSD: ommmc.c,v 1.38 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2009 Dale Rahn <drahn@openbsd.org> @@ -199,7 +199,7 @@ struct ommmc_softc { struct device *sdmmc; /* generic SD/MMC device */ int clockbit; /* clock control bit */ - uint32_t clkbase; /* base clock frequency in KHz */ + uint32_t clkbase; /* base clock frequency in kHz */ int maxblklen; /* maximum block length */ int flags; /* flags for this host */ uint32_t ocr; /* OCR value from capabilities */ @@ -687,7 +687,7 @@ ommmc_bus_power(sdmmc_chipset_handle_t sch, uint32_t ocr) /* * Return the smallest possible base clock frequency divisor value - * for the CLOCK_CTL register to produce `freq' (KHz). + * for the CLOCK_CTL register to produce `freq' (kHz). */ static int ommmc_clock_divisor(struct ommmc_softc *sc, uint32_t freq) diff --git a/sys/arch/armv7/omap/prcm.c b/sys/arch/armv7/omap/prcm.c index 8032f06a30d..c0e2bd7dad7 100644 --- a/sys/arch/armv7/omap/prcm.c +++ b/sys/arch/armv7/omap/prcm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: prcm.c,v 1.14 2020/04/05 13:11:13 kettenis Exp $ */ +/* $OpenBSD: prcm.c,v 1.15 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * @@ -75,7 +75,7 @@ uint32_t prcm_imask_addr[PRCM_REG_MAX]; uint32_t prcm_fmask_addr[PRCM_REG_MAX]; #define SYS_CLK 13 /* SYS_CLK speed in MHz */ -#define PRCM_AM335X_MASTER_OSC 24000 /* KHz */ +#define PRCM_AM335X_MASTER_OSC 24000 /* kHz */ struct prcm_softc { diff --git a/sys/arch/armv7/sunxi/sxitimer.c b/sys/arch/armv7/sunxi/sxitimer.c index 24c6b551a7c..a1172f6043d 100644 --- a/sys/arch/armv7/sunxi/sxitimer.c +++ b/sys/arch/armv7/sunxi/sxitimer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: sxitimer.c,v 1.14 2020/07/06 13:33:07 pirofti Exp $ */ +/* $OpenBSD: sxitimer.c,v 1.15 2021/01/19 18:04:43 kettenis Exp $ */ /* * Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org> * Copyright (c) 2013 Raphael Graf <r@undefined.ch> @@ -212,7 +212,7 @@ sxitimer_attach(struct device *parent, struct device *self, void *aux) arm_clock_register(sxitimer_cpu_initclocks, sxitimer_delay, sxitimer_setstatclockrate, NULL); - printf(": cntrtimer @ %dKHz", freq / 1000); + printf(": %d kHz", freq / 1000); bus_space_write_4(sxitimer_iot, sxitimer_ioh, TIMER_INTV(CNTRTIMER), ival); @@ -222,7 +222,7 @@ sxitimer_attach(struct device *parent, struct device *self, void *aux) /* * would be interesting to play with trigger mode while having one timer - * in 32KHz mode, and the other timer running in sysclk mode and use + * in 32kHz mode, and the other timer running in sysclk mode and use * the high resolution speeds (matters more for delay than tick timer) */ |