From owner-svn-src-all@FreeBSD.ORG Fri Jul 25 23:36:40 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 58EC072A; Fri, 25 Jul 2014 23:36:40 +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 458432B1C; Fri, 25 Jul 2014 23:36:40 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6PNae5W041365; Fri, 25 Jul 2014 23:36:40 GMT (envelope-from ian@svn.freebsd.org) Received: (from ian@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6PNadVT041363; Fri, 25 Jul 2014 23:36:39 GMT (envelope-from ian@svn.freebsd.org) Message-Id: <201407252336.s6PNadVT041363@svn.freebsd.org> From: Ian Lepore Date: Fri, 25 Jul 2014 23:36:39 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269104 - stable/10/sys/arm/freescale/imx X-SVN-Group: stable-10 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 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: Fri, 25 Jul 2014 23:36:40 -0000 Author: ian Date: Fri Jul 25 23:36:39 2014 New Revision: 269104 URL: http://svnweb.freebsd.org/changeset/base/269104 Log: MFC r268401, r268495: Pending interrupt status is cleared by writing to the ISR, not the data reg. Use named constant rather than '0' to access the reset controller register. Modified: stable/10/sys/arm/freescale/imx/imx51_gpio.c stable/10/sys/arm/freescale/imx/imx6_mp.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/arm/freescale/imx/imx51_gpio.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx51_gpio.c Fri Jul 25 23:29:55 2014 (r269103) +++ stable/10/sys/arm/freescale/imx/imx51_gpio.c Fri Jul 25 23:36:39 2014 (r269104) @@ -355,7 +355,7 @@ imx51_gpio_intr(void *arg) sc = arg; input = READ4(sc, IMX_GPIO_ISR_REG); value = input & READ4(sc, IMX_GPIO_IMR_REG); - WRITE4(sc, IMX_GPIO_DR_REG, input); + WRITE4(sc, IMX_GPIO_ISR_REG, input); if (!value) goto intr_done; Modified: stable/10/sys/arm/freescale/imx/imx6_mp.c ============================================================================== --- stable/10/sys/arm/freescale/imx/imx6_mp.c Fri Jul 25 23:29:55 2014 (r269103) +++ stable/10/sys/arm/freescale/imx/imx6_mp.c Fri Jul 25 23:36:39 2014 (r269104) @@ -162,7 +162,7 @@ platform_mp_start_ap(void) ( 1 << (SRC_CONTROL_C1RST_SHIFT - 1 + i))); } - bus_space_write_4(fdtbus_bs_tag, src, 0, val); + bus_space_write_4(fdtbus_bs_tag, src, SRC_CONTROL_REG, val); armv7_sev();