From owner-svn-src-all@FreeBSD.ORG Tue Apr 21 22:48:13 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 07AB5106564A; Tue, 21 Apr 2009 22:48:13 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DEFFD8FC1D; Tue, 21 Apr 2009 22:48:12 +0000 (UTC) (envelope-from stas@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n3LMmCaJ027437; Tue, 21 Apr 2009 22:48:12 GMT (envelope-from stas@svn.freebsd.org) Received: (from stas@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n3LMmCbu027432; Tue, 21 Apr 2009 22:48:12 GMT (envelope-from stas@svn.freebsd.org) Message-Id: <200904212248.n3LMmCbu027432@svn.freebsd.org> From: Stanislav Sedov Date: Tue, 21 Apr 2009 22:48:12 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r191369 - in head/sys: arm/conf dev/iicbus X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Tue, 21 Apr 2009 22:48:13 -0000 Author: stas Date: Tue Apr 21 22:48:12 2009 New Revision: 191369 URL: http://svn.freebsd.org/changeset/base/191369 Log: - Rename ds1672 and ds133x devices to "ds1672_rtc" and "ds133x_rtc" respectivly. This will allow one to have a kernel with both devices present and use it for multiple boards with different types of RTC sitting on a bus. Discussed with: imp Modified: head/sys/arm/conf/AVILA.hints head/sys/arm/conf/BWCT.hints head/sys/arm/conf/CAMBRIA.hints head/sys/dev/iicbus/ds133x.c head/sys/dev/iicbus/ds1672.c Modified: head/sys/arm/conf/AVILA.hints ============================================================================== --- head/sys/arm/conf/AVILA.hints Tue Apr 21 22:47:34 2009 (r191368) +++ head/sys/arm/conf/AVILA.hints Tue Apr 21 22:48:12 2009 (r191369) @@ -44,5 +44,5 @@ hint.ad7418.0.at="iicbus0" hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.rtc.0.at="iicbus0" -hint.rtc.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 Modified: head/sys/arm/conf/BWCT.hints ============================================================================== --- head/sys/arm/conf/BWCT.hints Tue Apr 21 22:47:34 2009 (r191368) +++ head/sys/arm/conf/BWCT.hints Tue Apr 21 22:48:12 2009 (r191369) @@ -1,8 +1,8 @@ # $FreeBSD$ # Dallas Semiconductor DS1672 RTC sitting on the I2C bus -hint.rtc.0.at="iicbus0" -hint.rtc.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # NAtional Semiconductor LM75 temperature sensor sitting on the I2C bus hint.lm75.0.at="iicbus0" Modified: head/sys/arm/conf/CAMBRIA.hints ============================================================================== --- head/sys/arm/conf/CAMBRIA.hints Tue Apr 21 22:47:34 2009 (r191368) +++ head/sys/arm/conf/CAMBRIA.hints Tue Apr 21 22:48:12 2009 (r191369) @@ -46,8 +46,8 @@ hint.ad7418.0.at="iicbus0" hint.ad7418.0.addr=0x50 # Dallas Semiconductor DS1672 RTC -hint.rtc.0.at="iicbus0" -hint.rtc.0.addr=0xd0 +hint.ds1672_rtc.0.at="iicbus0" +hint.ds1672_rtc.0.addr=0xd0 # USB is part of the chip hint.ehci.0.at="ixp0" Modified: head/sys/dev/iicbus/ds133x.c ============================================================================== --- head/sys/dev/iicbus/ds133x.c Tue Apr 21 22:47:34 2009 (r191368) +++ head/sys/dev/iicbus/ds133x.c Tue Apr 21 22:48:12 2009 (r191369) @@ -46,7 +46,7 @@ __FBSDID("$FreeBSD$"); #include "iicbus_if.h" #include "clock_if.h" -#define DS133X_DEVNAME "rtc" +#define DS133X_DEVNAME "ds133x_rtc" #define DS133X_ADDR 0xd0 /* slave address */ #define DS133X_DATE_REG 0x0 Modified: head/sys/dev/iicbus/ds1672.c ============================================================================== --- head/sys/dev/iicbus/ds1672.c Tue Apr 21 22:47:34 2009 (r191368) +++ head/sys/dev/iicbus/ds1672.c Tue Apr 21 22:48:12 2009 (r191369) @@ -171,7 +171,7 @@ static device_method_t ds1672_methods[] }; static driver_t ds1672_driver = { - "rtc", + "ds1672_rtc", ds1672_methods, sizeof(struct ds1672_softc), };