From owner-svn-src-all@FreeBSD.ORG Mon Feb 2 20:09:01 2015 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 3EC3E33B; Mon, 2 Feb 2015 20:09:01 +0000 (UTC) Received: from smtp7.ore.mailhop.org (smtp7.ore.mailhop.org [54.149.250.69]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 1E460BF0; Mon, 2 Feb 2015 20:09:00 +0000 (UTC) Received: from [73.34.117.227] (helo=ilsoft.org) by smtp7.ore.mailhop.org with esmtpsa (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (Exim 4.82) (envelope-from ) id 1YINIq-0005mu-5t; Mon, 02 Feb 2015 20:09:00 +0000 Received: from revolution.hippie.lan (revolution.hippie.lan [172.22.42.240]) by ilsoft.org (8.14.9/8.14.9) with ESMTP id t12K8vcE088595; Mon, 2 Feb 2015 13:08:57 -0700 (MST) (envelope-from ian@freebsd.org) X-Mail-Handler: DuoCircle Outbound SMTP X-Originating-IP: 73.34.117.227 X-Report-Abuse-To: abuse@duocircle.com (see https://support.duocircle.com/support/solutions/articles/5000540958-duocircle-standard-smtp-abuse-information for abuse reporting information) X-MHO-User: U2FsdGVkX18FEhP3Z4pE0l6Po2ZqsseH Message-ID: <1422907737.15718.291.camel@freebsd.org> Subject: Re: svn commit: r278108 - head/sys/dev/gpio From: Ian Lepore To: Nathan Whitehorn Date: Mon, 02 Feb 2015 13:08:57 -0700 In-Reply-To: <54CFCEF5.70200@freebsd.org> References: <201502021922.t12JMZDE040713@svn.freebsd.org> <54CFCEF5.70200@freebsd.org> Content-Type: text/plain; charset="us-ascii" X-Mailer: Evolution 3.12.8 FreeBSD GNOME Team Port Mime-Version: 1.0 Content-Transfer-Encoding: 7bit Cc: Luiz Otavio O Souza , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Feb 2015 20:09:01 -0000 On Mon, 2015-02-02 at 11:24 -0800, Nathan Whitehorn wrote: > Please don't condition things like this on FDT. They are useful on Open > Firmware systems too. > -Nathan > Is there something defined for OFW? The gpio code needs to work on hint-based (not-FDT and not-OFW) mips systems too. -- Ian > On 02/02/15 11:22, Luiz Otavio O Souza wrote: > > Author: loos > > Date: Mon Feb 2 19:22:34 2015 > > New Revision: 278108 > > URL: https://svnweb.freebsd.org/changeset/base/278108 > > > > Log: > > Register the GPIO controller device reference on xref table for FDT systems. > > > > Modified: > > head/sys/dev/gpio/gpiobus.c > > head/sys/dev/gpio/gpiobusvar.h > > head/sys/dev/gpio/ofw_gpiobus.c > > > > Modified: head/sys/dev/gpio/gpiobus.c > > ============================================================================== > > --- head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > > @@ -143,6 +143,9 @@ gpiobus_attach_bus(device_t dev) > > device_delete_child(dev, busdev); > > return (NULL); > > } > > +#ifdef FDT > > + ofw_gpiobus_register_provider(dev); > > +#endif > > bus_generic_attach(dev); > > > > return (busdev); > > @@ -152,6 +155,10 @@ int > > gpiobus_detach_bus(device_t dev) > > { > > > > +#ifdef FDT > > + ofw_gpiobus_unregister_provider(dev); > > +#endif > > + > > return (bus_generic_detach(dev)); > > } > > > > > > Modified: head/sys/dev/gpio/gpiobusvar.h > > ============================================================================== > > --- head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/gpiobusvar.h Mon Feb 2 19:22:34 2015 (r278108) > > @@ -93,6 +93,8 @@ gpio_map_gpios(device_t bus, phandle_t d > > } > > > > device_t ofw_gpiobus_add_fdt_child(device_t, phandle_t); > > +void ofw_gpiobus_register_provider(device_t); > > +void ofw_gpiobus_unregister_provider(device_t); > > #endif > > int gpio_check_flags(uint32_t, uint32_t); > > device_t gpiobus_attach_bus(device_t); > > > > Modified: head/sys/dev/gpio/ofw_gpiobus.c > > ============================================================================== > > --- head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:00:18 2015 (r278107) > > +++ head/sys/dev/gpio/ofw_gpiobus.c Mon Feb 2 19:22:34 2015 (r278108) > > @@ -217,6 +217,24 @@ ofw_gpiobus_parse_gpios(struct gpiobus_s > > return (0); > > } > > > > +void > > +ofw_gpiobus_register_provider(device_t provider) > > +{ > > + phandle_t node; > > + > > + node = ofw_bus_get_node(provider); > > + OF_device_register_xref(OF_xref_from_node(node), provider); > > +} > > + > > +void > > +ofw_gpiobus_unregister_provider(device_t provider) > > +{ > > + phandle_t node; > > + > > + node = ofw_bus_get_node(provider); > > + OF_device_register_xref(OF_xref_from_node(node), NULL); > > +} > > + > > static struct ofw_gpiobus_devinfo * > > ofw_gpiobus_setup_devinfo(device_t dev, phandle_t node) > > { > > > >