From owner-svn-src-all@FreeBSD.ORG Sat Sep 27 14:39:01 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 4EB684D1; Sat, 27 Sep 2014 14:39:01 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 39D13656; Sat, 27 Sep 2014 14:39:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8REd1F6091635; Sat, 27 Sep 2014 14:39:01 GMT (envelope-from kevlo@FreeBSD.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8REd1ZK091634; Sat, 27 Sep 2014 14:39:01 GMT (envelope-from kevlo@FreeBSD.org) Message-Id: <201409271439.s8REd1ZK091634@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: kevlo set sender to kevlo@FreeBSD.org using -f From: Kevin Lo Date: Sat, 27 Sep 2014 14:39:01 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r272213 - head/sys/arm/at91 X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: Sat, 27 Sep 2014 14:39:01 -0000 Author: kevlo Date: Sat Sep 27 14:39:00 2014 New Revision: 272213 URL: http://svnweb.freebsd.org/changeset/base/272213 Log: Fix the definitioin of AT91SAM9G45_IRQ_PIOE and rename it to AT91SAM9G45_IRQ_PIODE. According to the data sheet, both PIOD and PIOE use the same IRQ. While here remove duplicate definitions. Modified: head/sys/arm/at91/at91sam9g45reg.h Modified: head/sys/arm/at91/at91sam9g45reg.h ============================================================================== --- head/sys/arm/at91/at91sam9g45reg.h Sat Sep 27 14:24:43 2014 (r272212) +++ head/sys/arm/at91/at91sam9g45reg.h Sat Sep 27 14:39:00 2014 (r272213) @@ -168,8 +168,8 @@ #define AT91SAM9G45_IRQ_PIOA 2 #define AT91SAM9G45_IRQ_PIOB 3 #define AT91SAM9G45_IRQ_PIOC 4 -#define AT91SAM9G45_IRQ_PIOD 5 -#define AT91SAM9G45_IRQ_PIOE 6 +#define AT91SAM9G45_IRQ_PIODE 5 +#define AT91SAM9G45_IRQ_TRNG 6 #define AT91SAM9G45_IRQ_USART0 7 #define AT91SAM9G45_IRQ_USART1 8 #define AT91SAM9G45_IRQ_USART2 9 @@ -202,6 +202,8 @@ #define AT91SAM9G45_IRQ_WDT AT91SAM9G45_IRQ_SYSTEM #define AT91SAM9G45_IRQ_PIT AT91SAM9G45_IRQ_SYSTEM #define AT91SAM9G45_IRQ_RSTC AT91SAM9G45_IRQ_SYSTEM +#define AT91SAM9G45_IRQ_PIOD AT91SAM9G45_IRQ_PIODE +#define AT91SAM9G45_IRQ_PIOE AT91SAM9G45_IRQ_PIODE #define AT91SAM9G45_IRQ_OHCI AT91SAM9G45_IRQ_UHP #define AT91SAM9G45_IRQ_TC0 AT91SAM9G45_IRQ_TC0_TC5 #define AT91SAM9G45_IRQ_TC1 AT91SAM9G45_IRQ_TC0_TC5 @@ -225,9 +227,6 @@ #define AT91SAM9G45_SMC_BASE 0xfffe800 #define AT91SAM9G45_SMC_SIZE 0x200 -#define AT91SAM9G45_PMC_BASE 0xffffc00 -#define AT91SAM9G45_PMC_SIZE 0x100 - #define AT91SAM9G45_HSMCI0_BASE 0xff80000 #define AT91SAM9G45_HSMCI0_SIZE 0x4000