From: kettenis Date: Sat, 8 Jan 2022 15:30:46 +0000 (+0000) Subject: Remove apldwusb(4). This driver is now unused. X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=238a9a185b782c6ea91b1bde774681f736f203e3;p=openbsd Remove apldwusb(4). This driver is now unused. --- diff --git a/sys/arch/arm64/conf/GENERIC b/sys/arch/arm64/conf/GENERIC index 0f1141a2eaa..91e926c198c 100644 --- a/sys/arch/arm64/conf/GENERIC +++ b/sys/arch/arm64/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.220 2021/12/29 18:40:48 patrick Exp $ +# $OpenBSD: GENERIC,v 1.221 2022/01/08 15:30:46 kettenis Exp $ # # GENERIC machine description file # @@ -142,7 +142,6 @@ gpioleds* at fdt? # Apple apldart* at fdt? early 1 apldog* at fdt? early 1 -apldwusb* at fdt? apliic* at fdt? iic* at apliic? aplintc* at fdt? early 1 diff --git a/sys/arch/arm64/conf/RAMDISK b/sys/arch/arm64/conf/RAMDISK index c04eb118fe0..cc49dadbff3 100644 --- a/sys/arch/arm64/conf/RAMDISK +++ b/sys/arch/arm64/conf/RAMDISK @@ -1,4 +1,4 @@ -# $OpenBSD: RAMDISK,v 1.166 2021/12/29 18:40:48 patrick Exp $ +# $OpenBSD: RAMDISK,v 1.167 2022/01/08 15:30:46 kettenis Exp $ machine arm64 maxusers 4 @@ -106,7 +106,6 @@ wsdisplay* at simplefb? # Apple apldart* at fdt? early 1 apldog* at fdt? early 1 -apldwusb* at fdt? apliic* at fdt? iic* at apliic? aplintc* at fdt? early 1 diff --git a/sys/arch/arm64/conf/files.arm64 b/sys/arch/arm64/conf/files.arm64 index 18ef641e72a..7b216bbc74d 100644 --- a/sys/arch/arm64/conf/files.arm64 +++ b/sys/arch/arm64/conf/files.arm64 @@ -1,4 +1,4 @@ -# $OpenBSD: files.arm64,v 1.51 2022/01/01 18:52:37 kettenis Exp $ +# $OpenBSD: files.arm64,v 1.52 2022/01/08 15:30:46 kettenis Exp $ maxpartitions 16 maxusers 2 8 128 @@ -147,10 +147,6 @@ device apldog attach apldog at fdt file arch/arm64/dev/apldog.c apldog -device apldwusb: fdt -attach apldwusb at fdt -file arch/arm64/dev/apldwusb.c apldwusb - device apliic: i2cbus attach apliic at fdt file arch/arm64/dev/apliic.c apliic diff --git a/sys/arch/arm64/dev/apldwusb.c b/sys/arch/arm64/dev/apldwusb.c deleted file mode 100644 index 0507498c37e..00000000000 --- a/sys/arch/arm64/dev/apldwusb.c +++ /dev/null @@ -1,64 +0,0 @@ -/* $OpenBSD: apldwusb.c,v 1.1 2021/05/24 18:40:19 kettenis Exp $ */ -/* - * Copyright (c) 2017 Mark Kettenis - * - * Permission to use, copy, modify, and distribute this software for any - * purpose with or without fee is hereby granted, provided that the above - * copyright notice and this permission notice appear in all copies. - * - * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ - -#include -#include -#include - -#include -#include - -#include - -#include -#include -#include - -struct apldwusb_softc { - struct simplebus_softc sc_sbus; -}; - -int apldwusb_match(struct device *, void *, void *); -void apldwusb_attach(struct device *, struct device *, void *); - -struct cfattach apldwusb_ca = { - sizeof(struct apldwusb_softc), apldwusb_match, apldwusb_attach -}; - -struct cfdriver apldwusb_cd = { - NULL, "apldwusb", DV_DULL -}; - -int -apldwusb_match(struct device *parent, void *match, void *aux) -{ - struct fdt_attach_args *faa = aux; - - return OF_is_compatible(faa->fa_node, "apple,dwc3-m1"); -} - -void -apldwusb_attach(struct device *parent, struct device *self, void *aux) -{ - struct apldwusb_softc *sc = (struct apldwusb_softc *)self; - struct fdt_attach_args *faa = aux; - - clock_enable_all(faa->fa_node); - reset_deassert_all(faa->fa_node); - - simplebus_attach(parent, &sc->sc_sbus.sc_dev, faa); -}