Mon Dec 30 16:41:38 2019 UTC ()
Oops, don't match brcm,bcm2711-emmc2 here.

Thanks to jmcneill for pointing out my mistake


(skrll)
diff -r1.34 -r1.35 src/sys/arch/arm/broadcom/bcm2835_emmc.c
cvs diff -r1.34 -r1.35 src/sys/arch/arm/broadcom/bcm2835_emmc.c (expand / switch to unified diff)

--- src/sys/arch/arm/broadcom/bcm2835_emmc.c 2019/12/30 15:31:15 1.34
+++ src/sys/arch/arm/broadcom/bcm2835_emmc.c 2019/12/30 16:41:38 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: bcm2835_emmc.c,v 1.34 2019/12/30 15:31:15 skrll Exp $ */ 1/* $NetBSD: bcm2835_emmc.c,v 1.35 2019/12/30 16:41:38 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2012 The NetBSD Foundation, Inc. 4 * Copyright (c) 2012 The NetBSD Foundation, Inc.
5 * All rights reserved. 5 * All rights reserved.
6 * 6 *
7 * This code is derived from software contributed to The NetBSD Foundation 7 * This code is derived from software contributed to The NetBSD Foundation
8 * by Nick Hudson 8 * by Nick Hudson
9 * 9 *
10 * Redistribution and use in source and binary forms, with or without 10 * Redistribution and use in source and binary forms, with or without
11 * modification, are permitted provided that the following conditions 11 * modification, are permitted provided that the following conditions
12 * are met: 12 * are met:
13 * 1. Redistributions of source code must retain the above copyright 13 * 1. Redistributions of source code must retain the above copyright
14 * notice, this list of conditions and the following disclaimer. 14 * notice, this list of conditions and the following disclaimer.
@@ -20,27 +20,27 @@ @@ -20,27 +20,27 @@
20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED 20 * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 21 * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS 22 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 23 * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 24 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 25 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 26 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 27 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 28 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
29 * POSSIBILITY OF SUCH DAMAGE. 29 * POSSIBILITY OF SUCH DAMAGE.
30 */ 30 */
31 31
32#include <sys/cdefs.h> 32#include <sys/cdefs.h>
33__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.34 2019/12/30 15:31:15 skrll Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: bcm2835_emmc.c,v 1.35 2019/12/30 16:41:38 skrll Exp $");
34 34
35#include "bcmdmac.h" 35#include "bcmdmac.h"
36 36
37#include <sys/param.h> 37#include <sys/param.h>
38#include <sys/systm.h> 38#include <sys/systm.h>
39#include <sys/device.h> 39#include <sys/device.h>
40#include <sys/bus.h> 40#include <sys/bus.h>
41#include <sys/condvar.h> 41#include <sys/condvar.h>
42#include <sys/mutex.h> 42#include <sys/mutex.h>
43#include <sys/kernel.h> 43#include <sys/kernel.h>
44 44
45#include <arm/broadcom/bcm2835reg.h> 45#include <arm/broadcom/bcm2835reg.h>
46#include <arm/broadcom/bcm2835_dmac.h> 46#include <arm/broadcom/bcm2835_dmac.h>
@@ -87,27 +87,26 @@ static void bcmemmc_attach_i(device_t); @@ -87,27 +87,26 @@ static void bcmemmc_attach_i(device_t);
87static int bcmemmc_xfer_data_dma(struct sdhc_softc *, struct sdmmc_command *); 87static int bcmemmc_xfer_data_dma(struct sdhc_softc *, struct sdmmc_command *);
88static void bcmemmc_dma_done(uint32_t, uint32_t, void *); 88static void bcmemmc_dma_done(uint32_t, uint32_t, void *);
89#endif 89#endif
90 90
91CFATTACH_DECL_NEW(bcmemmc, sizeof(struct bcmemmc_softc), 91CFATTACH_DECL_NEW(bcmemmc, sizeof(struct bcmemmc_softc),
92 bcmemmc_match, bcmemmc_attach, NULL, NULL); 92 bcmemmc_match, bcmemmc_attach, NULL, NULL);
93 93
94/* ARGSUSED */ 94/* ARGSUSED */
95static int 95static int
96bcmemmc_match(device_t parent, struct cfdata *match, void *aux) 96bcmemmc_match(device_t parent, struct cfdata *match, void *aux)
97{ 97{
98 const char * const compatible[] = { 98 const char * const compatible[] = {
99 "brcm,bcm2835-sdhci", 99 "brcm,bcm2835-sdhci",
100 "brcm,bcm2711-emmc2", 
101 NULL 100 NULL
102 }; 101 };
103 struct fdt_attach_args * const faa = aux; 102 struct fdt_attach_args * const faa = aux;
104 103
105 return of_match_compatible(faa->faa_phandle, compatible); 104 return of_match_compatible(faa->faa_phandle, compatible);
106} 105}
107 106
108/* ARGSUSED */ 107/* ARGSUSED */
109static void 108static void
110bcmemmc_attach(device_t parent, device_t self, void *aux) 109bcmemmc_attach(device_t parent, device_t self, void *aux)
111{ 110{
112 struct bcmemmc_softc *sc = device_private(self); 111 struct bcmemmc_softc *sc = device_private(self);
113 struct fdt_attach_args * const faa = aux; 112 struct fdt_attach_args * const faa = aux;