Tue May 10 08:10:28 2022 UTC ()
Add aprints


(skrll)
diff -r1.1 -r1.2 src/sys/arch/arm/apple/apple_pmgr.c
cvs diff -r1.1 -r1.2 src/sys/arch/arm/apple/apple_pmgr.c (expand / switch to unified diff)

--- src/sys/arch/arm/apple/apple_pmgr.c 2022/04/27 07:55:42 1.1
+++ src/sys/arch/arm/apple/apple_pmgr.c 2022/05/10 08:10:28 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: apple_pmgr.c,v 1.1 2022/04/27 07:55:42 skrll Exp $ */ 1/* $NetBSD: apple_pmgr.c,v 1.2 2022/05/10 08:10:28 skrll Exp $ */
2 2
3/*- 3/*-
4 * Copyright (c) 2022 The NetBSD Foundation, Inc. 4 * Copyright (c) 2022 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: apple_pmgr.c,v 1.1 2022/04/27 07:55:42 skrll Exp $"); 33__KERNEL_RCSID(0, "$NetBSD: apple_pmgr.c,v 1.2 2022/05/10 08:10:28 skrll Exp $");
34 34
35#include <sys/param.h> 35#include <sys/param.h>
36 36
37#include <sys/bus.h> 37#include <sys/bus.h>
38#include <sys/kmem.h> 38#include <sys/kmem.h>
39#include <sys/queue.h> 39#include <sys/queue.h>
40 40
41#include <libfdt.h> 41#include <libfdt.h>
42#include <dev/fdt/fdtvar.h> 42#include <dev/fdt/fdtvar.h>
43 43
44/* 44/*
45 * Power manager registers 45 * Power manager registers
46 */ 46 */
@@ -122,26 +122,29 @@ apple_pmgr_attach(device_t parent, devic @@ -122,26 +122,29 @@ apple_pmgr_attach(device_t parent, devic
122 return; 122 return;
123 } 123 }
124 124
125 sc->sc_dev = self; 125 sc->sc_dev = self;
126 sc->sc_bst = faa->faa_bst; 126 sc->sc_bst = faa->faa_bst;
127 127
128 error = bus_space_map(faa->faa_bst, pmgr_addr, pmgr_size, 0, 128 error = bus_space_map(faa->faa_bst, pmgr_addr, pmgr_size, 0,
129 &sc->sc_bsh); 129 &sc->sc_bsh);
130 if (error) { 130 if (error) {
131 aprint_error(": couldn't map registers: %d\n", error); 131 aprint_error(": couldn't map registers: %d\n", error);
132 return; 132 return;
133 } 133 }
134 134
 135 aprint_naive("\n");
 136 aprint_normal(": Apple PMGR\n");
 137
135 for (int node = OF_child(phandle); node; node = OF_peer(node)) { 138 for (int node = OF_child(phandle); node; node = OF_peer(node)) {
136 static const struct device_compatible_entry compat_ps[] = { 139 static const struct device_compatible_entry compat_ps[] = {
137 { .compat = "apple,pmgr-pwrstate" }, 140 { .compat = "apple,pmgr-pwrstate" },
138 DEVICE_COMPAT_EOL 141 DEVICE_COMPAT_EOL
139 }; 142 };
140 143
141 if (!of_compatible_match(node, compat_ps)) 144 if (!of_compatible_match(node, compat_ps))
142 continue; 145 continue;
143 146
144 static struct fdtbus_powerdomain_controller_func funcs = { 147 static struct fdtbus_powerdomain_controller_func funcs = {
145 .pdc_enable = apple_pmgr_enable, 148 .pdc_enable = apple_pmgr_enable,
146 }; 149 };
147 150