From owner-svn-src-all@FreeBSD.ORG Thu Mar 28 05:43:03 2013 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id C9C4D94D; Thu, 28 Mar 2013 05:43:03 +0000 (UTC) (envelope-from adrian@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id BCDB09A3; Thu, 28 Mar 2013 05:43:03 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2S5h3WE013251; Thu, 28 Mar 2013 05:43:03 GMT (envelope-from adrian@svn.freebsd.org) Received: (from adrian@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2S5h3II013248; Thu, 28 Mar 2013 05:43:03 GMT (envelope-from adrian@svn.freebsd.org) Message-Id: <201303280543.r2S5h3II013248@svn.freebsd.org> From: Adrian Chadd Date: Thu, 28 Mar 2013 05:43:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r248809 - head/sys/mips/atheros 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.14 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: Thu, 28 Mar 2013 05:43:03 -0000 Author: adrian Date: Thu Mar 28 05:43:03 2013 New Revision: 248809 URL: http://svnweb.freebsd.org/changeset/base/248809 Log: Fix the AR933x platform device start/stop code. This was ported from the AR724x code and I think that also doesn't quite work. I'll investigate that soon. With this in place the system reset path works, so 'reset' from kdb actually resets the SoC. Tested: * AP121 test board Modified: head/sys/mips/atheros/ar933x_chip.c Modified: head/sys/mips/atheros/ar933x_chip.c ============================================================================== --- head/sys/mips/atheros/ar933x_chip.c Thu Mar 28 05:39:45 2013 (r248808) +++ head/sys/mips/atheros/ar933x_chip.c Thu Mar 28 05:43:03 2013 (r248809) @@ -119,25 +119,19 @@ ar933x_chip_detect_sys_frequency(void) static void ar933x_chip_device_stop(uint32_t mask) { - uint32_t mask_inv, reg; + uint32_t reg; - mask_inv = mask; reg = ATH_READ_REG(AR933X_RESET_REG_RESET_MODULE); - reg |= mask; - reg &= ~mask_inv; - ATH_WRITE_REG(AR933X_RESET_REG_RESET_MODULE, reg); + ATH_WRITE_REG(AR933X_RESET_REG_RESET_MODULE, reg | mask); } static void ar933x_chip_device_start(uint32_t mask) { - uint32_t mask_inv, reg; + uint32_t reg; - mask_inv = mask; reg = ATH_READ_REG(AR933X_RESET_REG_RESET_MODULE); - reg &= ~mask; - reg |= mask_inv; - ATH_WRITE_REG(AR933X_RESET_REG_RESET_MODULE, reg); + ATH_WRITE_REG(AR933X_RESET_REG_RESET_MODULE, reg & ~mask); } static int