Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi Port over the changes from thorpej-i2c-spi-conf...
details: https://anonhg.NetBSD.org/src/rev/63c579584767
branches: trunk
changeset: 985144:63c579584767
user: thorpej <thorpej%NetBSD.org@localhost>
date: Mon Aug 09 00:30:08 2021 +0000
description:
Port over the changes from thorpej-i2c-spi-conf to thorpej-i2c-spi-conf2,
which is based on a newer HEAD revision.
diffstat:
sys/arch/macppc/dev/smuiic.c | 135 ----------------------------------------
sys/arch/macppc/dev/smuiicvar.h | 38 -----------
sys/dev/acpi/acpi_i2c.h | 38 -----------
3 files changed, 0 insertions(+), 211 deletions(-)
diffs (223 lines):
diff -r e59308d10244 -r 63c579584767 sys/arch/macppc/dev/smuiic.c
--- a/sys/arch/macppc/dev/smuiic.c Sun Aug 08 22:26:32 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,135 +0,0 @@
-/* $NetBSD: smuiic.c,v 1.8 2021/08/07 16:18:58 thorpej Exp $ */
-
-/*-
- * Copyright (c) 2013 Phileas Fogg
- * All rights reserved.
- *
- * 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 <sys/param.h>
-#include <sys/systm.h>
-#include <sys/kernel.h>
-#include <sys/malloc.h>
-#include <sys/device.h>
-#include <sys/proc.h>
-#include <sys/mutex.h>
-#include <sys/sysctl.h>
-
-#include <machine/autoconf.h>
-
-#include <dev/ofw/openfirm.h>
-#include <dev/i2c/i2cvar.h>
-
-#include <macppc/dev/smuvar.h>
-#include <macppc/dev/smuiicvar.h>
-
-struct smuiic_softc {
- device_t sc_dev;
- int sc_node;
- struct i2c_controller *sc_i2c;
-};
-
-static int smuiic_match(device_t, struct cfdata *, void *);
-static void smuiic_attach(device_t, device_t, void *);
-
-CFATTACH_DECL_NEW(smuiic, sizeof(struct smuiic_softc),
- smuiic_match, smuiic_attach, NULL, NULL);
-
-static int
-smuiic_match(device_t parent, struct cfdata *cf, void *aux)
-{
- struct smu_iicbus_confargs *ca = aux;
-
- if (strcmp(ca->ca_name, "i2c-bus") == 0)
- return 5;
- if (strcmp(ca->ca_name, "i2c") == 0)
- return 5;
-
- return 0;
-}
-
-static void
-smuiic_attach(device_t parent, device_t self, void *aux)
-{
- struct smu_iicbus_confargs *ca = aux;
- struct smuiic_softc *sc = device_private(self);
- struct i2cbus_attach_args iba;
- prop_dictionary_t dict = device_properties(self);
- int devs, devc;
- uint32_t addr;
- char compat[256];
- prop_array_t cfg;
- prop_dictionary_t dev;
- prop_data_t data;
- char name[32], descr[32], num[8];
-
- sc->sc_dev = self;
- sc->sc_node = ca->ca_node;
- sc->sc_i2c = ca->ca_tag;
- printf("\n");
-
- cfg = prop_array_create();
- prop_dictionary_set(dict, "i2c-child-devices", cfg);
- prop_object_release(cfg);
-
- /* look for i2c devices */
- devs = OF_child(sc->sc_node);
- while (devs != 0) {
- if (OF_getprop(devs, "name", name, 256) <= 0)
- goto skip;
- if (OF_getprop(devs, "compatible",
- compat, 256) <= 0)
- goto skip;
- if (OF_getprop(devs, "reg", &addr, 4) <= 0)
- goto skip;
- addr = (addr & 0xff) >> 1;
- dev = prop_dictionary_create();
- prop_dictionary_set_string(dev, "name", name);
- data = prop_data_create_copy(compat, strlen(compat)+1);
- prop_dictionary_set(dev, "compatible", data);
- prop_object_release(data);
- prop_dictionary_set_uint32(dev, "addr", addr);
- prop_dictionary_set_uint64(dev, "cookie", devs);
- devc = OF_child(devs);
- while (devc != 0) {
- int reg;
- if (OF_getprop(devc, "reg", ®, 4) < 4) goto nope;
- if (OF_getprop(devc, "location", descr, 32) <= 0)
- goto nope;
- printf("found '%s' at %02x\n", descr, reg);
- snprintf(num, 7, "s%02x", reg);
- prop_dictionary_set_string(dev, num, descr);
- nope:
- devc = OF_peer(devc);
- }
- prop_array_add(cfg, dev);
- prop_object_release(dev);
- skip:
- devs = OF_peer(devs);
- }
-
- memset(&iba, 0, sizeof(iba));
- iba.iba_tag = sc->sc_i2c;
-
- config_found(sc->sc_dev, &iba, iicbus_print, CFARGS_NONE);
-}
diff -r e59308d10244 -r 63c579584767 sys/arch/macppc/dev/smuiicvar.h
--- a/sys/arch/macppc/dev/smuiicvar.h Sun Aug 08 22:26:32 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*-
- * Copyright (c) 2013 Phileas Fogg
- * All rights reserved.
- *
- * 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 <sys/param.h>
-#include <sys/device.h>
-#include <sys/systm.h>
-
-#include <dev/i2c/i2cvar.h>
-
-struct smuiic_confargs {
- char *ca_name;
- int ca_node;
- i2c_addr_t ca_addr;
- i2c_tag_t ca_tag;
-};
diff -r e59308d10244 -r 63c579584767 sys/dev/acpi/acpi_i2c.h
--- a/sys/dev/acpi/acpi_i2c.h Sun Aug 08 22:26:32 2021 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/* $NetBSD: acpi_i2c.h,v 1.2 2021/01/26 00:19:53 jmcneill Exp $ */
-
-/*-
- * Copyright (c) 2017 The NetBSD Foundation, Inc.
- * All rights reserved.
- *
- * This code is derived from software contributed to The NetBSD Foundation
- * by Manuel Bouyer.
- *
- * 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.
- */
-
-
-#ifndef _SYS_DEV_ACPI_ACPI_I2C_H
-#define _SYS_DEV_ACPI_ACPI_I2C_H
-#include <prop/proplib.h>
-
-prop_array_t acpi_enter_i2c_devs(device_t, struct acpi_devnode *);
-#endif /* _SYS_DEV_ACPI_ACPI_I2C_H */
Home |
Main Index |
Thread Index |
Old Index