From patchwork Thu Oct 15 13:02:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 530677 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D90281402BF for ; Fri, 16 Oct 2015 00:11:34 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 678864B768; Thu, 15 Oct 2015 15:10:29 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jT6nBgq-PO0s; Thu, 15 Oct 2015 15:10:29 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E591A4B6E0; Thu, 15 Oct 2015 15:10:10 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 3B0F34B71D for ; Thu, 15 Oct 2015 15:09:57 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ha1U2pGyTBPA for ; Thu, 15 Oct 2015 15:09:57 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1bon0138.outbound.protection.outlook.com [157.56.111.138]) by theia.denx.de (Postfix) with ESMTPS id 16D604B6AD for ; Thu, 15 Oct 2015 15:09:45 +0200 (CEST) Received: from BN3PR0301CA0063.namprd03.prod.outlook.com (10.160.152.159) by BN3PR0301MB1250.namprd03.prod.outlook.com (10.161.207.26) with Microsoft SMTP Server (TLS) id 15.1.293.16; Thu, 15 Oct 2015 13:09:43 +0000 Received: from BY2FFO11FD010.protection.gbl (2a01:111:f400:7c0c::181) by BN3PR0301CA0063.outlook.office365.com (2a01:111:e400:401e::31) with Microsoft SMTP Server (TLS) id 15.1.300.14 via Frontend Transport; Thu, 15 Oct 2015 13:09:42 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BY2FFO11FD010.mail.protection.outlook.com (10.1.14.74) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Thu, 15 Oct 2015 13:09:42 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t9FD95wc032237; Thu, 15 Oct 2015 06:09:39 -0700 From: Gong Qianyu To: Date: Thu, 15 Oct 2015 21:02:35 +0800 Message-ID: <1444914162-34502-11-git-send-email-Qianyu.Gong@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1444914162-34502-1-git-send-email-Qianyu.Gong@freescale.com> References: <1444914162-34502-1-git-send-email-Qianyu.Gong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD010; 1:bvD8MDEh0uoZyyGu6quXL1wpQp8zwVssmp8SrzB24ceJRcgodtqL3exNpyfFOJsCL8nvoFkhCuysDSb4KDvFmTtpxvF/oyjGGMvEXPejmLw0QszK68oA8R4fA3ExVpwE8Y+AGjuR4D07gaf4Ghvhn/y2f3KeogaMB7fKOuGlKSvlNu3Yt4tnygrxM+6ebHg1eZAPdqFYcTc8xdh8YXn59pBf96b+ywGrSYcpSSd309/+SA85CigVcO4oPHq30QYj+14lBZt7StspNB9brxxhh3HaOMT7YuqI2py3i50KsyFW8c1tQL7N+oLxNBsdO4M2bnZfwTqOfImmnv8e1jd2eLDHUtSjrZFoORqVe+/pmcAba3RZg7Q7UYYNLQt5L/i0Yf9l2Hfqr7AGOmxcSmcjGA== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(46102003)(92566002)(50466002)(5003940100001)(6806005)(11100500001)(450100001)(106466001)(5007970100001)(87936001)(47776003)(5001960100002)(48376002)(110136002)(77096005)(105606002)(97736004)(104016004)(85426001)(81156007)(189998001)(5008740100001)(229853001)(107886002)(36756003)(50226001)(86362001)(69596002)(50986999)(19580395003)(2351001)(76176999)(19580405001)(64706001)(2950100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR0301MB1250; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1250; 2:xWR2JeWhgRQ+AqS2nS87opLo+MNV2UttSVovmcUMVak0vsAZWKy6hE3tcx7nTf4t5rzwl5iNujkPKSPK2Jd+laA6dLbcNXLnJEg1pm789UZWXg+bwHMu4a/jb24rbk2Patg7yDztaGYAVvPSsa0hC9eSDXBRn84bYHsWG90VRtQ=; 3:zd41nfh9qmRcTNhXVR9dsbNgcUJT2CrFPIbv9M/OJsg82daq2m6tG/Q3yULYj+WMqJgSNPLgS3SNSqNx72SK/Q2zTlSI13Lgj6m86MQykpuhvMSHrHm8ELAgnNN7hdCbubSLccEqWSEm4hwgwXimkwGNK0bZ21h3y5IPEYRSIpkoxxN227DcJINhqUSXrkqatv5MiTrejmwS32yHZJNB+flF3OVrRIfriN3inFbSHtY=; 25:nZEEB0yimgLri+surW/t2Z6PyOY7CifJxa1Jx4xlfUPwSllv3W9sC2Y5Igppyf9VOc89qtPGPGK95ONaWunfcqQFGn/wDEk2U/xGoAU6Qj9J+3xQWVtMeuA1B9EGCfHNp3y9PnxKM2JwQs0lGK3gGZeOUaOs7MYqz+NWu1tw8ztjcVCvNI8SIjOQ+w7mDCIcHifDcESOyserrLU0E4rfCKiU7c3Eh+1XeX5G9y7VevZdteHIdaLwiBQ72ZfkOAZE/0XoLOB9FrOIAHnpfjazSA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN3PR0301MB1250; X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1250; 20://qZgPps8I+nMPbi4jZsEzbhjtAffAFmDmOr3ReIgi8rIr1IeW6D+Ws2UB9ODQUJ4z3ZHH7tyW0PapdPtZgapwDcS3jzBySy3JDwFJMUhz4zsl1zLVQ30jEgQYhjMbeQgm5LWZzpU74Rw6nri3U/av+5QUkWSWp9JK7gim7yd8VmG2QehRZlBOljYAWo47WiX8qwZjXWwXgvN/W7H/orPl1U3JKCCuibqrCY3ZX8jwU7kjg5l2tNjBu5zlY1cqL3iMsRoTEoNOAiUqNrAB40Ds6ukv85NmFlfAEEE74W9w2uhWyYvJAP6JScAASoxRQgJUD6fQ/mwyy00YxI0CjieRFJxVozQASC6nOZknysiP4=; 4:U3Z6WKF9azyatITxHOxu3GV1472QMM2u3dyC2fEhc5WCAkBED3pn5AWbDpw5k9uasTN+YPlWS64g0CjhvYtJIt5D66N2pWcPCewzPJNK4IZ5Hsu6LNQwniZIGWOxz2Wi2Niy2Oi+Lo7yYELIpiA2ltCiyb1JY9qWHkYBUaj48Wgu/C0wyi4oe1Tn3ILhq61FzrRZOoJqn9HU3GixvVCDMQAlyqe1bsWRfYBj8HRHQj3WGAcxmy5EssHqtdCiBxrYm66bvBzdRNWDGvw00YK1Q37BAyWAeeArzE9kx8bbh1OQeDdfKpXjot2AuzaX5n1EtoGR9HMePj6cfgAbveqkk6NTyJF4RSSjsi+MdqJnEbM= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(3002001); SRVR:BN3PR0301MB1250; BCL:0; PCL:0; RULEID:; SRVR:BN3PR0301MB1250; X-Forefront-PRVS: 0730093765 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR0301MB1250; 23:9/lZ1TsiAjVFjl0MAJRKpEUC3PAO3VWLdB7/mbf?= =?us-ascii?Q?fBk1nnfG5tdAXjN8UEyd5Y41UiY0CgpR7wKi6Z/IBAnsrErIXo0uVa0M3GKQ?= =?us-ascii?Q?fmaMn8NTL/6QXbIGVXjBkTCniAJA9jkl1f5rGQDobMxDMmWg6sTaU1q9OZ8g?= =?us-ascii?Q?X6ROY3w2GANBHMM9l20aba9tBNtvoSV1EJVZXFReUp7uX/mlmgS0seZkJL+v?= =?us-ascii?Q?+yklXyl+KeraZfTAW5AUYEfD5ETJaLEl0BQ1okC4rmmh0o6qp/jwQhYaLbtQ?= =?us-ascii?Q?ncbnhEJLuVElPTrR7E8E9zArisJJykahffRMvsh0EG7ZViz7Bl0OYk44fgem?= =?us-ascii?Q?Xc2/2VwiJVtOwxrGo65GRMo2bsdIbSPRUT5F0DEF1YVjmOyFiRapCezW/VeG?= =?us-ascii?Q?N5YJnb8Gr6liAi+LH/s18TIHdPmryoTby7rfQq3haxD5IOAyS0kieEcUBQzh?= =?us-ascii?Q?N7lQHx5/R5k53T9FHEWonF/+fjeD7wsq1J4FuegsvA2tbPte95fLkD6mh543?= =?us-ascii?Q?cLxITdbMpBHoDU8RNA6eK9EBvuwCKoo9a0RljniTa1DEjT5pDENKYpEA0Um7?= =?us-ascii?Q?Qq69uKlFurc8URvS4i++j45i/6ctGkCrZUTvOA9bR6e92Rs2ik+OFBbN2n6B?= =?us-ascii?Q?QKJit87rGYiQaILI0Uve1qyhHAxZBYwjUi9febNmq7t6701l9AbQS0NdDLwB?= =?us-ascii?Q?IfY1ubczMg+xezI1H/T/Dd8bA+1H29m1DcxD6+fiHEGW8nvkAp6GNFGKO3jN?= =?us-ascii?Q?DBNft1jPb6stRlUz8vgUYOUBqR162PGnFyOFyfDlu/QYnqy1JU9l18KX9eQk?= =?us-ascii?Q?WWW54XdlF0dcfgogivlgPEgAdGhporvP1JNgC2Gf+p1tArVW+a9aIe7dnztS?= =?us-ascii?Q?RXAex9q6zC7CLatOnUmnO14+xVcx82uLCxPRbnwJxXKO3dIYQSl+DBIwlsoQ?= =?us-ascii?Q?CKgpuNkJ7hPcxO5pH2KstRUEkbvL8YFiNhkyv6XzvauW6bo1EZrb2jR3GoRp?= =?us-ascii?Q?H2sqK18b/1uc4wYg/cTZazGBddO4f6SA9yAt8bZlwaMC42CXcPyRthI8r25O?= =?us-ascii?Q?WS/qv5bJJjajQYNIjHnw2l43Sin9hxUKiNccb6uwfYzAkG/wS3nhfySLIc9v?= =?us-ascii?Q?NDRMpi+LTjuMWmMqapMVjkaf2S1BE2s/68+Vyohb5rPtX94KGFRweqA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN3PR0301MB1250; 5:Ebnferia/FC5/UAbLy97iBwKu+TC1JxY8aWjfpGbNDKBUvZ1BoGW1F6LSPk1Xhm8rPXWERt6M2F9qAD72snRbSUtWy9OSFmHJzvsk48QyCza3p916OJw6qKbaSn9c+rYrtMOa/HGaiEHrv80TjIBNw==; 24:3NIVSuyJq9NL7fPAEFsnUX8q0+krleiC8c8HmYlPGUw/ihz0zosVab3efJPL2nImOdYaR6Yp4AUlPCiC3kycVAf0HJwBTAK2okkw8GAGSNE=; 20:3irnbWBykXbRNWWW5uGMjq++5OCMLuXls506fzJvGNsRu/2Je4TjSfRdqoLwO6v+TvgMaE1FgkD649i6ky5MAQ== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Oct 2015 13:09:42.4841 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR0301MB1250 Cc: B07421@freescale.com, Gong Qianyu , alison.wang@freescale.com, B48286@freescale.com, Wenbin.Song@freescale.com Subject: [U-Boot] [Patch V5 10/17] net/fm: fix MDIO controller base on FMAN2 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" From: Shaohui Xie MDIO controller base on FMAN2 was defined as CONFIG_SYS_FSL_FM2_ADDR plus offset, but CONFIG_SYS_FSL_FM2_ADDR only defined when there are two FMANs, so we should only define MDIO controller base on FMAN2 when there is FMAN2. Signed-off-by: Shaohui Xie Signed-off-by: Mingkai Hu Signed-off-by: Gong Qianyu --- V5: - No change. V4: - No change. V3: - No change. V2: - No change. include/fm_eth.h | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/include/fm_eth.h b/include/fm_eth.h index 3e1b9f4..d43f801 100644 --- a/include/fm_eth.h +++ b/include/fm_eth.h @@ -45,8 +45,10 @@ enum fm_eth_type { #ifdef CONFIG_SYS_FMAN_V3 #define CONFIG_SYS_FM1_DTSEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xfc000) #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xfd000) +#if (CONFIG_SYS_NUM_FMAN == 2) #define CONFIG_SYS_FM2_DTSEC_MDIO_ADDR (CONFIG_SYS_FSL_FM2_ADDR + 0xfc000) #define CONFIG_SYS_FM2_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM2_ADDR + 0xfd000) +#endif #else #define CONFIG_SYS_FM1_DTSEC1_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xe1120) #define CONFIG_SYS_FM1_TGEC_MDIO_ADDR (CONFIG_SYS_FSL_FM1_ADDR + 0xf1000) @@ -89,6 +91,7 @@ enum fm_eth_type { offsetof(struct ccsr_fman, memac[n-1]),\ } #else +#if (CONFIG_SYS_NUM_FMAN == 2) #define FM_TGEC_INFO_INITIALIZER(idx, n) \ { \ FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM2_TGEC_MDIO_ADDR) \ @@ -101,6 +104,20 @@ enum fm_eth_type { .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ offsetof(struct ccsr_fman, memac[n-1+8]),\ } +#else +#define FM_TGEC_INFO_INITIALIZER(idx, n) \ +{ \ + FM_ETH_INFO_INITIALIZER(idx, CONFIG_SYS_FM1_TGEC_MDIO_ADDR) \ + .index = idx, \ + .num = n - 1, \ + .type = FM_ETH_10G_E, \ + .port = FM##idx##_10GEC##n, \ + .rx_port_id = RX_PORT_10G_BASE + n - 1, \ + .tx_port_id = TX_PORT_10G_BASE + n - 1, \ + .compat_offset = CONFIG_SYS_FSL_FM##idx##_OFFSET + \ + offsetof(struct ccsr_fman, memac[n-1+8]),\ +} +#endif #endif #if (CONFIG_SYS_NUM_FM1_10GEC >= 3)