From patchwork Fri Aug 18 05:24:35 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish Kumar X-Patchwork-Id: 803037 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xYWjr3XRNz9t31 for ; Fri, 18 Aug 2017 15:24:46 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id BFDDDC21EF3; Fri, 18 Aug 2017 05:24:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 937BAC21D95; Fri, 18 Aug 2017 05:24:39 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 5F9ACC21D56; Fri, 18 Aug 2017 05:24:38 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0082.outbound.protection.outlook.com [104.47.41.82]) by lists.denx.de (Postfix) with ESMTPS id 8295AC21C54 for ; Fri, 18 Aug 2017 05:24:37 +0000 (UTC) Received: from BN3PR03CA0088.namprd03.prod.outlook.com (10.167.1.176) by MWHPR03MB3328.namprd03.prod.outlook.com (10.174.249.146) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18; Fri, 18 Aug 2017 05:24:35 +0000 Received: from BN1AFFO11FD034.protection.gbl (2a01:111:f400:7c10::185) by BN3PR03CA0088.outlook.office365.com (2a01:111:e400:7a4d::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1362.18 via Frontend Transport; Fri, 18 Aug 2017 05:24:35 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD034.mail.protection.outlook.com (10.58.52.158) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Fri, 18 Aug 2017 05:24:35 +0000 Received: from ubuntu1604.ap.freescale.net (ubuntu1604.ap.freescale.net [10.232.133.7]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id v7I5OVd5018054; Thu, 17 Aug 2017 22:24:32 -0700 From: Ashish Kumar To: Date: Fri, 18 Aug 2017 10:54:35 +0530 Message-ID: <1503033876-23379-1-git-send-email-Ashish.Kumar@nxp.com> X-Mailer: git-send-email 2.7.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131475074754192497; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.168.50; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39860400002)(39380400002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(4326008)(53936002)(8656003)(110136004)(626005)(47776003)(54906002)(72206003)(498600001)(104016004)(5003940100001)(97736004)(85426001)(77096006)(5660300001)(105606002)(106466001)(50466002)(6916009)(48376002)(305945005)(68736007)(50986999)(2906002)(36756003)(50226002)(189998001)(8936002)(86362001)(356003)(81166006)(8676002)(2351001)(81156014); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB3328; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD034; 1:+uv+rs8ZSvC1TskZ4vTlWZEjrelK20Ls9XVEOmsZntXhsD5tu5UBi9TrS2jYr4b/ZRX4KplpdHmSLK5uMqk93x+bbUZM6eSiP2Rs7PQtYa8RWHww+ZsHuFGGHO9+wIm7 MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c0630cd2-a942-403d-a471-08d4e5f96a01 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603157)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR03MB3328; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3328; 3:0KmZ0YxMgaP86ghax6oY/w4jc8b8oKJkRvgOzyThJgSdqpxPcFIpSl3iQgzpwfLICTFFh5Ec7lSJ/WaiqH2y73gaECnPzuP5IvkTn8Z8CeQEEyBEju4KUWI3F3rvNY03tvKAz1BDibgk4HbES4zC2yJ8JGZX9lsg6MdFQsRpF/w2BKpsHTVfJij6YEXPtIDM/BeEfirlk2xSC7F5kI3M8oQSbA6KBPB7RkziO7ZJFqZcCp8XtxYmyKfS5MiQN8u0Z5RphAVnNSS/ZjXsxa7n0fe3kJ1v5WaZrjCqCzpT/g13nvOpRrPeVN5ZJt4X6mBiF04s9znqqxzrqjh76i+1oxPUoGMw6lWc7o34ZVbZVLk=; 25:tMoLmEbS53yFAG9JSgcIKYeoV+iZBibg6y1LbAGyA7yaE3pR5OC6ES86c4sMJkxmz220htSMNVi9BFnwnGS0pEO8TPKj8OQtXbDjU+bc18bOzN7coLEmxlsPIGg6fapRw4F3ou4cCHjokeUYXhgYO/nj0E0zP0VznFboTlNRBu6Il6n7lU3Tq0y3jiLhOVH5zOgxvStGohU+XTmj/gWlXum3ZOtnvcq+/b3l6fJ1tTYfvNauCLmiaBH8BUQfSN24dXeof4Q4KHz09UX2BWdMX4X3xELY27/WZlVYXtA+xWpkXP8rQQUCm9ic+10BJULrdnyU/VDBLxuM40veNMFb2Q== X-MS-TrafficTypeDiagnostic: MWHPR03MB3328: X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3328; 31:aibCDtALLlct2H4+iT/NWRz8nVBIr7uLAjRCgrZjjeTfp4TRTjjW7BMhqPux3EZZk3cJtAO2F/bWfB15GWFJ4bpm7BvfD8cS/ZB5slFEDirtd0kE9UnSiP/AHz2tn6R5ALFg2uxrOyiChqNviuE5qgRvRQXyMWt9OFiLqy+NkKjRBBhUJNtqSuQIi+mh3zQFQJKE/WJfq7F7xQSRdhd9/LFp+62nruh4AfBBtPx0Y1M=; 4:hHBOkvAdTgINKa7ppCsc7xZSINXLGiY6CJ1XHuQ3wC90sYGCMa2GyooegWg/hePqJ+jxN9s3cIy0caKoXwggLUYpmLbhvkIaj0Y/GnVzgEhHzRg3Kj8cz9+fkYsm6qYZwt1KV01HQXItJOCDqU28rE4jKfZXkYT3RF3LjomSBnkBoyE6VPq3iJ3+IbVdNMhOhQLFz8DPL52CTWuLdq6J6IOWLLvBhixew6CpfwGf0GeWg2O0wsPJ1bHvwvOZgtuqX4I5PRRH1MH6ok5oF1kDT8sTaHmn/i56++LptrTNNps= X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(13018025)(13016025)(5005006)(3002001)(93006095)(93001095)(100000703101)(100105400095)(10201501046)(6055026)(6096035)(20161123563025)(20161123561025)(20161123559100)(20161123556025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB3328; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB3328; X-Forefront-PRVS: 040359335D X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB3328; 23:uV3Cb3wHwVgJQkfVQmJMq8iqmfpk2Xu/RWNO4yEhd?= =?us-ascii?Q?qgiEE5WBx5KvM3WZzwpydgTEZyWT89B7DAQtCPXWiGRXvZDpTLLLhkyngTJT?= =?us-ascii?Q?etvJBO0U2TuPR07hIo0ie7KDk33YN3dLfji/q0aWb2yKhcOg+LQICvPCEqZK?= =?us-ascii?Q?PsgwC7GQEkhdTyl4nac2FsXtL1Z2Kpmcv1nm+OYPqxpfeZcaq1EKNWsYRZSl?= =?us-ascii?Q?gNlnpMOqh8zK6ZMmnKOPX3usorBzI/xlM6lArtzvNg6NxNllZp0aeThiYsra?= =?us-ascii?Q?fLzcou9nxJNGliX/FyOp22S+l937/qHvPA/yBzgA2Gc/L9yfKMgWAh0qi4vP?= =?us-ascii?Q?5C457HWJjRNcRg4gBc12IFkmKe4jn9NrOxRxhoTqol7Iv2sOX+ib6bpDpnpG?= =?us-ascii?Q?oW91hzN8dzfytetU/TpdASUBAsI0eZ1mkChjIm9wIoqiEgtHI7yOBwT0S9os?= =?us-ascii?Q?UDxpyY51dYPJKxBDoIYGRBxArxF2y4H0F7jwIkDuRrz/qG+daI00YZMlCx+R?= =?us-ascii?Q?iB7RpOxYFrXaSPimabgtoodIAYJxfjEAE4woS5s6TyN0YIBcC8W/F5eET0ko?= =?us-ascii?Q?7V+uIzqhzJQWmXRNOjqQou0lgxO6Y58cZvTFgEfokmJ889OlKu+bCPbfIzCG?= =?us-ascii?Q?6LPcUYsMGs0wRg/SSLPkFVGq5LXW6sRffE2VMX7HvsjR8XAH8OgLSHbmqDVI?= =?us-ascii?Q?SMuEGK5k6J9FXZ++/Y6X4hgKjXOTuccjBnqwP4tdODZTeKs2ev/J806s+vFt?= =?us-ascii?Q?Eumk0rL/9/HhGXVMLXd+y2xVNP9HUcBXsCVwBPJMwo5EJtGIyn7eOePTgjUz?= =?us-ascii?Q?HDb0cK8DdK+BuEwmFKa1RA2VL4/XeAASG+C1HUbKsf+nGNTuhFs6qTGezKe9?= =?us-ascii?Q?VEBLYpFdOIM33qiORqXp3m8iC6Yg+wJZVWxtt56Bv90qmvxKAwFGVz24PPxV?= =?us-ascii?Q?uuoUV9I1N5XySlVRxK3eDlOePbG841eKgd2UsjLoiygNfysOW66WCr5tciTa?= =?us-ascii?Q?sdv3hgx4K2OVpmn0axW2y/j/lsYR9Abd/WuOh8s9gB8tM6NnS0KNIZ4oRYRK?= =?us-ascii?Q?cOESIwmo69q7Z2gNec9dnVU8f79?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3328; 6:DTdFBcDJw0qqgZa/5jW44DAxmjyo2Pwt92a9zLtp5/ONX+89nQZb1SzkKk/fKtk48XkRxXjoS1HQ+TZdVW2JKd3PUy0jkkSIn9o56+/CCON6P0FpwCA3Msm5gXW6Kods8Ste908/k0qdc49/t/jx2DLXC+l3eDHPP00/l9pAbvJ7zgNZ2QTCY8k2A6RMESTchOx+wUOHGMQd0AVH6Y/yhMBA2/YlIk3lVsKklHEugWAllRRAUt6ptlDxoeT/Nk0eTfuJDtxdUdKuvEV+RjKrUZ1RnACjfRq2TV5k59NdbTa6b4VFhB+Fw5qARhQ4WbmE5Hv5c5WaVt+9WOloYA6Cuw==; 5:OqCRTP9iR0AkAKU1/MZxarOAglqKMw1Ps8Ka/NCUbPmYmEgx6J0hOHFckV76NysGLvLE6TDRUrSVWz9GRc+VtckOPaNqlWFSLTBKusHkxLQ4HiFdgtxwqDrm8t/SVsee7jnJwTc9dJia2lc3WQLJ2w==; 24:csGmhe/hTEsx2NrtzIpnKIY8OwxO0sdKPf2TLzR1puW+gUV7E2cJ98xzcxWA73hWLVVZLVuVnxHHkEseU7HHTQQD+dAHwdodlOGwVTLYvPE=; 7:pvmD57D15yrPMP+zDaqH93Rlq7BuournZuuHc2kDlo4wzUGwd5YDrYv/pF5X1QlW8yIdlQ0ovqS+APNMS7okDGa2PHr4buuOKECsqJklTn8sEswCB879/bvJgHov7thYXir8sQJwGEgAOYaYMjCPukgy95Ac8t5ggsH8yzXnyuZ56tF8uktg4eKJMmcTTr86ZUUJozqBG1Ex3/Ctx+k/S49jm8yXA1K9aCDsJpoba9o= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 05:24:35.2476 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e; Ip=[192.88.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB3328 Subject: [U-Boot] [PATCH] armv8: fsl-layerscape: Put SATA code under SATA configs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 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" It is not necessary for every SoC to have 2 SATA controller. So put SATA1, SATA2 code under respective defines. Signed-off-by: Prabhakar Kushwaha Signed-off-by: Ashish Kumar --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index ddb7d82..a704103 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -215,11 +215,14 @@ int sata_init(void) { struct ccsr_ahci __iomem *ccsr_ahci; +#ifdef CONFIG_SYS_SATA2 ccsr_ahci = (void *)CONFIG_SYS_SATA2; out_le32(&ccsr_ahci->ppcfg, AHCI_PORT_PHY_1_CFG); out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG); out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG); +#endif +#ifdef CONFIG_SYS_SATA1 ccsr_ahci = (void *)CONFIG_SYS_SATA1; out_le32(&ccsr_ahci->ppcfg, AHCI_PORT_PHY_1_CFG); out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG); @@ -227,6 +230,7 @@ int sata_init(void) ahci_init((void __iomem *)CONFIG_SYS_SATA1); scsi_scan(false); +#endif return 0; }