[src/trunk]: src/sys/arch/evbppc/mpc85xx Revert previous; that was intended t...

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a96dc3e2e915
branches:  trunk
changeset: 368625:a96dc3e2e915
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jul 22 20:04:53 2022 +0000

description:
Revert previous; that was intended to be two separate commits.

diffstat:

 sys/arch/evbppc/mpc85xx/machdep.c |  19 ++++++++-----------
 1 files changed, 8 insertions(+), 11 deletions(-)

diffs (65 lines):

diff -r bd516c71785c -r a96dc3e2e915 sys/arch/evbppc/mpc85xx/machdep.c
--- a/sys/arch/evbppc/mpc85xx/machdep.c Fri Jul 22 19:54:14 2022 +0000
+++ b/sys/arch/evbppc/mpc85xx/machdep.c Fri Jul 22 20:04:53 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: machdep.c,v 1.46 2022/07/22 19:57:25 thorpej Exp $     */
+/*     $NetBSD: machdep.c,v 1.47 2022/07/22 20:04:53 thorpej Exp $     */
 /*-
  * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.46 2022/07/22 19:57:25 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.47 2022/07/22 20:04:53 thorpej Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -305,10 +305,7 @@
                1 + ilog2(DEVDISR_TSEC4),
                { SVR_MPC8548v1 >> 16, SVR_MPC8572v1 >> 16 } },
 #endif
-       { "diic", I2C1_BASE, I2C_SIZE, 0,
-               1, { ISOURCE_I2C },
-               1 + ilog2(DEVDISR_I2C) },
-       { "diic", I2C2_BASE, I2C_SIZE, 1,
+       { "diic", I2C1_BASE, 2*I2C_SIZE, 0,
                1, { ISOURCE_I2C },
                1 + ilog2(DEVDISR_I2C) },
        /* MPC8572 doesn't have any GPIO */
@@ -1355,7 +1352,7 @@
 #endif
        prop_array_t extirqs = prop_array_create_with_capacity(n);
        for (u_int i = 0; i < n; i++) {
-               prop_string_t ps = prop_string_create_nocopy(names[i]);
+               prop_string_t ps = prop_string_create_cstring_nocopy(names[i]);
                prop_array_set(extirqs, i, ps);
                prop_object_release(ps);
        }
@@ -1368,13 +1365,13 @@
 {
        prop_dictionary_t pci_intmap = prop_dictionary_create();
        KASSERT(pci_intmap != NULL);
-       prop_number_t mask = prop_number_create_unsigned(intmask);
+       prop_number_t mask = prop_number_create_unsigned_integer(intmask);
        KASSERT(mask != NULL);
        prop_dictionary_set(pci_intmap, "interrupt-mask", mask);
        prop_object_release(mask);
-       prop_number_t pn_ist = prop_number_create_unsigned(ist);
+       prop_number_t pn_ist = prop_number_create_unsigned_integer(ist);
        KASSERT(pn_ist != NULL);
-       prop_number_t pn_intr = prop_number_create_unsigned(inta);
+       prop_number_t pn_intr = prop_number_create_unsigned_integer(inta);
        KASSERT(pn_intr != NULL);
        prop_dictionary_t entry = prop_dictionary_create();
        KASSERT(entry != NULL);
@@ -1391,7 +1388,7 @@
                snprintf(prop_name, sizeof(prop_name), "%06x", i + intrinc);
                entry = prop_dictionary_create();
                KASSERT(entry != NULL);
-               pn_intr = prop_number_create_unsigned(va_arg(ap, u_int));
+               pn_intr = prop_number_create_unsigned_integer(va_arg(ap, u_int));
                KASSERT(pn_intr != NULL);
                prop_dictionary_set(entry, "interrupt", pn_intr);
                prop_dictionary_set(entry, "type", pn_ist);