From owner-svn-src-head@freebsd.org  Thu May 19 04:03:43 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CE3FB3FEEA;
 Thu, 19 May 2016 04:03:43 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 CE80F170F;
 Thu, 19 May 2016 04:03:42 +0000 (UTC)
 (envelope-from adrian@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4J43fOm059798;
 Thu, 19 May 2016 04:03:41 GMT (envelope-from adrian@FreeBSD.org)
Received: (from adrian@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4J43fP7059797;
 Thu, 19 May 2016 04:03:41 GMT (envelope-from adrian@FreeBSD.org)
Message-Id: <201605190403.u4J43fP7059797@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: adrian set sender to
 adrian@FreeBSD.org using -f
From: Adrian Chadd <adrian@FreeBSD.org>
Date: Thu, 19 May 2016 04:03:41 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300183 - head/sys/dev/siba
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 19 May 2016 04:03:43 -0000

Author: adrian
Date: Thu May 19 04:03:41 2016
New Revision: 300183
URL: https://svnweb.freebsd.org/changeset/base/300183

Log:
  [siba] handle the PMU resource setup/init for 0x4322 series chips.
  
  Tested (with other changes):
  
  * BCM4322 11abgn device, chip id 0x4322.

Modified:
  head/sys/dev/siba/siba_core.c

Modified: head/sys/dev/siba/siba_core.c
==============================================================================
--- head/sys/dev/siba/siba_core.c	Thu May 19 04:02:13 2016	(r300182)
+++ head/sys/dev/siba/siba_core.c	Thu May 19 04:03:41 2016	(r300183)
@@ -945,6 +945,17 @@ siba_cc_pmu_init(struct siba_cc *scc)
 		siba_cc_pmu1_pll0_init(scc, 0 /* use default */);
 		/* use the default: min = 0xcbb max = 0x7ffff */
 		break;
+	case 0x4322:
+		if (scc->scc_pmu.rev == 2) {
+			DPRINTF(siba, SIBA_DEBUG_PMU, "%s: chipid 0x4322; PLLing\n",
+			    __func__);
+			SIBA_CC_WRITE32(scc, SIBA_CC_PLLCTL_ADDR, 0x0000000a);
+			SIBA_CC_WRITE32(scc, SIBA_CC_PLLCTL_DATA, 0x380005c0);
+		}
+		/* use the default: min = 0xcbb max = 0x7ffff */
+		break;
+	case 43222:
+		break;
 	case 0x4325:
 		siba_cc_pmu1_pll0_init(scc, 0 /* use default */);