From owner-svn-src-all@freebsd.org  Tue May 17 06:45:26 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 D6914B3E298;
 Tue, 17 May 2016 06:45:26 +0000 (UTC)
 (envelope-from sgalabov@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 A3A9212B6;
 Tue, 17 May 2016 06:45:26 +0000 (UTC)
 (envelope-from sgalabov@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4H6jPEi022036;
 Tue, 17 May 2016 06:45:25 GMT (envelope-from sgalabov@FreeBSD.org)
Received: (from sgalabov@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4H6jPTl022034;
 Tue, 17 May 2016 06:45:25 GMT (envelope-from sgalabov@FreeBSD.org)
Message-Id: <201605170645.u4H6jPTl022034@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: sgalabov set sender to
 sgalabov@FreeBSD.org using -f
From: Stanislav Galabov <sgalabov@FreeBSD.org>
Date: Tue, 17 May 2016 06:45:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r300014 - in head/sys: boot/fdt/dts/mips mips/mediatek
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.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 17 May 2016 06:45:26 -0000

Author: sgalabov
Date: Tue May 17 06:45:25 2016
New Revision: 300014
URL: https://svnweb.freebsd.org/changeset/base/300014

Log:
  Add proper PCIe init for MT7628/MT7688 SoCs
  
  PCIe PHY needs different initialization on MT7628/MT7688 SoCs than it does
  on MT7620.
  However, LEDE (and OpenWRT) dts files have the PCIe node for MT7628/MT7688
  as compatible with mt7620-pci.
  We already can handle this properly in our driver, so we just need to add
  compat strings to fbsd-mt7628an.dtsi and the PCIe driver.
  
  Approved by:	adrian (mentor)
  Sponsored by:	Smartcom - Bulgaria AD
  Differential Revision:	https://reviews.freebsd.org/D6395

Modified:
  head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi
  head/sys/mips/mediatek/mtk_pcie.c

Modified: head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi
==============================================================================
--- head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi	Tue May 17 06:42:24 2016	(r300013)
+++ head/sys/boot/fdt/dts/mips/fbsd-mt7628an.dtsi	Tue May 17 06:45:25 2016	(r300014)
@@ -36,4 +36,5 @@
 		 * different values for the reg property
 		 */
 		reg = <0x10140000 0x10000>;
+	compatible = "mediatek,mt7628-pci";
 };

Modified: head/sys/mips/mediatek/mtk_pcie.c
==============================================================================
--- head/sys/mips/mediatek/mtk_pcie.c	Tue May 17 06:42:24 2016	(r300013)
+++ head/sys/mips/mediatek/mtk_pcie.c	Tue May 17 06:45:25 2016	(r300014)
@@ -203,6 +203,7 @@ mtk_pci_ranges(phandle_t node, struct mt
 static struct ofw_compat_data compat_data[] = {
 	{ "ralink,rt3883-pci",		MTK_SOC_RT3883 },
 	{ "mediatek,mt7620-pci",	MTK_SOC_MT7620A },
+	{ "mediatek,mt7628-pci",	MTK_SOC_MT7628 },
 	{ "mediatek,mt7621-pci",	MTK_SOC_MT7621 },
 	{ NULL,				MTK_SOC_UNKNOWN }
 };