Module Name: src
Committed By: christos
Date: Mon Jul 16 23:11:47 UTC 2018
Modified Files:
src/sys/arch/arm/broadcom: bcm283x_platform.c
src/sys/arch/arm/fdt: psci_fdt.c
src/sys/arch/arm/nvidia: tegra210_car.c tegra210_xusbpad.c
tegra_apbdma.c tegra_cec.c tegra_com.c tegra_fuse.c tegra_gpio.c
tegra_hdaudio.c tegra_i2c.c tegra_mc.c tegra_pinmux.c tegra_pmc.c
tegra_rtc.c tegra_sdhc.c tegra_soctherm.c tegra_timer.c
tegra_usbphy.c tegra_xusb.c
src/sys/arch/arm/rockchip: rk_gmac.c
src/sys/arch/arm/sunxi: sunxi_pwm.c sunxi_rsb.c sunxi_rtc.c
Log Message:
Add missing pointer <-> integer casts
Use PRI?64 to print uint64_t instead 'll?'
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/broadcom/bcm283x_platform.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/psci_fdt.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/nvidia/tegra210_car.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/nvidia/tegra210_xusbpad.c \
src/sys/arch/arm/nvidia/tegra_com.c src/sys/arch/arm/nvidia/tegra_gpio.c \
src/sys/arch/arm/nvidia/tegra_timer.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_apbdma.c \
src/sys/arch/arm/nvidia/tegra_rtc.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/nvidia/tegra_cec.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/nvidia/tegra_fuse.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/tegra_hdaudio.c
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/nvidia/tegra_i2c.c
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/tegra_mc.c \
src/sys/arch/arm/nvidia/tegra_usbphy.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_pinmux.c
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/nvidia/tegra_pmc.c
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/nvidia/tegra_sdhc.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/nvidia/tegra_soctherm.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/nvidia/tegra_xusb.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/rockchip/rk_gmac.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/sunxi/sunxi_pwm.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sunxi_rsb.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sunxi_rtc.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/broadcom/bcm283x_platform.c
diff -u src/sys/arch/arm/broadcom/bcm283x_platform.c:1.7 src/sys/arch/arm/broadcom/bcm283x_platform.c:1.8
--- src/sys/arch/arm/broadcom/bcm283x_platform.c:1.7 Mon Jul 9 02:21:46 2018
+++ src/sys/arch/arm/broadcom/bcm283x_platform.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm283x_platform.c,v 1.7 2018/07/09 06:21:46 ryo Exp $ */
+/* $NetBSD: bcm283x_platform.c,v 1.8 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.7 2018/07/09 06:21:46 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm283x_platform.c,v 1.8 2018/07/16 23:11:47 christos Exp $");
#include "opt_arm_debug.h"
#include "opt_bcm283x.h"
@@ -616,7 +616,7 @@ bcm283x_uartinit(bus_space_tag_t iot, bu
uint32_t res;
bcm2835_mbox_write(iot, ioh, BCMMBOX_CHANARM2VC,
- KERN_VTOPHYS(&vb_uart));
+ KERN_VTOPHYS((vaddr_t)&vb_uart));
bcm2835_mbox_read(iot, ioh, BCMMBOX_CHANARM2VC, &res);
@@ -680,7 +680,8 @@ bcm283x_bootparams(bus_space_tag_t iot,
#endif
0) << 4);
- bcm2835_mbox_write(iot, ioh, BCMMBOX_CHANARM2VC, KERN_VTOPHYS(&vb));
+ bcm2835_mbox_write(iot, ioh, BCMMBOX_CHANARM2VC,
+ KERN_VTOPHYS((vaddr_t)&vb));
bcm2835_mbox_read(iot, ioh, BCMMBOX_CHANARM2VC, &res);
@@ -728,13 +729,13 @@ bcm283x_bootparams(bus_space_tag_t iot,
printf("%s: board model %x\n", __func__,
vb.vbt_boardmodel.model);
if (vcprop_tag_success_p(&vb.vbt_macaddr.tag))
- printf("%s: mac-address %llx\n", __func__,
+ printf("%s: mac-address %" PRIx64 "\n", __func__,
vb.vbt_macaddr.addr);
if (vcprop_tag_success_p(&vb.vbt_boardrev.tag))
printf("%s: board rev %x\n", __func__,
vb.vbt_boardrev.rev);
if (vcprop_tag_success_p(&vb.vbt_serial.tag))
- printf("%s: board serial %llx\n", __func__,
+ printf("%s: board serial %" PRIx64 "\n", __func__,
vb.vbt_serial.sn);
if (vcprop_tag_success_p(&vb.vbt_dmachan.tag))
printf("%s: DMA channel mask 0x%08x\n", __func__,
@@ -803,12 +804,12 @@ bcm2836_bootstrap(void)
*/
volatile uint64_t *cpu_release_addr;
#define RPI3_ARMSTUB8_SPINADDR_BASE 0x000000d8
- cpu_release_addr =
+ cpu_release_addr = (void *)
AARCH64_PA_TO_KVA(RPI3_ARMSTUB8_SPINADDR_BASE + i * 8);
- *cpu_release_addr = aarch64_kern_vtophys(aarch64_mpstart);
+ *cpu_release_addr = aarch64_kern_vtophys((vaddr_t)aarch64_mpstart);
/* need flush cache. secondary processors are cache disabled */
- cpu_dcache_wb_range(cpu_release_addr, sizeof(cpu_release_addr));
+ cpu_dcache_wb_range((vaddr_t)cpu_release_addr, sizeof(cpu_release_addr));
__asm __volatile("sev" ::: "memory");
#if defined(VERBOSE_INIT_ARM) && defined(EARLYCONS)
Index: src/sys/arch/arm/fdt/psci_fdt.c
diff -u src/sys/arch/arm/fdt/psci_fdt.c:1.9 src/sys/arch/arm/fdt/psci_fdt.c:1.10
--- src/sys/arch/arm/fdt/psci_fdt.c:1.9 Sat Jul 14 11:06:05 2018
+++ src/sys/arch/arm/fdt/psci_fdt.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: psci_fdt.c,v 1.9 2018/07/14 15:06:05 jmcneill Exp $ */
+/* $NetBSD: psci_fdt.c,v 1.10 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.9 2018/07/14 15:06:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: psci_fdt.c,v 1.10 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -168,7 +168,7 @@ psci_fdt_mpstart_pa(void)
{
#ifdef __aarch64__
extern void aarch64_mpstart(void);
- return (register_t)aarch64_kern_vtophys(aarch64_mpstart);
+ return (register_t)aarch64_kern_vtophys((vaddr_t)aarch64_mpstart);
#else
extern void cortex_mpstart(void);
return (register_t)cortex_mpstart;
Index: src/sys/arch/arm/nvidia/tegra210_car.c
diff -u src/sys/arch/arm/nvidia/tegra210_car.c:1.17 src/sys/arch/arm/nvidia/tegra210_car.c:1.18
--- src/sys/arch/arm/nvidia/tegra210_car.c:1.17 Thu Sep 28 05:44:29 2017
+++ src/sys/arch/arm/nvidia/tegra210_car.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_car.c,v 1.17 2017/09/28 09:44:29 jmcneill Exp $ */
+/* $NetBSD: tegra210_car.c,v 1.18 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.17 2017/09/28 09:44:29 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_car.c,v 1.18 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -751,7 +751,8 @@ tegra210_car_attach(device_t parent, dev
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
if (of_getprop_uint32(phandle, "#clock-cells", &sc->sc_clock_cells))
Index: src/sys/arch/arm/nvidia/tegra210_xusbpad.c
diff -u src/sys/arch/arm/nvidia/tegra210_xusbpad.c:1.8 src/sys/arch/arm/nvidia/tegra210_xusbpad.c:1.9
--- src/sys/arch/arm/nvidia/tegra210_xusbpad.c:1.8 Tue Sep 26 12:12:45 2017
+++ src/sys/arch/arm/nvidia/tegra210_xusbpad.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra210_xusbpad.c,v 1.8 2017/09/26 16:12:45 jmcneill Exp $ */
+/* $NetBSD: tegra210_xusbpad.c,v 1.9 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra210_xusbpad.c,v 1.8 2017/09/26 16:12:45 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra210_xusbpad.c,v 1.9 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -807,7 +807,8 @@ tegra210_xusbpad_attach(device_t parent,
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_com.c
diff -u src/sys/arch/arm/nvidia/tegra_com.c:1.8 src/sys/arch/arm/nvidia/tegra_com.c:1.9
--- src/sys/arch/arm/nvidia/tegra_com.c:1.8 Fri Jun 2 09:53:29 2017
+++ src/sys/arch/arm/nvidia/tegra_com.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_com.c,v 1.8 2017/06/02 13:53:29 jmcneill Exp $ */
+/* $NetBSD: tegra_com.c,v 1.9 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.8 2017/06/02 13:53:29 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: tegra_com.c,v 1.9 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -126,7 +126,8 @@ tegra_com_attach(device_t parent, device
error = bus_space_map(bst, addr, size, 0, &bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_gpio.c
diff -u src/sys/arch/arm/nvidia/tegra_gpio.c:1.8 src/sys/arch/arm/nvidia/tegra_gpio.c:1.9
--- src/sys/arch/arm/nvidia/tegra_gpio.c:1.8 Thu May 25 19:50:22 2017
+++ src/sys/arch/arm/nvidia/tegra_gpio.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_gpio.c,v 1.8 2017/05/25 23:50:22 jmcneill Exp $ */
+/* $NetBSD: tegra_gpio.c,v 1.9 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_gpio.c,v 1.8 2017/05/25 23:50:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_gpio.c,v 1.9 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -178,7 +178,8 @@ tegra_gpio_attach(device_t parent, devic
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_timer.c
diff -u src/sys/arch/arm/nvidia/tegra_timer.c:1.8 src/sys/arch/arm/nvidia/tegra_timer.c:1.9
--- src/sys/arch/arm/nvidia/tegra_timer.c:1.8 Sun Apr 1 00:35:04 2018
+++ src/sys/arch/arm/nvidia/tegra_timer.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_timer.c,v 1.8 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: tegra_timer.c,v 1.9 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_timer.c,v 1.8 2018/04/01 04:35:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_timer.c,v 1.9 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -103,7 +103,8 @@ tegra_timer_attach(device_t parent, devi
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_apbdma.c
diff -u src/sys/arch/arm/nvidia/tegra_apbdma.c:1.4 src/sys/arch/arm/nvidia/tegra_apbdma.c:1.5
--- src/sys/arch/arm/nvidia/tegra_apbdma.c:1.4 Sat Sep 23 19:58:18 2017
+++ src/sys/arch/arm/nvidia/tegra_apbdma.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_apbdma.c,v 1.4 2017/09/23 23:58:18 jmcneill Exp $ */
+/* $NetBSD: tegra_apbdma.c,v 1.5 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2017 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_apbdma.c,v 1.4 2017/09/23 23:58:18 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_apbdma.c,v 1.5 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -146,7 +146,8 @@ tegra_apbdma_attach(device_t parent, dev
sc->sc_phandle = phandle;
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
for (n = 0; n < TEGRA_APBDMA_NCHAN; n++) {
Index: src/sys/arch/arm/nvidia/tegra_rtc.c
diff -u src/sys/arch/arm/nvidia/tegra_rtc.c:1.4 src/sys/arch/arm/nvidia/tegra_rtc.c:1.5
--- src/sys/arch/arm/nvidia/tegra_rtc.c:1.4 Thu May 25 19:53:05 2017
+++ src/sys/arch/arm/nvidia/tegra_rtc.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_rtc.c,v 1.4 2017/05/25 23:53:05 jmcneill Exp $ */
+/* $NetBSD: tegra_rtc.c,v 1.5 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_rtc.c,v 1.4 2017/05/25 23:53:05 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_rtc.c,v 1.5 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,7 +99,8 @@ tegra_rtc_attach(device_t parent, device
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_cec.c
diff -u src/sys/arch/arm/nvidia/tegra_cec.c:1.3 src/sys/arch/arm/nvidia/tegra_cec.c:1.4
--- src/sys/arch/arm/nvidia/tegra_cec.c:1.3 Tue Dec 22 17:10:36 2015
+++ src/sys/arch/arm/nvidia/tegra_cec.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_cec.c,v 1.3 2015/12/22 22:10:36 jmcneill Exp $ */
+/* $NetBSD: tegra_cec.c,v 1.4 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.3 2015/12/22 22:10:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_cec.c,v 1.4 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -151,7 +151,8 @@ tegra_cec_attach(device_t parent, device
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
Index: src/sys/arch/arm/nvidia/tegra_fuse.c
diff -u src/sys/arch/arm/nvidia/tegra_fuse.c:1.5 src/sys/arch/arm/nvidia/tegra_fuse.c:1.6
--- src/sys/arch/arm/nvidia/tegra_fuse.c:1.5 Thu May 25 19:48:36 2017
+++ src/sys/arch/arm/nvidia/tegra_fuse.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_fuse.c,v 1.5 2017/05/25 23:48:36 jmcneill Exp $ */
+/* $NetBSD: tegra_fuse.c,v 1.6 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.5 2017/05/25 23:48:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.6 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -99,7 +99,8 @@ tegra_fuse_attach(device_t parent, devic
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_hdaudio.c
diff -u src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.9 src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.10
--- src/sys/arch/arm/nvidia/tegra_hdaudio.c:1.9 Wed Sep 27 06:50:06 2017
+++ src/sys/arch/arm/nvidia/tegra_hdaudio.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_hdaudio.c,v 1.9 2017/09/27 10:50:06 jmcneill Exp $ */
+/* $NetBSD: tegra_hdaudio.c,v 1.10 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.9 2017/09/27 10:50:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_hdaudio.c,v 1.10 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -145,7 +145,8 @@ tegra_hdaudio_attach(device_t parent, de
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.18 src/sys/arch/arm/nvidia/tegra_i2c.c:1.19
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.18 Sun Jul 1 17:18:00 2018
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.18 2018/07/01 21:18:00 jmcneill Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.19 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.18 2018/07/01 21:18:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.19 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,7 +136,8 @@ tegra_i2c_attach(device_t parent, device
sc->sc_cid = device_unit(self);
error = bus_space_map(sc->sc_bst, addr, size, 0, &sc->sc_bsh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
mutex_init(&sc->sc_lock, MUTEX_DEFAULT, IPL_VM);
Index: src/sys/arch/arm/nvidia/tegra_mc.c
diff -u src/sys/arch/arm/nvidia/tegra_mc.c:1.7 src/sys/arch/arm/nvidia/tegra_mc.c:1.8
--- src/sys/arch/arm/nvidia/tegra_mc.c:1.7 Fri Apr 21 17:13:04 2017
+++ src/sys/arch/arm/nvidia/tegra_mc.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_mc.c,v 1.7 2017/04/21 21:13:04 jmcneill Exp $ */
+/* $NetBSD: tegra_mc.c,v 1.8 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.7 2017/04/21 21:13:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_mc.c,v 1.8 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,8 @@ tegra_mc_attach(device_t parent, device_
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_usbphy.c
diff -u src/sys/arch/arm/nvidia/tegra_usbphy.c:1.7 src/sys/arch/arm/nvidia/tegra_usbphy.c:1.8
--- src/sys/arch/arm/nvidia/tegra_usbphy.c:1.7 Thu May 25 19:55:30 2017
+++ src/sys/arch/arm/nvidia/tegra_usbphy.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_usbphy.c,v 1.7 2017/05/25 23:55:30 jmcneill Exp $ */
+/* $NetBSD: tegra_usbphy.c,v 1.8 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.7 2017/05/25 23:55:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_usbphy.c,v 1.8 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -136,7 +136,8 @@ tegra_usbphy_attach(device_t parent, dev
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_pinmux.c
diff -u src/sys/arch/arm/nvidia/tegra_pinmux.c:1.1 src/sys/arch/arm/nvidia/tegra_pinmux.c:1.2
--- src/sys/arch/arm/nvidia/tegra_pinmux.c:1.1 Fri Sep 22 10:36:22 2017
+++ src/sys/arch/arm/nvidia/tegra_pinmux.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $ */
+/* $NetBSD: tegra_pinmux.c,v 1.2 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "opt_tegra.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pinmux.c,v 1.1 2017/09/22 14:36:22 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pinmux.c,v 1.2 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -250,7 +250,8 @@ tegra_pinmux_attach(device_t parent, dev
}
error = bus_space_map(sc->sc_bst, addr, size, res, &sc->sc_bsh[res]);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
}
Index: src/sys/arch/arm/nvidia/tegra_pmc.c
diff -u src/sys/arch/arm/nvidia/tegra_pmc.c:1.12 src/sys/arch/arm/nvidia/tegra_pmc.c:1.13
--- src/sys/arch/arm/nvidia/tegra_pmc.c:1.12 Sun Apr 1 00:35:04 2018
+++ src/sys/arch/arm/nvidia/tegra_pmc.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_pmc.c,v 1.12 2018/04/01 04:35:04 ryo Exp $ */
+/* $NetBSD: tegra_pmc.c,v 1.13 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.12 2018/04/01 04:35:04 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_pmc.c,v 1.13 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -87,7 +87,8 @@ tegra_pmc_attach(device_t parent, device
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_sdhc.c
diff -u src/sys/arch/arm/nvidia/tegra_sdhc.c:1.21 src/sys/arch/arm/nvidia/tegra_sdhc.c:1.22
--- src/sys/arch/arm/nvidia/tegra_sdhc.c:1.21 Thu Jul 20 21:00:58 2017
+++ src/sys/arch/arm/nvidia/tegra_sdhc.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_sdhc.c,v 1.21 2017/07/21 01:00:58 jmcneill Exp $ */
+/* $NetBSD: tegra_sdhc.c,v 1.22 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -31,7 +31,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.21 2017/07/21 01:00:58 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_sdhc.c,v 1.22 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -128,7 +128,8 @@ tegra_sdhc_attach(device_t parent, devic
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
sc->sc_bsz = size;
Index: src/sys/arch/arm/nvidia/tegra_soctherm.c
diff -u src/sys/arch/arm/nvidia/tegra_soctherm.c:1.6 src/sys/arch/arm/nvidia/tegra_soctherm.c:1.7
--- src/sys/arch/arm/nvidia/tegra_soctherm.c:1.6 Fri Jul 21 14:25:25 2017
+++ src/sys/arch/arm/nvidia/tegra_soctherm.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_soctherm.c,v 1.6 2017/07/21 18:25:25 jmcneill Exp $ */
+/* $NetBSD: tegra_soctherm.c,v 1.7 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_soctherm.c,v 1.6 2017/07/21 18:25:25 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_soctherm.c,v 1.7 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -206,7 +206,8 @@ tegra_soctherm_attach(device_t parent, d
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/nvidia/tegra_xusb.c
diff -u src/sys/arch/arm/nvidia/tegra_xusb.c:1.14 src/sys/arch/arm/nvidia/tegra_xusb.c:1.15
--- src/sys/arch/arm/nvidia/tegra_xusb.c:1.14 Sun Jul 1 06:46:02 2018
+++ src/sys/arch/arm/nvidia/tegra_xusb.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_xusb.c,v 1.14 2018/07/01 10:46:02 jmcneill Exp $ */
+/* $NetBSD: tegra_xusb.c,v 1.15 2018/07/16 23:11:47 christos Exp $ */
/*
* Copyright (c) 2016 Jonathan A. Kollasch
@@ -30,7 +30,7 @@
#include "opt_tegra.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.14 2018/07/01 10:46:02 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_xusb.c,v 1.15 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -190,10 +190,11 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &sc->sc_ioh);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#llx\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "fpci", &addr, &size) != 0) {
aprint_error(": couldn't get registers\n");
@@ -201,10 +202,11 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_fpci);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#llx\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
if (fdtbus_get_reg_byname(faa->faa_phandle, "ipfs", &addr, &size) != 0) {
aprint_error(": couldn't get registers\n");
@@ -212,10 +214,11 @@ tegra_xusb_attach(device_t parent, devic
}
error = bus_space_map(sc->sc_iot, addr, size, 0, &psc->sc_bsh_ipfs);
if (error) {
- aprint_error(": couldn't map %#llx: %d", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
- DPRINTF(sc->sc_dev, "mapped %#llx\n", (uint64_t)addr);
+ DPRINTF(sc->sc_dev, "mapped %#" PRIx64 "\n", (uint64_t)addr);
if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
aprint_error_dev(self, "failed to decode interrupt\n");
Index: src/sys/arch/arm/rockchip/rk_gmac.c
diff -u src/sys/arch/arm/rockchip/rk_gmac.c:1.6 src/sys/arch/arm/rockchip/rk_gmac.c:1.7
--- src/sys/arch/arm/rockchip/rk_gmac.c:1.6 Sat Jun 30 14:27:10 2018
+++ src/sys/arch/arm/rockchip/rk_gmac.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_gmac.c,v 1.6 2018/06/30 18:27:10 jmcneill Exp $ */
+/* $NetBSD: rk_gmac.c,v 1.7 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.6 2018/06/30 18:27:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_gmac.c,v 1.7 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -144,6 +144,7 @@ static void
rk3328_gmac_set_speed_rgmii(struct dwc_gmac_softc *sc, int speed)
{
struct rk_gmac_softc * const rk_sc = (struct rk_gmac_softc *)sc;
+#if 0
u_int clksel;
switch (speed) {
@@ -157,6 +158,7 @@ rk3328_gmac_set_speed_rgmii(struct dwc_g
clksel = RK3328_GRF_MAC_CON1_CLKSEL_125M;
break;
}
+#endif
syscon_lock(rk_sc->sc_syscon);
syscon_write_4(rk_sc->sc_syscon, RK3328_GRF_MAC_CON1,
Index: src/sys/arch/arm/sunxi/sunxi_pwm.c
diff -u src/sys/arch/arm/sunxi/sunxi_pwm.c:1.1 src/sys/arch/arm/sunxi/sunxi_pwm.c:1.2
--- src/sys/arch/arm/sunxi/sunxi_pwm.c:1.1 Sun May 6 06:34:34 2018
+++ src/sys/arch/arm/sunxi/sunxi_pwm.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_pwm.c,v 1.1 2018/05/06 10:34:34 jmcneill Exp $ */
+/* $NetBSD: sunxi_pwm.c,v 1.2 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill <[email protected]>
@@ -28,7 +28,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sunxi_pwm.c,v 1.1 2018/05/06 10:34:34 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sunxi_pwm.c,v 1.2 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -213,7 +213,8 @@ sunxi_pwm_attach(device_t parent, device
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", (uint64_t)addr, error);
+ aprint_error(": couldn't map %#" PRIx64 ": %d",
+ (uint64_t)addr, error);
return;
}
Index: src/sys/arch/arm/sunxi/sunxi_rsb.c
diff -u src/sys/arch/arm/sunxi/sunxi_rsb.c:1.4 src/sys/arch/arm/sunxi/sunxi_rsb.c:1.5
--- src/sys/arch/arm/sunxi/sunxi_rsb.c:1.4 Mon Jul 9 06:24:44 2018
+++ src/sys/arch/arm/sunxi/sunxi_rsb.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rsb.c,v 1.4 2018/07/09 10:24:44 jmcneill Exp $ */
+/* $NetBSD: sunxi_rsb.c,v 1.5 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.4 2018/07/09 10:24:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rsb.c,v 1.5 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -283,8 +283,8 @@ sunxi_rsb_wait(struct sunxi_rsb_softc *s
return EBUSY;
}
if (sc->sc_stat & RSB_STAT_TRANS_ERR) {
- device_printf(sc->sc_dev, "transfer error, id 0x%02llx\n",
- __SHIFTOUT(sc->sc_stat, RSB_STAT_TRANS_ERR_ID));
+ device_printf(sc->sc_dev, "transfer error, id 0x%02" PRIx64
+ "\n", __SHIFTOUT(sc->sc_stat, RSB_STAT_TRANS_ERR_ID));
return EIO;
}
Index: src/sys/arch/arm/sunxi/sunxi_rtc.c
diff -u src/sys/arch/arm/sunxi/sunxi_rtc.c:1.3 src/sys/arch/arm/sunxi/sunxi_rtc.c:1.4
--- src/sys/arch/arm/sunxi/sunxi_rtc.c:1.3 Sun Oct 8 10:03:46 2017
+++ src/sys/arch/arm/sunxi/sunxi_rtc.c Mon Jul 16 19:11:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_rtc.c,v 1.3 2017/10/08 14:03:46 jmcneill Exp $ */
+/* $NetBSD: sunxi_rtc.c,v 1.4 2018/07/16 23:11:47 christos Exp $ */
/*-
* Copyright (c) 2014-2017 Jared McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_rtc.c,v 1.3 2017/10/08 14:03:46 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_rtc.c,v 1.4 2018/07/16 23:11:47 christos Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -226,14 +226,14 @@ sunxi_rtc_settime(todr_chip_handle_t tch
* Sanity check the date before writing it back
*/
if (dt->dt_year < conf->base_year) {
- aprint_normal_dev(sc->sc_dev, "year pre the epoch: %llu, "
- "not writing back time\n", dt->dt_year);
+ aprint_normal_dev(sc->sc_dev, "year pre the epoch: %" PRIu64
+ ", not writing back time\n", dt->dt_year);
return EIO;
}
maxyear = __SHIFTOUT(0xffffffff, conf->year) + conf->base_year;
if (dt->dt_year > maxyear) {
aprint_normal_dev(sc->sc_dev, "year exceeds available field:"
- " %llu, not writing back time\n", dt->dt_year);
+ " %" PRIu64 ", not writing back time\n", dt->dt_year);
return EIO;
}
