Module Name: src
Committed By: thorpej
Date: Tue Jan 18 00:14:20 UTC 2022
Modified Files:
src/sys/arch/arm/imx [thorpej-i2c-spi-conf2]: imxspi.c
src/sys/arch/arm/rockchip [thorpej-i2c-spi-conf2]: rk_spi.c
src/sys/arch/arm/sunxi [thorpej-i2c-spi-conf2]: sun4i_spi.c
src/sys/dev/fdt [thorpej-i2c-spi-conf2]: fdtvar.h files.fdt
Removed Files:
src/sys/dev/fdt [thorpej-i2c-spi-conf2]: fdt_spi.c
Log Message:
G/C fdtbus_register_spi_controller(); it serves no purpose in the new
universe.
To generate a diff of this commit:
cvs rdiff -u -r1.9.2.1 -r1.9.2.2 src/sys/arch/arm/imx/imxspi.c
cvs rdiff -u -r1.7.8.1 -r1.7.8.2 src/sys/arch/arm/rockchip/rk_spi.c
cvs rdiff -u -r1.7.14.1 -r1.7.14.2 src/sys/arch/arm/sunxi/sun4i_spi.c
cvs rdiff -u -r1.3.2.1 -r0 src/sys/dev/fdt/fdt_spi.c
cvs rdiff -u -r1.70.12.1 -r1.70.12.2 src/sys/dev/fdt/fdtvar.h
cvs rdiff -u -r1.61 -r1.61.10.1 src/sys/dev/fdt/files.fdt
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/imxspi.c
diff -u src/sys/arch/arm/imx/imxspi.c:1.9.2.1 src/sys/arch/arm/imx/imxspi.c:1.9.2.2
--- src/sys/arch/arm/imx/imxspi.c:1.9.2.1 Mon Aug 9 00:30:07 2021
+++ src/sys/arch/arm/imx/imxspi.c Tue Jan 18 00:14:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: imxspi.c,v 1.9.2.1 2021/08/09 00:30:07 thorpej Exp $ */
+/* $NetBSD: imxspi.c,v 1.9.2.2 2022/01/18 00:14:20 thorpej 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.9.2.1 2021/08/09 00:30:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imxspi.c,v 1.9.2.2 2022/01/18 00:14:20 thorpej Exp $");
#include "opt_imxspi.h"
#include "opt_fdt.h"
@@ -52,10 +52,6 @@ __KERNEL_RCSID(0, "$NetBSD: imxspi.c,v 1
#include <arm/imx/imxspivar.h>
#include <arm/imx/imxspireg.h>
-#ifdef FDT
-#include <dev/fdt/fdtvar.h>
-#endif
-
/* SPI service routines */
static int imxspi_configure_enhanced(void *, int, int, int);
static int imxspi_configure(void *, int, int, int);
@@ -123,11 +119,6 @@ imxspi_attach_common(device_t self)
WRITE_REG(sc, PERIODREG, 0x0);
-#ifdef FDT
- KASSERT(sc->sc_phandle != 0);
-
- fdtbus_register_spi_controller(&sc->sc_spi, sc->sc_phandle);
-#endif
struct spibus_attach_args sba = {
.sba_controller = &sc->sc_spi,
};
@@ -413,4 +404,3 @@ imxspi_transfer(void *arg, struct spi_tr
return 0;
}
-
Index: src/sys/arch/arm/rockchip/rk_spi.c
diff -u src/sys/arch/arm/rockchip/rk_spi.c:1.7.8.1 src/sys/arch/arm/rockchip/rk_spi.c:1.7.8.2
--- src/sys/arch/arm/rockchip/rk_spi.c:1.7.8.1 Mon Aug 9 00:30:07 2021
+++ src/sys/arch/arm/rockchip/rk_spi.c Tue Jan 18 00:14:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_spi.c,v 1.7.8.1 2021/08/09 00:30:07 thorpej Exp $ */
+/* $NetBSD: rk_spi.c,v 1.7.8.2 2022/01/18 00:14:20 thorpej 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.7.8.1 2021/08/09 00:30:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_spi.c,v 1.7.8.2 2022/01/18 00:14:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -251,8 +251,6 @@ rk_spi_attach(device_t parent, device_t
sc->sc_spi.sct_transfer = rk_spi_transfer;
sc->sc_spi.sct_nslaves = 2;
- fdtbus_register_spi_controller(&sc->sc_spi, phandle);
-
struct spibus_attach_args sba = {
.sba_controller = &sc->sc_spi,
};
Index: src/sys/arch/arm/sunxi/sun4i_spi.c
diff -u src/sys/arch/arm/sunxi/sun4i_spi.c:1.7.14.1 src/sys/arch/arm/sunxi/sun4i_spi.c:1.7.14.2
--- src/sys/arch/arm/sunxi/sun4i_spi.c:1.7.14.1 Mon Aug 9 00:30:07 2021
+++ src/sys/arch/arm/sunxi/sun4i_spi.c Tue Jan 18 00:14:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: sun4i_spi.c,v 1.7.14.1 2021/08/09 00:30:07 thorpej Exp $ */
+/* $NetBSD: sun4i_spi.c,v 1.7.14.2 2022/01/18 00:14:20 thorpej Exp $ */
/*
* Copyright (c) 2019 Tobias Nygren
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.7.14.1 2021/08/09 00:30:07 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sun4i_spi.c,v 1.7.14.2 2022/01/18 00:14:20 thorpej Exp $");
#include <sys/param.h>
#include <sys/device.h>
@@ -152,8 +152,6 @@ sun4ispi_attach(device_t parent, device_
sc->sc_spi.sct_transfer = sun4ispi_transfer;
(void) of_getprop_uint32(phandle, "num-cs", &sc->sc_spi.sct_nslaves);
- fdtbus_register_spi_controller(&sc->sc_spi, phandle);
-
struct spibus_attach_args sba = {
.sba_controller = &sc->sc_spi,
};
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.70.12.1 src/sys/dev/fdt/fdtvar.h:1.70.12.2
--- src/sys/dev/fdt/fdtvar.h:1.70.12.1 Mon Aug 9 00:30:09 2021
+++ src/sys/dev/fdt/fdtvar.h Tue Jan 18 00:14:20 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.70.12.1 2021/08/09 00:30:09 thorpej Exp $ */
+/* $NetBSD: fdtvar.h,v 1.70.12.2 2022/01/18 00:14:20 thorpej Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <jmcne...@invisible.ca>
@@ -35,7 +35,6 @@
#include <sys/termios.h>
#include <dev/i2c/i2cvar.h>
-#include <dev/spi/spivar.h>
#include <dev/pwm/pwmvar.h>
#include <dev/clk/clk.h>
@@ -271,7 +270,6 @@ struct fdt_dma_range {
int fdtbus_register_interrupt_controller(device_t, int,
const struct fdtbus_interrupt_controller_func *);
int fdtbus_register_i2c_controller(i2c_tag_t, int);
-int fdtbus_register_spi_controller(struct spi_controller *, int);
int fdtbus_register_gpio_controller(device_t, int,
const struct fdtbus_gpio_controller_func *);
int fdtbus_register_pinctrl_config(device_t, int,
Index: src/sys/dev/fdt/files.fdt
diff -u src/sys/dev/fdt/files.fdt:1.61 src/sys/dev/fdt/files.fdt:1.61.10.1
--- src/sys/dev/fdt/files.fdt:1.61 Mon Apr 26 15:02:29 2021
+++ src/sys/dev/fdt/files.fdt Tue Jan 18 00:14:20 2022
@@ -1,4 +1,4 @@
-# $NetBSD: files.fdt,v 1.61 2021/04/26 15:02:29 thorpej Exp $
+# $NetBSD: files.fdt,v 1.61.10.1 2022/01/18 00:14:20 thorpej Exp $
include "external/bsd/libfdt/conf/files.libfdt"
@@ -80,7 +80,6 @@ file dev/fdt/fdt_pwm.c fdt
file dev/fdt/fdt_regulator.c fdt
file dev/fdt/fdt_reset.c fdt
file dev/fdt/fdt_rtc.c fdt
-file dev/fdt/fdt_spi.c fdt
file dev/fdt/fdt_syscon.c fdt
file dev/fdt/fdt_pinctrl.c fdt
