From patchwork Fri Sep 11 11:02:22 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gong Qianyu X-Patchwork-Id: 516694 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 00A8614030C for ; Fri, 11 Sep 2015 21:11:46 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5AEB34B736; Fri, 11 Sep 2015 13:11:43 +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 akreGKWn8KsY; Fri, 11 Sep 2015 13:11:42 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 95C7E4B719; Fri, 11 Sep 2015 13:11:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2666D4B719 for ; Fri, 11 Sep 2015 13:11:40 +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 VikzJZqyWk6e for ; Fri, 11 Sep 2015 13:11:40 +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-bn1bn0108.outbound.protection.outlook.com [157.56.110.108]) by theia.denx.de (Postfix) with ESMTPS id 687604B714 for ; Fri, 11 Sep 2015 13:11:36 +0200 (CEST) Received: from CO2PR03CA0019.namprd03.prod.outlook.com (10.141.194.146) by CY1PR0301MB1257.namprd03.prod.outlook.com (10.161.212.155) with Microsoft SMTP Server (TLS) id 15.1.262.15; Fri, 11 Sep 2015 11:11:33 +0000 Received: from BN1AFFO11FD052.protection.gbl (2a01:111:f400:7c10::126) by CO2PR03CA0019.outlook.office365.com (2a01:111:e400:1414::18) with Microsoft SMTP Server (TLS) id 15.1.274.11 via Frontend Transport; Fri, 11 Sep 2015 11:11:32 +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 BN1AFFO11FD052.mail.protection.outlook.com (10.58.53.67) with Microsoft SMTP Server (TLS) id 15.1.262.18 via Frontend Transport; Fri, 11 Sep 2015 11:11:32 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8BB8Lqk022423; Fri, 11 Sep 2015 04:11:28 -0700 From: Gong Qianyu To: Date: Fri, 11 Sep 2015 19:02:22 +0800 Message-ID: <1441969351-40604-5-git-send-email-Qianyu.Gong@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1441969351-40604-1-git-send-email-Qianyu.Gong@freescale.com> References: <1441969351-40604-1-git-send-email-Qianyu.Gong@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD052; 1:1R4x05mz5gEG84983vwjH6aqty/qgvDaJ5rX0KrSAeove849ragvvkf7K+oFZZ7cHJA0CMpSfsROlADXIlWuWZ0wMRWsTN4jIp9+qa5WoZ931H8VqxyWtY1/ZRtmWFKqdYsjxV7URzY3KBAMuJc3mo7isuyQ/PnvXRiXbO10fA4RqjbqVfT0KYuOtOF0Fr4xzfJAnyZdsVdhrbH3NhaOTq5unCaLL9mLzRePw/K8oi+5lQIXlSM2sGjHuq5Dfgdh36urbzsvQVRKysJWHz3CLdlEYA3VfX9LqcXsGLTAic+Mjt7bFBfcj9Exmr+ACLMbATi/k4Vik7mM7fKaS0weAA/9BaWIT34odHUMHwAKI0LNxyz9vnB+L0Sri8X5qfZDuuW5yn8SJtKNJoOgpwlY2w== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(19580405001)(62966003)(77096005)(11100500001)(5003940100001)(64706001)(81156007)(77156002)(50466002)(4001540100001)(76176999)(450100001)(92566002)(97736004)(68736005)(36756003)(104016003)(50226001)(47776003)(106466001)(69596002)(19580395003)(2351001)(85426001)(107886002)(105606002)(5001860100001)(5007970100001)(6806004)(229853001)(189998001)(50986999)(48376002)(2950100001)(86362001)(46102003)(110136002)(5001960100002)(87936001)(5001830100001)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR0301MB1257; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1257; 2:p4Q09AlL3gj5gDkadHaC4ft5Y9KoyfDikqU3S4aVELImRRHgeR7ddhQdcmyHTnATtw8GpQaTYVH2z2A6aYjdIEcipy6OWdW3lpkU3+dKBU9LC1nNEtcURuqk+ayIqqwzUo9+U+v1jH5NIYqxOpsOU4aQKsWSbmJHIYuBzQkA2IY=; 3:qjuXSnp5+skdN/1I7mi1SyB28Lz+bC/f084n5r1l2CjNfQkCZxgiIgJnCgJR1uzxZqgN5MPnETK7JgoHr3+KhmrAyJet2OLiH+sPDSV1B7DLV/9n8PXYbL/4mmap7T4i9PLdHH/3s0gXDpOR7cAxKwrHHrnIo/ACq3DFmFKraENca3r2ND/R50NG0KF4EIVlxzMweykrBMikY661ewHO83HIb18olRfCVzP/Nk09DAw=; 25:DtW4GIP6Ip76TE6vxNqgARRyMT5iI8RgLMzrI4341DOvIxxPic+AN08AiU/GukopXQj8iFmtZChi4i+Dm9+jbFCiFxULYUBFaPKbpxjEvRXYTBnHrlrNOnmfOz6YMO28IIApajjcBrOBHKU4sVv62Q4bRI8ZYZukauMt3lWBzDHEhcIF8VTxTUogCAFHyjRvH9nNsK121u3yE9MKXSQgEmSPdQ9Zix7TAW81+OJ29h0UQvw6MzS7NnCQIPtMjRbqeKpPQzfwzJcB8C/YABnGPA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1257; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1257; 20:mCxM1csSxFgId1ONLzfsNUmR7Kg86nRnAbHSDhLhcc13dXUal5+ETORxav48HxUqe3l0I8o65WhiExW1PczO+RLFdlsthTsiE6/xTzJ2PJAvHmDF7Uhdv5jUAFkb4XWlLQMiUZIg7FJ96lhYkplJFRH5aZqQeEuuhox9X/oap/ELUN+ykxRBbIhbt54TuGuZW6/IBMsULqaTBaGZvl14uRPW7XYJODuidkOCsl2C3yoMtC6gFBViRHOjGZO6iwFblP/9kgh8ASVcDBa4Us0+uHW7q/vJ3p3mTZ7J5PBv3sRLJRDyFrXs+Qn1Mr250TYB7JxUVZ96NqajceJ1xUm4hqzHjt7RHzaZFsHEg7UqXPs=; 4:6dcz2aasPMm9SPGGuEnP9hn0B1lkH3169MY5LO1CUkJt7SnoZ4icggTHEBdRqrBrXWNGkHBT6YvCiambMOPAVt4SI1B6bAHbzt35K1DeLHslHZW7AImtXWMbfOFY5q7PunEuj7fNNf9qsa7cu+npwTC/k3jwzA+/Mi0BbdBJjgi5FSeCh70EUlAMpHIoR/00bLCLrivk/mGJKEMQdbc5K0R6d4dtGB+PZ5TD9MiZTPM/qLU9shSX2kz/Sti5lpFO8XPWBUuyaeXVXwUVvJKbqa5rrXsLRuMMfWFAEQ4Orj6d3bB4SCuGnGgTsJX/1UW7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(8121501046)(3002001); SRVR:CY1PR0301MB1257; BCL:0; PCL:0; RULEID:; SRVR:CY1PR0301MB1257; X-Forefront-PRVS: 06968FD8C4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1257; 23:sHyoWDuuB41bX+Ccu52fDtcfUX6gHEkH40G60gr?= =?us-ascii?Q?lrKqSEQkLLA0eCoOzJOqIQmf3GW6cLpYpPpUevKfSfRxxRwqBFKG1i810O6i?= =?us-ascii?Q?lfiPklSktAk4hIK8lHjevsk4FgiCRRHmxy1QKqi+SQeqFQ/CNl/W/XePsswS?= =?us-ascii?Q?5oPxshSiKT1m6dBAoXaRZU9Q+2WStq8YyPrq0WRdxHdB2zoDPOYmL3GgQ1EW?= =?us-ascii?Q?vGLf2mG/ZFhgbx5b98ugfTdirORdZWI6nLATajm/evSY2nsLGLviJCjr02NR?= =?us-ascii?Q?nQc5J/yp9I1fHagPAA0p5fD7XCa1osJ2xoU3ide2bYPocHaJRQO+cSAyeFVS?= =?us-ascii?Q?OtOCy1ZpeVL0fa0NBTUrKwzREga8tAkKRZoL/QosacaGB04ZEJFLmGXsKV/j?= =?us-ascii?Q?DBF7Bl6rovKkaHMLw5yVXeh5yW+tpUDGp02yAcSwFOuOxSgrGlNfI5+GadVB?= =?us-ascii?Q?7Z9EoYWl2sb/izwGC7nxotJwsDNLZBwyek5GYWPRu9o+tljBjEDKTQ7IozG7?= =?us-ascii?Q?QBiV8Qy+VugfChK0gYj898Pj/ZUsPeQXAkRWWUejqTagn0KgElpv+1deeVIa?= =?us-ascii?Q?irw8flWjI0bxvadjq7xB01ccBNcukwpEs5jYNZdYtR7VvBWb+FpdUE0eErT0?= =?us-ascii?Q?0gnQg87m5Tu5eRazhtq6HN0atMEQuxiyRPKqwCZGwc9dxBnIaqTCbtJmzWU0?= =?us-ascii?Q?sGj3jDSwXrH/LsFZX2Ww43/OKdr5L9Ldo0g28GScNvk8b117NmDcYjCfJmz3?= =?us-ascii?Q?7EC2UDM6YqlLbk24ohraaB+BfblXP5qupbAyr9Cb7+PsdCZcDHzJn93XGBEa?= =?us-ascii?Q?PVSk8+ZjJS4Gs16UYYNg5ghfHb7AJTdXgjbnXtDvn8PSHbla30wX2UALkKLW?= =?us-ascii?Q?oxX5WEYO6X+7yHTzuelxpxYD50B7s7m2U86tO049rVpZLkOtbLnmFJf82FQC?= =?us-ascii?Q?GQaEp4MyuowSVjoHxuNkn6kt+kT4SA/bf7XpnMl0q8NPrTlMYcCIEGNFZRgg?= =?us-ascii?Q?3odnj80aVPHVQ4c45x80yKxLqy6gJPTNB+em1LLqHZ1psg06gJEom0qxI5fD?= =?us-ascii?Q?jOU5XP6qJ/KwolPiq4h7hCgT+bDl7ivtZxQdCQ1aGINXhyMwW4dLlQ8UWZyC?= =?us-ascii?Q?jQoDJvSu4VkLCxK5agURsGy7snEbGSde18IHtxWFBaQF9o/sA5SGhMXoeIfS?= =?us-ascii?Q?gfoOuGjM5CPRcqIhgtnww137SzqKGx4BNBMFszhVXzoF/0M1p2FRPp/muapL?= =?us-ascii?Q?CsYdjii4YcQmZhLhwRhHayitXPL2npWhwtm5U2w39v6N7oUR7oLww6XE3nUZ?= =?us-ascii?Q?u7A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1257; 5:/J1+aVTb75T3MhiecHilMOdBaVImwgbYuZO5P+O1J/wb2jAZDAME4UaOPGDDuus8e+TjADvZVrZmh0ODAu6r8kKCXkFhthrbFAxZe6CbGTzjbA4UHWJBpR0jz6bZxjRTOOsjGVHzIBYbSgkSJl5/wQ==; 24:s2YAHnPktcjuqineOt99In3dWlNO0QH+Y5D9kPX5ssPzazhME5lR/FW/vjiKK1SjpPUctOXG2PSNm9gZzgOSwS4DbEGKNUCtPFRHFwT/BuA=; 20:CRthGVkXg5MJoddz0bdDQlzDxf8cflQhD10jNLQul+PgKbOn/p2prm+TSzNR4XPM32UeryDorZLLcZAl8VvJvw== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Sep 2015 11:11:32.3260 (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: CY1PR0301MB1257 Cc: Gong Qianyu , Shaohui Xie , b48286@freescale.com, b21284@freescale.com, b53747@freescale.com Subject: [U-Boot] [PATCH 05/14] 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 --- 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)