Module Name: src
Committed By: tnn
Date: Tue Aug 13 17:03:11 UTC 2019
Modified Files:
src/sys/arch/arm/at91: at91spi.c
src/sys/arch/arm/broadcom: bcm2835_spi.c
src/sys/arch/arm/imx: imxspi.c
src/sys/arch/arm/rockchip: rk_spi.c
src/sys/arch/arm/sunxi: sun4i_spi.c sun6i_spi.c
src/sys/arch/mips/alchemy/dev: auspi.c
src/sys/arch/mips/atheros/dev: arspi.c
src/sys/dev/marvell: mvspi.c
Log Message:
ensure spibus_attach_args is zero'ed
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/at91/at91spi.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/broadcom/bcm2835_spi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/imx/imxspi.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_spi.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/sunxi/sun4i_spi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/sunxi/sun6i_spi.c
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/mips/alchemy/dev/auspi.c
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/atheros/dev/arspi.c
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/marvell/mvspi.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/at91/at91spi.c
diff -u src/sys/arch/arm/at91/at91spi.c:1.3 src/sys/arch/arm/at91/at91spi.c:1.4
--- src/sys/arch/arm/at91/at91spi.c:1.3 Fri Jul 1 19:31:17 2011
+++ src/sys/arch/arm/at91/at91spi.c Tue Aug 13 17:03:10 2019
@@ -1,5 +1,5 @@
-/* $Id: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
-/* $NetBSD: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $ */
+/* $Id: at91spi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $ */
+/* $NetBSD: at91spi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $ */
/*-
* Copyright (c) 2007 Embedtronics Oy. All rights reserved.
@@ -46,7 +46,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.3 2011/07/01 19:31:17 dyoung Exp $");
+__KERNEL_RCSID(0, "$NetBSD: at91spi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $");
#include "locators.h"
@@ -155,6 +155,7 @@ at91spi_attach_common(device_t parent, d
aprint_error("%s: no slaves!\n", device_xname(sc->sc_dev));
}
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
/* initialize the queue */
Index: src/sys/arch/arm/broadcom/bcm2835_spi.c
diff -u src/sys/arch/arm/broadcom/bcm2835_spi.c:1.5 src/sys/arch/arm/broadcom/bcm2835_spi.c:1.6
--- src/sys/arch/arm/broadcom/bcm2835_spi.c:1.5 Sun Dec 10 21:38:26 2017
+++ src/sys/arch/arm/broadcom/bcm2835_spi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_spi.c,v 1.5 2017/12/10 21:38:26 skrll Exp $ */
+/* $NetBSD: bcm2835_spi.c,v 1.6 2019/08/13 17:03:10 tnn Exp $ */
/*
* Copyright (c) 2012 Jonathan A. Kollasch
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.5 2017/12/10 21:38:26 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bcm2835_spi.c,v 1.6 2019/08/13 17:03:10 tnn Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -135,6 +135,7 @@ bcmspi_attach(device_t parent, device_t
sc->sc_spi.sct_transfer = bcmspi_transfer;
sc->sc_spi.sct_nslaves = 3;
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
Index: src/sys/arch/arm/imx/imxspi.c
diff -u src/sys/arch/arm/imx/imxspi.c:1.3 src/sys/arch/arm/imx/imxspi.c:1.4
--- src/sys/arch/arm/imx/imxspi.c:1.3 Mon Aug 7 09:24:43 2017
+++ src/sys/arch/arm/imx/imxspi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: imxspi.c,v 1.3 2017/08/07 09:24:43 hkenken Exp $ */
+/* $NetBSD: imxspi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $ */
/*-
* Copyright (c) 2014 Genetec Corporation. All rights reserved.
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imxspi.c,v 1.3 2017/08/07 09:24:43 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxspi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $");
#include "opt_imx.h"
#include "opt_imxspi.h"
@@ -114,6 +114,7 @@ imxspi_attach_common(device_t parent, st
if (!sc->sc_spi.sct_nslaves)
aprint_error_dev(sc->sc_dev, "no slaves!\n");
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
/* initialize the queue */
Index: src/sys/arch/arm/rockchip/rk_spi.c
diff -u src/sys/arch/arm/rockchip/rk_spi.c:1.1 src/sys/arch/arm/rockchip/rk_spi.c:1.2
--- src/sys/arch/arm/rockchip/rk_spi.c:1.1 Mon Aug 5 15:22:59 2019
+++ src/sys/arch/arm/rockchip/rk_spi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_spi.c,v 1.1 2019/08/05 15:22:59 tnn Exp $ */
+/* $NetBSD: rk_spi.c,v 1.2 2019/08/13 17:03:10 tnn Exp $ */
/*
* Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.1 2019/08/05 15:22:59 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.2 2019/08/13 17:03:10 tnn Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -253,6 +253,7 @@ rk_spi_attach(device_t parent, device_t
sc->sc_spi.sct_transfer = rk_spi_transfer;
sc->sc_spi.sct_nslaves = 2;
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
Index: src/sys/arch/arm/sunxi/sun4i_spi.c
diff -u src/sys/arch/arm/sunxi/sun4i_spi.c:1.3 src/sys/arch/arm/sunxi/sun4i_spi.c:1.4
--- src/sys/arch/arm/sunxi/sun4i_spi.c:1.3 Sun Aug 4 22:26:40 2019
+++ src/sys/arch/arm/sunxi/sun4i_spi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_spi.c,v 1.3 2019/08/04 22:26:40 tnn Exp $ */
+/* $NetBSD: sun4i_spi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $ */
/*
* Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.3 2019/08/04 22:26:40 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.4 2019/08/13 17:03:10 tnn Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -151,6 +151,7 @@ sun4ispi_attach(device_t parent, device_
sc->sc_spi.sct_configure = sun4ispi_configure;
sc->sc_spi.sct_transfer = sun4ispi_transfer;
(void) of_getprop_uint32(phandle, "num-cs", &sc->sc_spi.sct_nslaves);
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
Index: src/sys/arch/arm/sunxi/sun6i_spi.c
diff -u src/sys/arch/arm/sunxi/sun6i_spi.c:1.4 src/sys/arch/arm/sunxi/sun6i_spi.c:1.5
--- src/sys/arch/arm/sunxi/sun6i_spi.c:1.4 Sun Aug 4 22:26:40 2019
+++ src/sys/arch/arm/sunxi/sun6i_spi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun6i_spi.c,v 1.4 2019/08/04 22:26:40 tnn Exp $ */
+/* $NetBSD: sun6i_spi.c,v 1.5 2019/08/13 17:03:10 tnn Exp $ */
/*
* Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun6i_spi.c,v 1.4 2019/08/04 22:26:40 tnn Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun6i_spi.c,v 1.5 2019/08/13 17:03:10 tnn Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -184,6 +184,7 @@ sun6ispi_attach(device_t parent, device_
sc->sc_spi.sct_transfer = sun6ispi_transfer;
sc->sc_spi.sct_nslaves = 4;
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
Index: src/sys/arch/mips/alchemy/dev/auspi.c
diff -u src/sys/arch/mips/alchemy/dev/auspi.c:1.8 src/sys/arch/mips/alchemy/dev/auspi.c:1.9
--- src/sys/arch/mips/alchemy/dev/auspi.c:1.8 Wed Jan 4 02:36:26 2012
+++ src/sys/arch/mips/alchemy/dev/auspi.c Tue Aug 13 17:03:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: auspi.c,v 1.8 2012/01/04 02:36:26 kiyohara Exp $ */
+/* $NetBSD: auspi.c,v 1.9 2019/08/13 17:03:10 tnn Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.8 2012/01/04 02:36:26 kiyohara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: auspi.c,v 1.9 2019/08/13 17:03:10 tnn Exp $");
#include "locators.h"
@@ -147,6 +147,7 @@ auspi_attach(device_t parent, device_t s
/* fix this! */
sc->sc_spi.sct_nslaves = sc->sc_md.am_nslaves;
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
/* enable SPI mode */
Index: src/sys/arch/mips/atheros/dev/arspi.c
diff -u src/sys/arch/mips/atheros/dev/arspi.c:1.11 src/sys/arch/mips/atheros/dev/arspi.c:1.12
--- src/sys/arch/mips/atheros/dev/arspi.c:1.11 Mon Sep 3 16:29:25 2018
+++ src/sys/arch/mips/atheros/dev/arspi.c Tue Aug 13 17:03:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: arspi.c,v 1.11 2018/09/03 16:29:25 riastradh Exp $ */
+/* $NetBSD: arspi.c,v 1.12 2019/08/13 17:03:11 tnn Exp $ */
/*-
* Copyright (c) 2006 Urbana-Champaign Independent Media Center.
@@ -42,7 +42,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.11 2018/09/03 16:29:25 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: arspi.c,v 1.12 2019/08/13 17:03:11 tnn Exp $");
#include "locators.h"
@@ -191,6 +191,7 @@ arspi_attach(device_t parent, device_t s
/*
* Initialize and attach bus attach.
*/
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
}
Index: src/sys/dev/marvell/mvspi.c
diff -u src/sys/dev/marvell/mvspi.c:1.4 src/sys/dev/marvell/mvspi.c:1.5
--- src/sys/dev/marvell/mvspi.c:1.4 Sun Oct 9 14:49:51 2016
+++ src/sys/dev/marvell/mvspi.c Tue Aug 13 17:03:10 2019
@@ -148,6 +148,7 @@ mvspi_attach(struct device *parent, stru
/*
* Initialize and attach bus attach.
*/
+ memset(&sba, 0, sizeof(sba));
sba.sba_controller = &sc->sc_spi;
(void) config_found_ia(self, "spibus", &sba, spibus_print);
}
