Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/arm/samsung Delete chipid and sysmmu drivers, they ...



details:   https://anonhg.NetBSD.org/src/rev/cd3dc7a82b45
branches:  trunk
changeset: 323811:cd3dc7a82b45
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Sun Jul 01 23:28:40 2018 +0000

description:
Delete chipid and sysmmu drivers, they don't do anything but print that
they are not implemented at attach time.

diffstat:

 sys/arch/arm/samsung/exynos_chipid.c |  104 ---------------------------
 sys/arch/arm/samsung/exynos_sysmmu.c |  131 -----------------------------------
 sys/arch/arm/samsung/files.exynos    |   12 +--
 3 files changed, 1 insertions(+), 246 deletions(-)

diffs (269 lines):

diff -r 718e160649a7 -r cd3dc7a82b45 sys/arch/arm/samsung/exynos_chipid.c
--- a/sys/arch/arm/samsung/exynos_chipid.c      Sun Jul 01 23:27:43 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*     $NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $ */
-
-/*-
-* Copyright (c) 2015 The NetBSD Foundation, Inc.
-* All rights reserved.
-*
-* This code is derived from software contributed to The NetBSD Foundation
-* by Marty Fouts
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "opt_exynos.h"
-#include "opt_arm_debug.h"
-#include "gpio.h"
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_chipid.c,v 1.2 2015/12/21 04:58:50 marty Exp $");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/device.h>
-#include <sys/intr.h>
-#include <sys/systm.h>
-#include <sys/kmem.h>
-#include <sys/gpio.h>
-
-#include <dev/gpio/gpiovar.h>
-
-#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_intr.h>
-
-#include <dev/fdt/fdtvar.h>
-
-struct exynos_chipid_softc {
-       device_t                sc_dev;
-       bus_space_tag_t         sc_bst;
-       bus_space_handle_t      sc_bsh;
-
-};
-
-static int exynos_chipid_match(device_t, cfdata_t, void *);
-static void exynos_chipid_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(exynos_chipid, sizeof(struct exynos_chipid_softc),
-       exynos_chipid_match, exynos_chipid_attach, NULL, NULL);
-
-static int
-exynos_chipid_match(device_t parent, cfdata_t cf, void *aux)
-{
-       const char * const compatible[] = { "samsung,exynos4210-chipid",
-                                           NULL };
-       struct fdt_attach_args * const faa = aux;
-       return of_match_compatible(faa->faa_phandle, compatible);
-}
-
-static void
-exynos_chipid_attach(device_t parent, device_t self, void *aux)
-{
-       struct exynos_chipid_softc * const sc
-               = kmem_zalloc(sizeof(*sc), KM_SLEEP);
-       struct fdt_attach_args * const faa = aux;
-       bus_addr_t addr;
-       bus_size_t size;
-       int error;
-
-       if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
-               aprint_error(": couldn't get registers\n");
-               return;
-       }
-
-       sc->sc_dev = self;
-       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);
-               return;
-       }
-
-       aprint_normal(" @ 0x%08x: CHIPID -  NOT IMPLEMENTED", (uint)addr);
-       aprint_naive("\n");
-       aprint_normal("\n");
-
-}
diff -r 718e160649a7 -r cd3dc7a82b45 sys/arch/arm/samsung/exynos_sysmmu.c
--- a/sys/arch/arm/samsung/exynos_sysmmu.c      Sun Jul 01 23:27:43 2018 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,131 +0,0 @@
-/*     $NetBSD: exynos_sysmmu.c,v 1.2 2017/06/19 23:08:05 jmcneill Exp $ */
-
-/*-
-* Copyright (c) 2015 The NetBSD Foundation, Inc.
-* All rights reserved.
-*
-* This code is derived from software contributed to The NetBSD Foundation
-* by Marty Fouts
-*
-* Redistribution and use in source and binary forms, with or without
-* modification, are permitted provided that the following conditions
-* are met:
-* 1. Redistributions of source code must retain the above copyright
-*    notice, this list of conditions and the following disclaimer.
-* 2. Redistributions in binary form must reproduce the above copyright
-*    notice, this list of conditions and the following disclaimer in the
-*    documentation and/or other materials provided with the distribution.
-*
-* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
-* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-* PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
-* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-* POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include "opt_exynos.h"
-#include "opt_arm_debug.h"
-#include "gpio.h"
-
-#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_sysmmu.c,v 1.2 2017/06/19 23:08:05 jmcneill Exp $");
-
-#include <sys/param.h>
-#include <sys/bus.h>
-#include <sys/device.h>
-#include <sys/intr.h>
-#include <sys/systm.h>
-#include <sys/kmem.h>
-#include <sys/gpio.h>
-
-#include <dev/gpio/gpiovar.h>
-
-#include <arm/samsung/exynos_reg.h>
-#include <arm/samsung/exynos_intr.h>
-
-#include <dev/fdt/fdtvar.h>
-
-struct exynos_sysmmu_softc {
-       device_t                sc_dev;
-       bus_space_tag_t         sc_bst;
-       bus_space_handle_t      sc_bsh;
-       void *                  sc_ih;
-
-};
-
-static int exynos_sysmmu_match(device_t, cfdata_t, void *);
-static void exynos_sysmmu_attach(device_t, device_t, void *);
-
-static int     exynos_sysmmu_intr(void *);
-
-CFATTACH_DECL_NEW(exynos_sysmmu, sizeof(struct exynos_sysmmu_softc),
-       exynos_sysmmu_match, exynos_sysmmu_attach, NULL, NULL);
-
-static int
-exynos_sysmmu_match(device_t parent, cfdata_t cf, void *aux)
-{
-       const char * const compatible[] = { "samsung,exynos-sysmmu",
-                                           NULL };
-       struct fdt_attach_args * const faa = aux;
-       return of_match_compatible(faa->faa_phandle, compatible);
-}
-
-static void
-exynos_sysmmu_attach(device_t parent, device_t self, void *aux)
-{
-       struct exynos_sysmmu_softc * const sc
-               = kmem_zalloc(sizeof(*sc), KM_SLEEP);
-       struct fdt_attach_args * const faa = aux;
-
-       char intrstr[128];
-       bus_addr_t addr;
-       bus_size_t size;
-       int error;
-
-       if (fdtbus_get_reg(faa->faa_phandle, 0, &addr, &size) != 0) {
-               aprint_error(": couldn't get registers\n");
-               return;
-       }
-
-       sc->sc_dev = self;
-       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);
-               return;
-       }
-
-       aprint_normal(" @ 0x%08x: SYSMMU -  NOT IMPLEMENTED", (uint)addr);
-       aprint_naive("\n");
-       aprint_normal("\n");
-
-       if (!fdtbus_intr_str(faa->faa_phandle, 0, intrstr, sizeof(intrstr))) {
-               aprint_error_dev(self, "failed to decode interrupt\n");
-               return;
-       }
-
-       sc->sc_ih = fdtbus_intr_establish(faa->faa_phandle, 0, IPL_VM,
-           FDT_INTR_MPSAFE, exynos_sysmmu_intr, sc);
-       if (sc->sc_ih == NULL) {
-               aprint_error_dev(self, "couldn't establish interrupt on %s\n",
-                   intrstr);
-               return;
-       }
-       aprint_normal_dev(self, "interrupting on %s\n", intrstr);
-
-
-}
-
-static int
-exynos_sysmmu_intr(void *priv)
-{
-       printf("%s: Unexpected interrupt\n", __func__);
-       return 0;
-}
diff -r 718e160649a7 -r cd3dc7a82b45 sys/arch/arm/samsung/files.exynos
--- a/sys/arch/arm/samsung/files.exynos Sun Jul 01 23:27:43 2018 +0000
+++ b/sys/arch/arm/samsung/files.exynos Sun Jul 01 23:28:40 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: files.exynos,v 1.25 2018/03/17 18:34:09 ryo Exp $
+#      $NetBSD: files.exynos,v 1.26 2018/07/01 23:28:40 jmcneill Exp $
 #
 # Configuration info for Samsung Exynos SoC ARM Peripherals
 #
@@ -50,16 +50,6 @@
 attach  exyointr at fdt with exynos_intr
 file   arch/arm/samsung/exynos_combiner.c      exynos_intr
 
-# CHIP ID register
-device chipid : fdtbus
-attach chipid at fdt with exynos_chipid
-file   arch/arm/samsung/exynos_chipid.c        exynos_chipid
-
-# SYSMMU
-device sysmmu : fdtbus
-attach sysmmu at fdt with exynos_sysmmu
-file   arch/arm/samsung/exynos_sysmmu.c        exynos_sysmmu
-
 # real time clock
 device  exyortc : fdtbus
 attach  exyortc at fdt with exynos_rtc



Home | Main Index | Thread Index | Old Index