From patchwork Fri May 25 09:06:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 920342 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b="r6umfNEv"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40sgQm6psLz9s08 for ; Fri, 25 May 2018 19:08:32 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 91FA3C21D56; Fri, 25 May 2018 09:08:28 +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, SPF_HELO_PASS, T_DKIM_INVALID 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 F3D17C21C27; Fri, 25 May 2018 09:08:24 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A0BB0C21C27; Fri, 25 May 2018 09:08:23 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0132.outbound.protection.outlook.com [104.47.42.132]) by lists.denx.de (Postfix) with ESMTPS id 8A715C21BE5 for ; Fri, 25 May 2018 09:08:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qGlcyKY0kfh6T4i5XSBZ8F+TCf4bUDQ5GlJQvuke4ws=; b=r6umfNEvd3qAcknsqw14lwKKPl+g9qtdBbjo45bsp+8CWwcYCa/rq7/KDq77fxp0MDA+CYUibJmniV/1dK6Nd1ot1NyEAz8TIMFCr5ki6OlG4FrbCRTLYu0yk3JbDHF7hT7h2ksuoWVgAiYUZBOjTJ/rh19A934AO8NfiImReZY= Received: from BYAPR03CA0004.namprd03.prod.outlook.com (2603:10b6:a02:a8::17) by BN3PR03MB2180.namprd03.prod.outlook.com (2a01:111:e400:7bb9::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Fri, 25 May 2018 09:08:17 +0000 Received: from BN1BFFO11FD008.protection.gbl (2a01:111:f400:7c10::1:172) by BYAPR03CA0004.outlook.office365.com (2603:10b6:a02:a8::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.797.11 via Frontend Transport; Fri, 25 May 2018 09:08:17 +0000 Authentication-Results: spf=fail (sender IP is 64.157.242.222) 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 64.157.242.222 as permitted sender) receiver=protection.outlook.com; client-ip=64.157.242.222; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (64.157.242.222) by BN1BFFO11FD008.mail.protection.outlook.com (10.58.144.71) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.735.16 via Frontend Transport; Fri, 25 May 2018 09:08:16 +0000 Received: from az84smr01.freescale.net (az84smr01.freescale.net [10.64.34.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.3) with ESMTP id w4P98E9o017699; Fri, 25 May 2018 02:08:14 -0700 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id w4P989fV022570; Fri, 25 May 2018 02:08:10 -0700 From: To: Date: Fri, 25 May 2018 17:06:44 +0800 Message-ID: <20180525090647.45451-1-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:64.157.242.222; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(39860400002)(39380400002)(346002)(376002)(396003)(2980300002)(1110001)(1109001)(339900001)(199004)(189003)(1076002)(86362001)(575784001)(486006)(4326008)(85426001)(305945005)(36756003)(316002)(336012)(54906003)(126002)(2616005)(16586007)(476003)(37006003)(2351001)(5660300001)(53936002)(356003)(47776003)(8676002)(6916009)(81166006)(81156014)(6666003)(6636002)(8666007)(86152003)(8936002)(50226002)(97736004)(2876002)(8656006)(498600001)(26005)(77096007)(51416003)(106466001)(105606002)(59450400001)(48376002)(50466002)(2906002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB2180; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; LANG:en; PTR:ErrorRetry; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD008; 1:3/hTh6cpjb1AAQ0e1lnWGYc9HBjlUpYczfDr8Yo30j5eW/i8X+6nehlclhIuTSPGAMIZX2nXEkJ7FCDctRrkmyoEdt8D/lcglFSOllVUhnrwBfihSjmrwnBadW3jIsji MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(2017052603328); SRVR:BN3PR03MB2180; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2180; 3:MD27G4v5QYaVCWYkmJ7sCNB7+lgAXb3CzQ6kqorOoYWWsPkTBs1kNjO0OeZB3CqsQ8+IJO3ZmvCTmur37m+dNx/OqGsuK9vWMOkQwYVCulTr9ZtDB7uETXhOh6iDNBSq7vElQkxMfdygbPfEQ/lIWsATNYAmerKaNUXIRj0nB7td0yGf0EGUEJHSieuAskYK2ASQYs8Tvv+8G7QhemAozI0eR5cWdgrCIufTQbD+Tpo1wE3vCN4OtPzf5WYAki/iNMpXQBX7kW7286cp1r4vHa6M/jXZRSRzvmfyYiaz3mmoah46wubtNe8+NvDBVCRZNXGeAEH5BiixiMHCCupmwCqJlOIjEKbn4MksPGzBfNM=; 25:MH1urs1kphH+GWZZDqR9o60VA4U9jD6xv4kfPprNuHA8yLsUUndn6h0VtZe1UJWOFCLOYZCJwlrVLJzKqJTJUtqJDkTqjpl5FH1wckTNgeWR/81e6pcslxHh/o0Op2gS426pKFUtN6231yOAvzJAVK0xwGADwZh5ZkUaolR2anFKPZ1+Vj2JEb6aPM0t4OsB1RFkrjGaigvsm0OGGLu9cwJJhr8NOO2swKdWib8AGlAHXbKYZDfRj4dAgG9wbucXoK500AB2z9VR3+nLqwJOfcPdymnVzhFcMYWLXzcXPnjH1wWfGiXStELg3wdTEmP9LS1oyUh7sE2/3ASerBz0nA== X-MS-TrafficTypeDiagnostic: BN3PR03MB2180: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2180; 31:LF38x/A1xgf5KBpvaNzHFNe+ApaJ7kNpHU+w04UZlMy0fpFPo+TGQ/Rr39AvDFbC6QmpTyUozajN24mcnjuistxLeS2iYjKZgPyPvSS3XP7oUaaFsPLsL8OKgZKZZ+wrvbO5oE4SryPIoavi/uvMm3+KoAwJa2DDyJxQyoX0Uyi+LykovlzhWVMC7xpmkj0VVCNFYeCWc3hqTsCosKvW0s2Qr6topJIcyWi5r8UrfKc=; 20:TEC3vbPeKxS/QLHhDLz0vOz0/KUhDmrCHURVtbAWvE2Bn2fISE4xRLPkcfbjHOHtcMb4ukAhWXYaHQe7s6fMZnkPLMPButizXY7WzgJQVz9aCQK2Ak07oiHe+LrVUg4E9ukKwAN0pyM9w2wHahONChx/WQbp/uPVKMvkXOHHj3c91AEa9zMq18XzM5+KFK19qGYHBZbBQnYSrX0dEUEAGIyH6MuthxPFjwrtp768MZNt9rkl4RVdH57zLq1OEEbJJQIwGI4YwuFx5m1CEyeWBzm4+nsCeS6tkTY7Pv166lUil+aMGAD+GiR17e04dIcEEPJvYDM75pom7QoXr9rYMD0ciKBEBum2Ao+XvEklSVRrQiypz1GEm3u7vgYDY2VWMja7JmoC1VcLPUNT22xsCVhFgwe5KavUIuS7Ju1gtcV2Ju9/C+NyGR06E2tHgCVIVpn+rZ9c15j8S5nFsxe73f+QFHDPCDeI7A88o8UCVsVwvSweg2hybBCHZd+LSSrQrIaZyMiRQKe1YN4NHnBok9ZR9ZGhriwLuxO6XQ9wqGzDvZtsfYi7lQFwrDypBRcWmo20F7PRBxWmYESZ186Cgl1xZwvkOmE8OxwcwZ1hG6o= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 0 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(3002001)(3231254)(944501410)(52105095)(10201501046)(93006095)(93003095)(6055026)(149027)(6041310)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061750153)(20161123558120)(20161123560045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:BN3PR03MB2180; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB2180; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2180; 4:aewNujXGmeeiF/heSA4IJkbzjwe9kUSi56nRO0TzoOeYElaVd9SwVEnapspJckv3Ezp8aqzWaztOL+CtDLaJqe0LY2RyKoUhr6rBtDdTdfw+4QG2yA1A48QDYpEYD5bL7SleiotOMHO2rUGfE0GEdwkZAewsheBCzJA45I67pHG6XkiFFBXuOiU5whpGd041QSPsbG0rXTx5Fhz6XiXT2SWM1hwzJ79YfK586DZCZNZASgnleMNSdBn7UttmtbYbn0+IyPb/eIMY75lo/vmi0dw9RseTZQzS9dYnB2Jlv1BC0EIK+zS5hiujEbimoaVD X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2180; 23:rF89HDyR1ACtnE0nbRtfTlhN4nELZAbMHv12gQF/w?= 2rfXj5FX+b/SyxFauUIND2GS0HbL/Tq273UtGAtqbIK4gVHeHG/+08J6gqG89Jm4nZM+SuMknoavuChQywqhvuxwKhaJkPEDYbXCQnHy8uu20IxJ1cdaDI/LpKs5zA7HmUAEkQ6UFD8wtLEdHCGm2R4qtR58kUv9VBh1+F0BwmFVIXajcwva3Co71AuMZhmdyyI9HeEy/8VtRxMT7tCbyXP4YitCqps46D34hjvY7PNOs43L+FKhdKrMY6JFtpmKWkrYQk96/gCxuN8Laifai2xi/7pX4/jMgjqkz/uJAVzMa82uvF3eZwczNLT4L6LXp3L2jNOezYS6ZjvyKh7fJvTTQqYmLYEJzka9dKBpD7xFKGS/PR1Bqo4iQ5r09oSsDxYqdBfZWiMstbbkYYEMDCYUH/LLd9LhtjYRHEqzkfCUZoE688GG2yXF3iJqXTJymJBShtf4EcMHqXBdLsSwawAP8DLAxdBDBJGCVILIiEtT+j+RVpI/5q1Z3lzdbxM2OCCgwzj8JpxZusRN2ufLwh2cwIYdaeOqmra9VzjXlwHdAzXPh+beT3uxkkWb+su1rEl93slwIj3JkVdvJvHSE6bzDPSYAouaDSiQVgg0n3ZTOYNte769vvc7OSui6lhq7ycSx/+y0uM57NCFNtXvx7ccUK3UAreQsx27itlysfrPZF+sExDckkJWJg7MefK9rXgEXhffAJWuID6i2Z0/vfnlh/ZBCPhIEG4sYPPM9kXZUAASlARJ3lbn1LZdBnT7RA12HnMHoXo0BftXYFnwUExY5r/3N89rvsY4Kbj2JDPsY3DQPWjj8g003uHZBidEOMmBVsX8xmXUq78M0vtMXIzXbYsDcrJIIqdRGPMxwkWmXqOE8ITPU1fxupgbFqBIc4A11SCnTWHeSVQ0KBhLE2yhfG6NtYdd3PEwi8p+ToWIftrD6ylUv/lLeMKigp6ximgXk1oSrFHzx12DHem5wY6vKevsEJ1SnY9qlBjC0DRxvuWs+Nssd8cGl2adpHxst8XTcPCTwUWsdunNl11UP4hs2UaRd2ngrnzaiDoPqUoIW7zpGt3ILQch5uvk/dacy287s22Pd8Uql4xxMjF3A7GuvhizpeQZCEnaEueBHPD59UHi/UmPc+W7mql7bBhEd6CyIKE98IH3vsorAxh28LAUZjRZPQoXytcKhtFTQlnI1jvi6afF9/j581HgfHycHI= X-Microsoft-Antispam-Message-Info: 0H5lxHZd2eNiwMnYTgihAAF8mmzo9QhDeXZirldlA1n8N+fwM/AUPaTTZqlqzgTUgI6TH2FYsk6tbAY0P3kp6RbzMdU3rtLbOdC4oS+joYAtq7IcDs2uDtoViRdjY+KdgZNbx81piVMVO78Gn2M+0CqFPkzrgAGjisfY7/gAZZ1h2HECm/DLgX3LxZmdbVqx X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2180; 6:6psR3T4T1byyx3QEA06nhPxr307flydvMAJMyxOXPVEJOyCIg5egwquDATXsg1mZGVM/cL9qxnaBM31Rx73xW6p/4HbLk4BaJpYep4aBAPX4BXcN6sEeSJ63eQ+IdITPHFxz9jZLRstXucGg/SfLI3+ebZ7qxBWRHtT1hWE87Xglwaba1cX4YGYmupe3yvNVoOURMHd1SfynDOsDQqrIFNFBRh1iSgTD190MayPJdyoTS+Bh6EBzR0wk2gJun9+vUJfy3G3tTVrbGxcavChyCeTwCqBeZwXgnLwdj0UapZ0dZbDIxzOhGrPLXQhn+8GDEaLH+Nk/h2ASWNfviDDnmqLuRHLMZk56KrshajHDpUsmXYenVGIOKi36uGdrDHDnV7q6STKVlBngTdIwbQET9J+xZu7mv6+imWC5tzia5MVjS7BzO/+lOyUJRIvP9UIGEX6IqJwvpxpQjZdUw2cKTA==; 5:9toY0wmXpdnXCLXGNqoDXqFgKD5LmXMZjPRqriJh5a3P8nWPSDLfF1t2RehGikGB1YYafw6jtP9kpSscZ7C6FBxQ2qe6eaMjjio1qzQtq1N1eMtPnaPrwvE+K/KFvhmqZdfH0P88UY3LCYbFf671J4EsiF1GMqNUJnFd1uPcxOA=; 24:dLbCqA5ObvjWHHeOiIMr12lr1ByhhTA3uu9yv6ZtNnc1nJtCDR5IwWK+Dqe2citb9OgAPFQxFJ5Bqqnbk1VqkmMjxnQW4wqGDqK/hPORV64= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2180; 7:3NGdczuokCO5sMxRs6evDa6Czp5rPMyFuvPIypuAvufgQ1KkDBuBb2ROcjNHmKafkP3K1+7J8IbADO+3k7OT40MVo/je3YwQKv5/N1kKS6yt1sA0EurpWn3kmK/zHkyB/xK1Pcr+WJzdDbbvP3fBKGNBlxKKe9JkZ/wjptNctMTYFGWwQjBV/2aUjZUHfEpTmPQuuEZPNEQtmtARMhfSc1LV4Fi4pe6b3VNacWCtcSWJ2NzGfW6Y5tKXs/dKnavN X-MS-Office365-Filtering-Correlation-Id: 2a789c94-8c34-42eb-563f-08d5c21f0d23 X-OriginatorOrg: freescale.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2018 09:08:16.0959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2a789c94-8c34-42eb-563f-08d5c21f0d23 X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[64.157.242.222]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2180 Cc: Yuantian Tang , michal.simek@xilinx.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 1/4] armv8: fsl: remove sata support 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" From: Yuantian Tang Remove the old implementation in order to enable DM for sata Signed-off-by: Tang Yuantian --- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 54 ------------------------ arch/arm/include/asm/arch-fsl-layerscape/soc.h | 32 -------------- 2 files changed, 0 insertions(+), 86 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/soc.c b/arch/arm/cpu/armv8/fsl-layerscape/soc.c index bfd6639..8028d52 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/soc.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/soc.c @@ -6,8 +6,6 @@ #include #include #include -#include -#include #include #include #include @@ -330,36 +328,6 @@ void fsl_lsch3_early_init_f(void) #endif } -#ifdef CONFIG_SCSI_AHCI_PLAT -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->pp2c, AHCI_PORT_PHY2_CFG); - out_le32(&ccsr_ahci->pp3c, AHCI_PORT_PHY3_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->pp2c, AHCI_PORT_PHY2_CFG); - out_le32(&ccsr_ahci->pp3c, AHCI_PORT_PHY3_CFG); - out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG); - out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG); - - ahci_init((void __iomem *)CONFIG_SYS_SATA1); - scsi_scan(false); -#endif - - return 0; -} -#endif - /* Get VDD in the unit mV from voltage ID */ int get_core_volt_from_fuse(void) { @@ -400,25 +368,6 @@ int get_core_volt_from_fuse(void) } #elif defined(CONFIG_FSL_LSCH2) -#ifdef CONFIG_SCSI_AHCI_PLAT -int sata_init(void) -{ - struct ccsr_ahci __iomem *ccsr_ahci = (void *)CONFIG_SYS_SATA; - - /* Disable SATA ECC */ - out_le32((void *)CONFIG_SYS_DCSR_DCFG_ADDR + 0x520, 0x80000000); - out_le32(&ccsr_ahci->ppcfg, AHCI_PORT_PHY_1_CFG); - out_le32(&ccsr_ahci->pp2c, AHCI_PORT_PHY2_CFG); - out_le32(&ccsr_ahci->pp3c, AHCI_PORT_PHY3_CFG); - out_le32(&ccsr_ahci->ptc, AHCI_PORT_TRANS_CFG); - out_le32(&ccsr_ahci->axicc, AHCI_PORT_AXICC_CFG); - - ahci_init((void __iomem *)CONFIG_SYS_SATA); - scsi_scan(false); - - return 0; -} -#endif static void erratum_a009929(void) { @@ -719,9 +668,6 @@ int qspi_ahb_init(void) #ifdef CONFIG_BOARD_LATE_INIT int board_late_init(void) { -#ifdef CONFIG_SCSI_AHCI_PLAT - sata_init(); -#endif #ifdef CONFIG_CHAIN_OF_TRUST fsl_setenv_chain_of_trust(); #endif diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 9a219a6..6e3a420 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -85,39 +85,7 @@ struct cpu_type { #define SVR_DEV(svr) ((svr) >> 8) #define IS_SVR_DEV(svr, dev) (((svr) >> 16) == (dev)) -/* ahci port register default value */ -#define AHCI_PORT_PHY_1_CFG 0xa003fffe -#define AHCI_PORT_PHY2_CFG 0x28184d1f -#define AHCI_PORT_PHY3_CFG 0x0e081509 -#define AHCI_PORT_TRANS_CFG 0x08000029 -#define AHCI_PORT_AXICC_CFG 0x3fffffff - #ifndef __ASSEMBLY__ -/* AHCI (sata) register map */ -struct ccsr_ahci { - u32 res1[0xa4/4]; /* 0x0 - 0xa4 */ - u32 pcfg; /* port config */ - u32 ppcfg; /* port phy1 config */ - u32 pp2c; /* port phy2 config */ - u32 pp3c; /* port phy3 config */ - u32 pp4c; /* port phy4 config */ - u32 pp5c; /* port phy5 config */ - u32 axicc; /* AXI cache control */ - u32 paxic; /* port AXI config */ - u32 axipc; /* AXI PROT control */ - u32 ptc; /* port Trans Config */ - u32 pts; /* port Trans Status */ - u32 plc; /* port link config */ - u32 plc1; /* port link config1 */ - u32 plc2; /* port link config2 */ - u32 pls; /* port link status */ - u32 pls1; /* port link status1 */ - u32 pcmdc; /* port CMD config */ - u32 ppcs; /* port phy control status */ - u32 pberr; /* port 0/1 BIST error */ - u32 cmds; /* port 0/1 CMD status error */ -}; - #ifdef CONFIG_FSL_LSCH3 void fsl_lsch3_early_init_f(void); int get_core_volt_from_fuse(void); From patchwork Fri May 25 09:06:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 920349 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b="JUBdhelf"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40sgSf3kPFz9s08 for ; Fri, 25 May 2018 19:10:10 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 25243C21DF9; Fri, 25 May 2018 09:08:48 +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, SPF_HELO_PASS, T_DKIM_INVALID 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 B257BC21DED; Fri, 25 May 2018 09:08:43 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id EE166C21BE5; Fri, 25 May 2018 09:08:34 +0000 (UTC) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0108.outbound.protection.outlook.com [104.47.42.108]) by lists.denx.de (Postfix) with ESMTPS id 77F16C21DB6 for ; Fri, 25 May 2018 09:08:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jGnnEj5MaO3PXtLtj8ESxOkLzTa9Es7fr3SdOBe3IH4=; b=JUBdhelftFspCSiBwJ7jvmekQZqlvZarrAEUq4lGNnnsrvqeeIV+RtmSx+fh3xnwMaEz/TcyapheiG3if53LQ8rBq334b/9Bukep41J1ubljFzKAPOxEKu0SYvsdPeh2VTzxX7wd7NH+CTZEpbcvTYUZuMsk0DaDjl8U9xVkRNM= Received: from BN3PR03CA0098.namprd03.prod.outlook.com (2603:10b6:400:4::16) by BN3PR03MB2178.namprd03.prod.outlook.com (2a01:111:e400:7bb9::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.797.11; Fri, 25 May 2018 09:08:24 +0000 Received: from BL2FFO11OLC016.protection.gbl (2a01:111:f400:7c09::120) by BN3PR03CA0098.outlook.office365.com (2603:10b6:400:4::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.797.11 via Frontend Transport; Fri, 25 May 2018 09:08:24 +0000 Authentication-Results: spf=fail (sender IP is 64.157.242.222) 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 64.157.242.222 as permitted sender) receiver=protection.outlook.com; client-ip=64.157.242.222; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (64.157.242.222) by BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.735.16 via Frontend Transport; Fri, 25 May 2018 09:08:22 +0000 Received: from az84smr01.freescale.net (az84smr01.freescale.net [10.64.34.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.3) with ESMTP id w4P98HBG017714; Fri, 25 May 2018 02:08:18 -0700 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id w4P989fW022570; Fri, 25 May 2018 02:08:15 -0700 From: To: Date: Fri, 25 May 2018 17:06:45 +0800 Message-ID: <20180525090647.45451-2-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180525090647.45451-1-andy.tang@nxp.com> References: <20180525090647.45451-1-andy.tang@nxp.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:64.157.242.222; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(39860400002)(376002)(346002)(39380400002)(396003)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(8676002)(498600001)(126002)(486006)(81156014)(50226002)(81166006)(77096007)(336012)(26005)(37006003)(106466001)(5660300001)(97736004)(85426001)(54906003)(305945005)(316002)(105606002)(356003)(16586007)(8936002)(86362001)(53936002)(76176011)(48376002)(51416003)(86152003)(8656006)(8666007)(47776003)(50466002)(4326008)(59450400001)(6666003)(2351001)(11346002)(476003)(446003)(36756003)(6916009)(2616005)(1076002)(2906002)(6636002)(2876002); DIR:OUT; SFP:1102; SCL:1; SRVR:BN3PR03MB2178; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; LANG:en; PTR:ErrorRetry; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:Wufaz2MGqsy2vRGLqPLYuKMAgt1yDHGs7gd0z25IispcqUmUUnDRTeNeunmrOUA3bivvIPuuFAJDYHhenhnQoOPX1MvjOMuGoAyv+QpEOimH4z591WTG+3Al5M9o8XvF MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(2017052603328); SRVR:BN3PR03MB2178; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2178; 3:A/qGMi9NFdfK3zuSP8ohwZ+jtb2jUDj0oes6PZylKkLG4kEsk9+Cax1J4zOjITAqKJGFijeynBdNVJZTTUUWCqjG7cO1M7v2NnN+7rudGrXEpz4QGLt/HGFsi3bsB/giErm3o5kyPzZ0YI+babbVLaAbm7DvLFsBGcTHZyKS8xD6jOLMlSYYFRy6L9IsTrHgTWKpm4qxm/cnwcqrnLl25vg1BUOLs5f+pMaCrtS/AykjqyIoLacxaW26VpI0nsZnq6wZegyv6Lr71AOvJaCHf5zXAvqiyn47JpD3/PhMZJCB2bPEyYlTZY4mXAYBANtNox2lqDU+y4m2tVoDKEaILjkU1A1PbyJyyR+aQdtY1JY=; 25:/LooHIKDPzOcHs/1U1N/IWq/+mp3UdGbZ/pRIVdHMJlDf9x3xFE6YwQzJRxnuuPvjrCoBgD3xsYbKCalWGooGgEGmRY1FTBiZj/IqxoEpipt1iH2HFd1jiKl88qiTVsi2di8gSmKhlDRwUvuuRajy4jbWrC7c26ClQZlwQfEaeAA99LVvMWMVvMzJnqb/zhAC+XMKsfWfbErV1y1vc00846iFG9ftGMgFo5swAMS1hB+JaWr9cn4gaZfUs4l7qyQhCn5VKFoninGRkttp0BvvcQUXjLGqRQP6Ll+qxSzfUumrUw0VD5SmE5Djs3sLGCZqNp6uYsucaGfdktwScK4DQ== X-MS-TrafficTypeDiagnostic: BN3PR03MB2178: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2178; 31:Kk9SKKdZHMUO+mkjXUxKYv72Yi2LKuNSrtaZ32WWfseygqcma3B/2882KdjleAKwnt/DrReVaIuMLLKKdnxVC/zDZoWGAMVFLAOuvM+1N8JHEFFTGjfamYQy557XoUo9Dm6T3Y9aKLBSrzZfqrVD97EfpnMXI/S/zBUQ1u8a1Crq6yQZeBqJZF70JRP6secXeiabN+ZNhQH4gARYdMOnqtDmpQy498+w15HWIvvZWE8=; 20:0P5HxAT8uCtshlXx76ktJBj5xsAbhUOF3Tcm7klOyI9Lcq7Otw089+ki4v6WHEghqbTAoGBwSehJMbiLFADKfarWo/yhwhNImDm69axhaIw9G37UBGCt9i4nDL4vLcG6s6l6TuHT+CiWj/Ie7VMkGvOaKiBm0B44emRTV6rtCIjKRHeEnmLpOvKW5iYHBsgll+LamQILSSJIZPCPtPPqCrYaflzXapw6b2ttg1dyGwuc00Dgz8j6dNT6h+f/tBN9X2eYpmdi29UbWk3qwSo5jQXaP4hm6AJN4sS30njnwdH3XeN5F/Fkz1Y+fbobsd2HNCS18znwOoFRVabgn1gmXmKKySj5CgKhrArsCDJaaegXW2VGyJiriWX3gmHo5AVaK0AGnPuPdjna2KZytHXJ03EGepoKi9XNrejIutxODmRy2nNgRYxgbmFUAT4n1uDQAr+LMLtblK1U5gaqxBioXgXpSBpInBbUNed43LnA37y0dvAa0rJ2WX/mZsMwQYf/G/UEq9Sp1wgkUJyLr79d/0fjGl4stC7HN5PrLiaJLQ/HuSes/DW6EWpO5dizjHyOYbO9/d99TlKuS4LQI32PTARP+vYgxgnAIv4+TpKHlZU= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 0 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(93006095)(93003095)(10201501046)(3002001)(3231254)(944501410)(52105095)(6055026)(149027)(6041310)(20161123562045)(20161123564045)(20161123560045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061750153)(6072148)(201708071742011)(7699016); SRVR:BN3PR03MB2178; BCL:0; PCL:0; RULEID:; SRVR:BN3PR03MB2178; X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2178; 4:CLHBYkseZYtv8mucm3oPF29CM90GpkMrF5AcgaBBlR3jUi6msgPmZPA4Kvo9wv+JiyyigTuw9ZpPjUJ/GsfV9IZ9eBMleNJQHVtxtGwEagirwNb8VQPCbKQi4+CcHda29YZj82cyEXRaMG5UWY0yT81+LOxvcbVGAX9AvQHxDmN7QhXAbWZ56kLY1fxvWf7zhuNE253f8zoXj2mJpV/HMIxG3xKzCVVtB2elAE25vyOL10YS1wMGkrnIP583Y8UL5mQkWm3Y+A4uHAXREVBI46Qf8bLtyGgX9SRd9OP0m3qIatbsr6OJcQ+DgEuwuUnW X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN3PR03MB2178; 23:s+1WDfJCpqXQHD/nPt32Ylmp1dJ0Q4nV2+97cBP8K?= 2z1eYX+joi8iQwM5mChgKODPRdSbV/ALU6PgBoSuPsOQmj4Z6EuCbfujBfpLHvnxtFqyXNiWaL+7nkhYjMn1A97pwDTZqO4vfd6OQ9mhe3XbZKy5UyVv6wnjlqsggCFERLmNIymYYrvwYzrHaWs4k/QKTwiaQVhSwrwpZ84JjZuLt7IUNsatJtfTpWm+BiXE4ZCnrfG5Qn0abwMs3eQ53AOn9lZuuXu6v3a4B7a6OZE0ND6MGsdKY8RtAxFvrbYLU887aZvlpF3AckIqeRv4GCFK8KisXdmrIUr4fuTE94C1D7dursltWrmtMsafZQVPzf1ZK1NN0Cqhhjr+NPQ2vTXDlEtsrOlJfe5Z1BydLoeEAUeVQagYW6SfAqF3TZCTr1oyZw8ql0uhYSGmq2LXBMWeVh9l8P9xiXrygnCgb4WQY9AswaEmbku/+vA9sZHosuX+oIJo4mgP2WeTCCbkb7puHsUxw2gtWOCLGcIfxsgd7AuHnPp6UBefBiZg4oUBiApaaZU5mJ0on4IQCdJovnp8eg7HX8xLRiXcEUlCj+hj/26Zl58CUuAMSzgkVzc9VBgTVFxlDyQqH5Lf+qq1g0BlX6h8HXpUQNs9eb2WV4OBbctlvN3l7UAsMHkfiSnddxyhCHHkelnpFoh/gBOeQ+NEDRPXnKmMPehp7Mn55qIh5eoKkeqem6XslkUGWjFbjOwwFiJKm7Y1H2sJCMLMFyJo9ZZUFM0iqSdIJH41sjU4T2TPf4yUf6qL7ff0NPo9//P+cdNAPPoO6+SnH3c0SFvJoXdBmbJEwSSR2bSGUY8CiJjyI9W8BdEvJ4/elg6VpqGYL/zkwpBe17QmjJaDcFv5mOurD+sI1BUnjQjsZMBg60NAoR+QdC3p9zeyobjUJS0NrXed5sr+QhSjKl7wC9sVd1cezv8PK68duus1JV8gXpz1XXhg52pi/T9ZTcye3xqMBR36oDSAvBXN8r77iCr540/Ks3swZbzpZcL5RPndaZB/gyY2WwDetQe2gReZ1mJY1O9VskuDr0Sw7/RvbLUtcXLFLbURHTHvyGPVg01DZPzmoLkDnNMliiUApXJ8a8oZQu6/55Qe/Tj16fnZgogYn+Kg0Kkrvh5Abb6rF/xK+2EQFLt+B/iw01PSYem3GZLaZsQVHcqWQBzFUnpcNcQrxf/LAzDGZZP4kFWE4/75I3m7jhHzojCqnm1abL4Yx6C4iqgwY295+jIZ5ajglpd X-Microsoft-Antispam-Message-Info: Qv3jGPelnT2MsNFwN/2P18hEX5gTOh21OZwW3kkPs+zK3VEnxRm+LhwDpr3MCuflvereGX9saSK1Xcs8Cf4hKKue//8m050eBm1V+AE7Z1Eibt2bUB0+Ozqsf8QrU0v2UDl1kg61LhAwiiaqCv75NFP1YvfLEAVP5xnPdclMoQ+RlHj29C+1gT2SGZlL0oMt X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2178; 6:XTwcmi+KVnF90p/hdRuuqiM8Tqq+rbOyfybCNqwbFj8LSWO+W0ZneqqAldrmaCwHMb6HOzJagd8ksX9gETA/DaDW3wAS/4K0FBs6Lfmd698sNW6Z2cC76DBIo1Z4IusnIcLu2x6tUX0W5usCk5hcJ7wDyGOhuTphgGOZ9NK3ZO3gR/Kft1WLYpdGs5RZsqLSFBtbwlX6Dk2EpXVeynFKFBXTol2CcHEHSNqblVMxL/JZCSaEkgE9iso4kmw1mClwobEPxg1rmFNV6wwrmlicfRtJ+akpM3cI6AHjMmm6ZpqBUSEjiJY4Aam8xNyiM26zDlfZI0pxRUvtdOtY52WZBEl2AW8fHgmnuzGCykgS7IZ9ChsY5RZHW27eTA43riGG0TTPXMpnqIhg6UC9hyiUZAiy55A+n2qBmpy6kJsQ2X0h7g+zM3rpKP36wO7faRRoD1bq1RGtvGG6Ed1q3L7Z+Q==; 5:xUZsarT/S4qmd1TyMg5mA48RrfmDZAC4eis+umi0XlMIwo7bxO/e+zh/GZo67oKUOwoEe7QjawRm6j0L22Atpcq06NpWoX/5eu0Eyy8Q0UHtxF1IdOpAfeXy7xN2mUp7zcrvQYSfVMxF7fhnhsWx4h43LM9Lasy7vO0xkmGlvjw=; 24:884nHKq4O78Foh+FYlFOQ+rijZPihtgBtOW1LihkaOmcebU1rAGlgTnGgIjadhIHn84MaYb8BiCZ/EdirZBlrmbnCUaMY4W6zZ4/QBhR2Jk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN3PR03MB2178; 7:rXAFjarG8uGpa54xN/lF/QYB1J3yjtzDGBwJKrYDXUgotIMJ9GUsOGKZXcpUl+yvsGl/2Ka58Ys96CnqE1Ahi2IK15GVeeG9bfhY3I5+2h/afu8gspEgyqW64xdiz/ClygZQog9QGEVFq0Sx4blO+/hQY90JP+l4+Nm/jeD1YOQtV9/BwiRac1N0cnVcjX6bxTmWjr9+StTI8OOwKghhiUtCOAGv01D4n9tEGoho8UbJYaIO7VQogvFqERGfFg10 X-MS-Office365-Filtering-Correlation-Id: 4a976fc1-0d60-44d5-bb95-08d5c21f10fb X-OriginatorOrg: freescale.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2018 09:08:22.5940 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a976fc1-0d60-44d5-bb95-08d5c21f10fb X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[64.157.242.222]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN3PR03MB2178 Cc: Yuantian Tang , michal.simek@xilinx.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 2/4] armv8: dts: fsl-ls1012a: add sata node support 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" From: Yuantian Tang One ls1012a, there is one SATA 3.0 advanced host controller interface which is a high-performance SATA solution that delivers comprehensive and fully-compliant generation 3 (1.5 Gb/s - 6.0 Gb/s) serial ATA capabilities, in accordance with the serial ATA revision 3.0 of Serial ATA International Organization. Add sata node to support this feature. Signed-off-by: Tang Yuantian --- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 4 ++++ arch/arm/dts/fsl-ls1012a.dtsi | 8 ++++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/arch/arm/dts/fsl-ls1012a-rdb.dtsi b/arch/arm/dts/fsl-ls1012a-rdb.dtsi index 201e5fa..757e2eb 100644 --- a/arch/arm/dts/fsl-ls1012a-rdb.dtsi +++ b/arch/arm/dts/fsl-ls1012a-rdb.dtsi @@ -34,3 +34,7 @@ &duart0 { status = "okay"; }; + +&sata { + status = "okay"; +}; diff --git a/arch/arm/dts/fsl-ls1012a.dtsi b/arch/arm/dts/fsl-ls1012a.dtsi index be99076..f22cbf4 100644 --- a/arch/arm/dts/fsl-ls1012a.dtsi +++ b/arch/arm/dts/fsl-ls1012a.dtsi @@ -134,6 +134,14 @@ 0x82000000 0x0 0x40000000 0x40 0x40000000 0x0 0x40000000>; /* non-prefetchable memory */ }; + sata: sata@3200000 { + compatible = "fsl,ls1012a-ahci"; + reg = <0x0 0x3200000 0x0 0x10000>; + interrupts = <0 69 4>; + clocks = <&clockgen 4 0>; + status = "disabled"; + }; + usb0: usb2@8600000 { compatible = "fsl-usb2-dr-v2.5", "fsl-usb2-dr"; reg = <0x0 0x8600000 0x0 0x1000>; From patchwork Fri May 25 09:06:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 920348 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b="sDuYCwW7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40sgSF1zRDz9s08 for ; Fri, 25 May 2018 19:09:47 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 7CE2AC21E08; Fri, 25 May 2018 09:09:06 +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, SPF_HELO_PASS, T_DKIM_INVALID 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 AF43BC21DF3; Fri, 25 May 2018 09:08:46 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 120E1C21DB3; Fri, 25 May 2018 09:08:30 +0000 (UTC) Received: from NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0100.outbound.protection.outlook.com [104.47.33.100]) by lists.denx.de (Postfix) with ESMTPS id 73AA4C21DDC for ; Fri, 25 May 2018 09:08:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Y4S/G21DSbBJE2Pyw+AHQpn6M8QDXpMyAhTNIiUxpkA=; b=sDuYCwW7TnhgTh0vh6xj9t3XHEtH+o2CfuOb/Hd2wT1N8ueyO3adPyS0/cq1QiaQYPKWBFWY6v1+7czwB+PBghTnrhw/ZYpyprGe+ahyUWQZpg8II9c8Cpnl5CryKcmX279NHrGZZyZit6ke68Zbg9dNVCIHOw+k7Fir/j0aDWk= Received: from BN3PR03CA0100.namprd03.prod.outlook.com (2603:10b6:400:4::18) by CY1PR03MB2188.namprd03.prod.outlook.com (2a01:111:e400:c613::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 25 May 2018 09:08:23 +0000 Received: from BL2FFO11FD011.protection.gbl (2a01:111:f400:7c09::117) by BN3PR03CA0100.outlook.office365.com (2603:10b6:400:4::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.797.11 via Frontend Transport; Fri, 25 May 2018 09:08:23 +0000 Authentication-Results: spf=fail (sender IP is 64.157.242.222) 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 64.157.242.222 as permitted sender) receiver=protection.outlook.com; client-ip=64.157.242.222; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (64.157.242.222) by BL2FFO11FD011.mail.protection.outlook.com (10.173.161.17) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.735.16 via Frontend Transport; Fri, 25 May 2018 09:08:21 +0000 Received: from az84smr01.freescale.net (az84smr01.freescale.net [10.64.34.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.3) with ESMTP id w4P98LTq017748; Fri, 25 May 2018 02:08:21 -0700 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id w4P989fX022570; Fri, 25 May 2018 02:08:19 -0700 From: To: Date: Fri, 25 May 2018 17:06:46 +0800 Message-ID: <20180525090647.45451-3-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180525090647.45451-2-andy.tang@nxp.com> References: <20180525090647.45451-1-andy.tang@nxp.com> <20180525090647.45451-2-andy.tang@nxp.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:64.157.242.222; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(39380400002)(39860400002)(346002)(376002)(396003)(2980300002)(1109001)(1110001)(339900001)(199004)(189003)(47776003)(4326008)(26005)(77096007)(16586007)(8656006)(316002)(5660300001)(37006003)(86362001)(575784001)(54906003)(6916009)(1076002)(446003)(105606002)(336012)(50466002)(106466001)(486006)(476003)(126002)(2616005)(11346002)(48376002)(36756003)(305945005)(6636002)(6666003)(97736004)(356003)(498600001)(51416003)(8666007)(76176011)(59450400001)(53936002)(85426001)(86152003)(2351001)(2876002)(8676002)(50226002)(8936002)(2906002)(81166006)(81156014); DIR:OUT; SFP:1102; SCL:1; SRVR:CY1PR03MB2188; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; LANG:en; PTR:ErrorRetry; A:1; MX:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD011; 1:ABrfx6e67Jg2KxrDXEsjk+lH58tOQEKv2DqLLOuWr10IAKt9xucIWCtaJ/xclkB2jdtazBb2RRe6+mfIkum/zPouiSEHXq2e0TwEhd4t98t9ITesrg2Pu8yTpf4XTs4e MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(2017052603328); SRVR:CY1PR03MB2188; X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2188; 3:c4Nk9uatnFJgIVgRYDXRGhkY4LQ4RWUv7dy7cTtoTeMVt8ING0XENh6bWBaKHVkvONl7iusensjKyoIDaP0HZjTGFkcJuH6+SVg2RPA3ax8D93Vk9Si2wY0tPoX75gzsbje5WRROyVY5P4TBs5XQ0k4I7S7QvZ2fGIhL+nuJqn5diWwFlzHHqf9SLfEVoRv1HKF6w3HBmiQFy/1i4iIS34CTW48r+y6wAamgAFExB7IrjDA/0EKZqQi1YE+2FlvpY5aDNAN8+CxVzb2bh2gsR+5tPXxNv8K1/xxBj9pCwG25pIUBbL7pU9saviorhWCZX6Yyk70mHfYe2X+IJGUwqR37BV1WbhLRDRg/owvC2/w=; 25:dHpqbPWfaedCPpVaEGeUVKGGo1sXer94HqnOywO+WPX4Au2MfS0oqZsyrd3PHPVl27Hd2AsfOoVntLXvY9ziwNsHJ68ePcdnqk52OtneFxOrRs+0tvNX5obCo9BG8kTfkeNvZNMWjKvowX9VIaDhRh6nH0vsb6Xa1ZtsZVTrrhjABB/bzHaSnzkKcnqr0vMlvnWb4QF5ZArAhhTyPUBH2h7nJs0uyYj0jYvWbv//p/qgbuqcXinprosSyJc7QRiS02zJq4NNKnfvaFMMwE5lLcJMwHdpdnJ2XaSOj3AxmONWV/1d4rmTpGFtN4H51syiP29NlZPG5D3EhVDAUeh9vw==; 31:S7ut6FUyf6vOrTzPY3SJmwlxh5hGGKoQRIgdmbuKGN7Tl4NLKOajo1f2g3Fzfaz8eL2cVf5dqCnn3BT50wfrhDPwK8f0nxrK/kaZOR2JHg7bp/yOxScdz5EaM4CVAVAufk6gAs3U4fM+XxMzxPdMxr03Umk53nfVGbzp3Q8hnimTQf5OqI1d6wGjqB13Dk8WNh4at/i7LayWYCXdkYioVw== X-MS-TrafficTypeDiagnostic: CY1PR03MB2188: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2188; 20:OqKeonMtfcLD7oBVuouDiqxmm5nXEGmWof8LSlJ4NhEev1Mz+/MGyP4gA8rLCQU9j9AFc4d4QzNfnEcF57JYr9nP0Eww0BHmsje3yLs1QcGgfOqeR4lCsmZqQTJ7CHYj+uIihyncGfg4Eznl32U9BCCLMN4wACaOyBeKgh1yDxriRRxN+gK53DZDd2jUUHNCMrgZfdMIuSpqu9j9H0vhUII4JCNHSrsdJR4TZxBTraJ5IpxIlZb3kxAJWk7ekzAUmxeyzLu50nGGiY4I61aiilyE78WQqGaF+hm6by1/e3ET4JgQyA2d4LnLc5oicauN4lmmL53/UWKVYcky2s+NYJURFPSln5JlikplLhmXxaxV8vnX0zE8iexm0ollq733n5crWNN2rTAI5iMgAmdq3nDq2OExSyQfrJTro5+dv281DsXRBQSxvNs9jM6pT5xHwKMhdMFpM4UEZR/oYWGFiGFw+BFj3Gkn8NnosV9s5JjXaGt84lunAcOM/RNHblUkKc4iQ9t+TJhqHlLsqMfnNuBpZyt/QzJm+W5iCucwnldP2szVqG/vycuF5sCrAi9bOSc52o1iQ+UpdwUr7+yeTDFlADf41xwJw45OZ6ktVKg=; 4:zuN3IPlZoYLBS0V5tqWw/c7a+ddpXT7rSPw+9Hu14ONoaXF7WrD/k/xI+z/oqlPfRjlJA28kYBOUjFxnPCd78NcXviH4yT2gHXDfyj/bwbFUHdbplvMh+nhpIp5rnOWWNr4ZinAAL/MiEMrF3m+UygZ7WzS7yPfRgYgEzZsqwCzxjSbxIR1yibh4bVY1j1SV4E63+MIHPzHl3RaxjlQD2PfsNp0iUvuobP50RGh57Kphjnl2LPslUTeB/oX3+ud1/IhZY0TyQsX2l3dMD2kLohPYT+0trNWtvvvKmDFisNlPdPxTPPf2Mo5/4bp5fAKh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 0 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(5005006)(8121501046)(10201501046)(3231254)(944501410)(52105095)(3002001)(93006095)(93003095)(6055026)(149027)(6041310)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061750153)(20161123564045)(20161123560045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:CY1PR03MB2188; BCL:0; PCL:0; RULEID:; SRVR:CY1PR03MB2188; X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR03MB2188; 23:BQTy0ZkOTzpqzsfnAKyJGFfVGGZ1j0WUXWNpJ53u4?= XKeEZG6c84LgBJBog+WLSlM3r51S1ylEWfuaKaLTBiLrDfTLIQJo8Ut7TnyLC4QyFsZ37W11/E4vDJ7436Wnrck+dx0WV7SX+G+fkmxgdA2KKpDp8W3u9lJRlKahOQN83/ynu11GuPOIHWaeLl4qLqJl8Vy2xGPX+J8V1mHD2iTOCx3OY8oITM258m1+ktvq1MPE80sekD/v1gTvVes1xoDocWv5xdxhtoGAMeQNKR1QZiy2xykz7poelr4Ri2FA8lTswQzoXeLpO5ekIJ5+GAG72CmhwhgI2IInK3m2ccvprlAB+POgYQwZT30N/CnJaVAua9BAClt5yxYcWGs6JZ0qlBpEiYTUeQ0FUQ7nPvMmqDGZ5eZdOTov5eQ/jCfx1s99N5cLAiAqYv2rJrPCSfq44Ey85jJ975sGE02Rq13Z9dfEiDyKCX7YV5FSBlc47vckBwi3UQt0URJW8MdQvYMiuGFbO7IRjDUzPBiP4u5wl/SD7N4vg5Vdt1T3ZGrSGupCDloMS3H+HzO8MV9ko1E2i47NqifPgPeom62ZCoqx/27Mooc84HSL8R9n1K9IQB8dlpM91YR5IbgOE8zW+WL7SV1VRHR/2oEqohPOUaAXcU5xtNVHCiNe5o26YvXt4D+cs93Ea8knKU+dpcAFf4ZDC8XS7SgZQsNZyPG/XiJ1ZNifJfPHBvVeJRi0M1N4mbkmloWrSerL3JguWjOeM16QLL0cR/puL1skfNPI69LikMsTeXdKun8UH6aWbEDkkkxFnFGTeqrRug9o04mNMtPyOUFrqTdcXqF0K+Xmq9RMlZHYmjAxkMXf8FiBE7gdQWlRHqKI0cjO3ZsgKoUQ4RPyqS8FztLUCkK8/9rGIDWkI0fMvLpqIq1mj3AHg4FDaOHzmeI/kuVgWTfu3iZXxeEkQ8/Zf68hpPloNbSCw3bIBgRuYHZdOO7up72LdDOA4+vgNhjQuG2x8WnqSIjXlAyYGzLOAj2P7qh5+GMmIUZmzDzX0G2grWGwhMDruA/fpc1G3G9KK0a0mHNtgcSQECKyoXnG7gLsWGUerQLGgkXfHGQKZL1WghdwiMj+WbyOEKqeWnwAB7esWy4lxmDmJ9b8Xv+0kU34s7IWXeyO1yAOGkApJ1fO9fgGgPPVDVkRJBiVI+ffgL3lsiJP3ao06bkxMceQ73dxhGqI1cFi1spNcEKmScMIjNFixFXVQEfpbBXf4BGqnTuERYuVVEAuzOPO3MueeIHnqXIYag3uN1z7g== X-Microsoft-Antispam-Message-Info: WM/XxSB4zcLoOxn8Ww9UeCWmVvg3zurupq9g3KjfSWgAdpn7wlmA1q6Yjls9uPdSorg4PPUOwi/19O0NEdQxKS3bTT9IRt/qTJUjUAaJEAePDmFMoiYze0ucgvQlXD4VF3BJSPo2mq8FAm6evabin+cVpOT1mWh1Oe0NCWt5PJ7+TWt4lKwa+6wceAop8mWB X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2188; 6:iaYYx/fubQAFpLnYGcAgudtiuHdDGja1cL022AQh+3M5fQt5ja3lWBD4YJP9WlGD9vBS2fY3oPzu/0R+gMZyMw9s8KPiqEBNG0a7XyTsu3DeN53tJNRVV8b0TXHjGORiwqm1xs4v8sxp0OiS+LhM8nGAKs6eh+8OHkIBI3cz/nuzoBzKFikXnQ8HcnlUKnTvWvMpzfgTbS6LKZJjEqxcku4LElON2ShFpxc/iVWgYsYj/Oo9jk3n2jW3/uSowCc+wRkIU9eY51s1F02bZCWi4M7caNYhmDwonKOWl4ONwlw7L7/F4W/Qk9grNnUm8Tb4dd+ct0jan0v4uQzI0ByrkNrIchtfunxLVOktwEhd7g19vbid5sD2X1xFYggzDB1+4CqbOFci8troZzbXxTzzINJ/hX/7Il8vd7elv5HzEoSD7qGZlipnnTDMiTEpesAuSMmoQYKK45DEoFLjv3nyFA==; 5:Iup7jU5rGBR5N1tLjrtQub9bD+zA9+KwHODOvj0IAD+f1r9TG2hsY+/G7/xe4jZ7N1uiFP3oPbIOsLHLFh1gz8ccvYMwH4ipBDJOE1EPMDy0iThSr+Co253n41CAd8k1XTEiDBU//EKN0AJ3KGd8MMmfAJkGwBIIT79mnKMjZ18=; 24:NP+PjN4iLBtHes4YrR2He971nDramdbgUqqQniOFe+HFx3UT5bT9/Vbq2lphNcRNMkqaiMD0CckWfwlVY31EMEt6pQZQeEP54aG8ESUpBKs= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR03MB2188; 7:L/3Q2NRZM0KCaGcDAz23up/l1Fke8yuXlnGcGrkuRfzNi6ZAdOzOY8zuQLHGllRvdlmnLB3jFYGhWFIBhTyAybrR6cV6V3RMpsCuqWMefH1pxmASp6bXt/HkQWIGz4zPvUXxNdiyoh7zFiF6KNN0lnoGA03LRLP3Asq7BE6YvfgtWTNeyyD5vBg+FE8YsJar6I2oUWS2WxLZPCVQ6GnRH5loNz7kw3D4FOPCeKzj6hS2VewlAs79+6kJZoKexpD+ X-MS-Office365-Filtering-Correlation-Id: 91821803-19a0-4e11-308c-08d5c21f1099 X-OriginatorOrg: freescale.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2018 09:08:21.9482 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 91821803-19a0-4e11-308c-08d5c21f1099 X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[64.157.242.222]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY1PR03MB2188 Cc: Yuantian Tang , michal.simek@xilinx.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 3/4] scsi: ceva: add ls1012a soc support 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" From: Yuantian Tang Adjust the code structure more general so that more socs can be added easily. Add the ls1012a sata support as well. Signed-off-by: Tang Yuantian Reviewed-by: Michal Simek Tested-by: Michal Simek Reviewed-by: Michal Simek Tested-by: Michal Simek (with and without CONFIG_OF_LIVE on zynqmp zcu102) --- drivers/ata/sata_ceva.c | 87 +++++++++++++++++++++++++++++----------------- 1 files changed, 55 insertions(+), 32 deletions(-) diff --git a/drivers/ata/sata_ceva.c b/drivers/ata/sata_ceva.c index a7d45e8..4c9ebe4 100644 --- a/drivers/ata/sata_ceva.c +++ b/drivers/ata/sata_ceva.c @@ -18,6 +18,7 @@ #define AHCI_VEND_PP3C 0xB0 #define AHCI_VEND_PP4C 0xB4 #define AHCI_VEND_PP5C 0xB8 +#define AHCI_VEND_AXICC 0xBc #define AHCI_VEND_PAXIC 0xC0 #define AHCI_VEND_PTC 0xC8 @@ -72,45 +73,57 @@ #define DRV_NAME "ahci-ceva" #define CEVA_FLAG_BROKEN_GEN2 1 +/* flag bit definition */ +#define FLAG_COHERENT 1 + +/* register config value */ +#define CEVA_PHY1_CFG 0xa003fffe +#define CEVA_PHY2_CFG 0x28184d1f +#define CEVA_PHY3_CFG 0x0e081509 +#define CEVA_TRANS_CFG 0x08000029 +#define CEVA_AXICC_CFG 0x3fffffff + +/* ecc addr-val pair */ +#define ECC_DIS_ADDR_CH2 0x80000000 +#define ECC_DIS_VAL_CH2 0x20140520 + +enum ceva_soc { + CEVA_1V84, + CEVA_LS1012A, +}; + struct ceva_sata_priv { ulong base; + enum ceva_soc soc; + ulong flag; }; -static int ceva_init_sata(ulong mmio) +static int ceva_init_sata(struct ceva_sata_priv *priv) { + ulong base = priv->base; ulong tmp; - int i; - - /* - * AXI Data bus width to 64 - * Set Mem Addr Read, Write ID for data transfers - * Transfer limit to 72 DWord - */ - tmp = PAXIC_ADBW_BW64 | PAXIC_MAWIDD | PAXIC_MARIDD | PAXIC_OTL; - writel(tmp, mmio + AHCI_VEND_PAXIC); - - /* Set AHCI Enable */ - tmp = readl(mmio + HOST_CTL); - tmp |= HOST_AHCI_EN; - writel(tmp, mmio + HOST_CTL); - - for (i = 0; i < NR_PORTS; i++) { - /* TPSS TPRS scalars, CISE and Port Addr */ - tmp = PCFG_TPSS_VAL | PCFG_TPRS_VAL | (PCFG_PAD_VAL + i); - writel(tmp, mmio + AHCI_VEND_PCFG); - - /* Port Phy Cfg register enables */ - tmp = PPCFG_TTA | PPCFG_PSS_EN | PPCFG_ESDF_EN; - writel(tmp, mmio + AHCI_VEND_PPCFG); - /* Rx Watermark setting */ + switch (priv->soc) { + case CEVA_1V84: + tmp = PAXIC_ADBW_BW64 | PAXIC_MAWIDD | PAXIC_MARIDD | PAXIC_OTL; + writel(tmp, base + AHCI_VEND_PAXIC); + tmp = PCFG_TPSS_VAL | PCFG_TPRS_VAL | PCFG_PAD_VAL; + writel(tmp, base + AHCI_VEND_PCFG); + tmp = PPCFG_TTA | PPCFG_PSS_EN | PPCFG_ESDF_EN; + writel(tmp, base + AHCI_VEND_PPCFG); tmp = PTC_RX_WM_VAL | PTC_RSVD; - writel(tmp, mmio + AHCI_VEND_PTC); - - /* Default to Gen 2 Speed and Gen 1 if Gen2 is broken */ - tmp = PORT_SCTL_SPD_GEN3 | PORT_SCTL_IPM; - writel(tmp, mmio + PORT_SCR_CTL + PORT_BASE + PORT_OFFSET * i); + writel(tmp, base + AHCI_VEND_PTC); + break; + + case CEVA_LS1012A: + writel(ECC_DIS_ADDR_CH2, ECC_DIS_VAL_CH2); + writel(CEVA_PHY1_CFG, base + AHCI_VEND_PPCFG); + writel(CEVA_TRANS_CFG, base + AHCI_VEND_PTC); + if (priv->flag & FLAG_COHERENT) + writel(CEVA_AXICC_CFG, base + AHCI_VEND_AXICC); + break; } + return 0; } @@ -125,24 +138,34 @@ static int sata_ceva_probe(struct udevice *dev) { struct ceva_sata_priv *priv = dev_get_priv(dev); - ceva_init_sata(priv->base); + ceva_init_sata(priv); return ahci_probe_scsi(dev, priv->base); } static const struct udevice_id sata_ceva_ids[] = { - { .compatible = "ceva,ahci-1v84" }, + { .compatible = "ceva,ahci-1v84", .data = CEVA_1V84 }, + { .compatible = "fsl,ls1012a-ahci", .data = CEVA_LS1012A }, { } }; static int sata_ceva_ofdata_to_platdata(struct udevice *dev) { struct ceva_sata_priv *priv = dev_get_priv(dev); + ofnode node = dev_ofnode(dev); + + if (!ofnode_valid(node)) + return -EINVAL; + + if (ofnode_read_bool(node, "dma-coherent")) + priv->flag |= FLAG_COHERENT; priv->base = devfdt_get_addr(dev); if (priv->base == FDT_ADDR_T_NONE) return -EINVAL; + priv->soc = dev_get_driver_data(dev); + return 0; } From patchwork Fri May 25 09:06:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tang X-Patchwork-Id: 920350 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=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=nxp.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=freescale.onmicrosoft.com header.i=@freescale.onmicrosoft.com header.b="f/sl/Ll7"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40sgT10SK0z9s08 for ; Fri, 25 May 2018 19:10:29 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id C475AC21E30; Fri, 25 May 2018 09:09:25 +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, SPF_HELO_PASS, T_DKIM_INVALID 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 A0AADC21DFD; Fri, 25 May 2018 09:08:50 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 0D2A6C21D8E; Fri, 25 May 2018 09:08:36 +0000 (UTC) Received: from NAM03-DM3-obe.outbound.protection.outlook.com (mail-dm3nam03on0116.outbound.protection.outlook.com [104.47.41.116]) by lists.denx.de (Postfix) with ESMTPS id 17FD6C21DFA for ; Fri, 25 May 2018 09:08:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freescale.onmicrosoft.com; s=selector1-freescale-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ONmnhiHEPMvjUETshwLUnHDnMd39+4yt54xefw3LIuI=; b=f/sl/Ll7QKDK4KOpu+a+U9+YPyKup4fZOWis30RXg9ZxG5iY9XUwauq1Rt8VR30Sm+RVgM73kvQbkYJtafnmAIXWFCSBT5QKRDptwdUWKUwsBMFjz/MiQxpTU+YEupiePtF1tmxmVxjgitB82Xnfv3+qZCBflEeYNNh9P8p5Xn0= Received: from MWHPR03CA0020.namprd03.prod.outlook.com (10.175.133.158) by SN2PR03MB2192.namprd03.prod.outlook.com (10.166.209.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.11; Fri, 25 May 2018 09:08:28 +0000 Received: from BL2FFO11FD005.protection.gbl (2a01:111:f400:7c09::128) by MWHPR03CA0020.outlook.office365.com (2603:10b6:300:117::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.776.11 via Frontend Transport; Fri, 25 May 2018 09:08:28 +0000 Authentication-Results: spf=fail (sender IP is 64.157.242.222) 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 64.157.242.222 as permitted sender) receiver=protection.outlook.com; client-ip=64.157.242.222; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (64.157.242.222) by BL2FFO11FD005.mail.protection.outlook.com (10.173.161.1) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.20.735.16 via Frontend Transport; Fri, 25 May 2018 09:08:26 +0000 Received: from az84smr01.freescale.net (az84smr01.freescale.net [10.64.34.197]) by tx30smr01.am.freescale.net (8.14.3/8.14.3) with ESMTP id w4P98PeE017769; Fri, 25 May 2018 02:08:25 -0700 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id w4P989fY022570; Fri, 25 May 2018 02:08:22 -0700 From: To: Date: Fri, 25 May 2018 17:06:47 +0800 Message-ID: <20180525090647.45451-4-andy.tang@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180525090647.45451-3-andy.tang@nxp.com> References: <20180525090647.45451-1-andy.tang@nxp.com> <20180525090647.45451-2-andy.tang@nxp.com> <20180525090647.45451-3-andy.tang@nxp.com> X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:64.157.242.222; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10019020)(376002)(39380400002)(39860400002)(346002)(396003)(2980300002)(1109001)(1110001)(339900001)(189003)(199004)(2616005)(446003)(76176011)(486006)(126002)(476003)(5660300001)(105606002)(106466001)(26005)(77096007)(11346002)(36756003)(51416003)(8656006)(1076002)(97736004)(59450400001)(2351001)(316002)(48376002)(8936002)(6636002)(6666003)(2906002)(50226002)(2876002)(6916009)(86362001)(47776003)(336012)(50466002)(37006003)(54906003)(16586007)(86152003)(8666007)(498600001)(4326008)(305945005)(356003)(53936002)(8676002)(81156014)(85426001)(81166006); DIR:OUT; SFP:1102; SCL:1; SRVR:SN2PR03MB2192; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; LANG:en; PTR:ErrorRetry; MX:1; A:1; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD005; 1:1u09QskhznahWaXtnAwkEmFQMO3cyOxVm8a0nn1OZ4QJixX0Y2BIsE8fmSU9LBSqRyqejhUYZ4Z2T9RO9VQXiJ6YFh6IJLPwxZ17pi08RHf2PTz7VbKeQihhv+zqMpL/ MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4534165)(4627221)(201703031133081)(8559017)(2017052603328); SRVR:SN2PR03MB2192; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2192; 3:fyIasoq+9U3rDIugYEfyUYkABGV3loIehtoOiS6tCpRgRQLISpKv9z3m/7YoC6Vb9+SOwWqcVmIBIIyNBimtCxkxP/kN4/KWubjP6R/stjqGFPRema4YqC2JohFXs6mD6eVm4udlrX5pfD0fNBdYjfOdmmkuCqCRePtL5fHQ7y7G8YXueZnpAdJXgwHZgup4FG2RVivUR8cuqW5nPbAwGhrvR4M6AJ3EPWEctei+XZcPHSe3gcD1/NY4s/0wr1uj5cmvlZCtzV1wCaB5/DfIFzRdpodVg3+bQAKFQmbbc+Iij7flyi/PVRwvEM+1+J+V8f7Sl4/HZuXfuy/AzRU+ixtbEhbeTuk1Z6A+MU2jxEU=; 25:6e3T/+b+DnFTnUIBVwiKiqraaCMfTO6GV83CNub/2xuqql4EE/GHzhuT5ygTXBZt/y/E2fIFNXGY6kEvt8AowX2vQPcN4XLOqjq/leQNoZ9oVVrnWiwkD4Acd++DYG9JbvMwlUiDE/nXPgXYy2/pBC6NEpUHpJngdB9ByypQ+MBgOT0keeM2MUm6tgQEn5v95k+06e70PkfbliA6vPRwQH4BZcakmzI9fzlPkkhnFsYmzng6vbjYUBNkmmzSLzLz4umCDwtVJ+du0DqzZf7dxAx/O8hY/2oIDLRNKSzbqUa9sQivoanK1lw4B3mz2DvR7Ym3h7wKBHrtF0tTsajU9w== X-MS-TrafficTypeDiagnostic: SN2PR03MB2192: X-LD-Processed: 710a03f5-10f6-4d38-9ff4-a80b81da590d,ExtAddr X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2192; 31:ShSloJOAaykVy9Mzd4nZRpb7DxXlVWlNDFbOMIaeaG7rXm2mH0gTAkBgSO7KeWDlailZUsqCN0j1Bm5lOP42Vj1CZvH18QYQeSTCpKz6kZZ3Ky+gE8p7+OU1xX/XD2TS8d65Cn42p8wREqDHIN9QdpFbLP/e6XgvOVzLHmnwNhpjOjKeUuMvIBbsoMuAlo+bFglr9uyVLwAb6cC2eWDNi0tqK9iZ0tVk0Mbu4fLE27E=; 20:i1Kp8CCYUOCbad4/vGCOHORgcpYVn7+pEU7dFrsJkIvn6Qaf2sVOccfF91w+g23XjAb5XjoQlAfe0eNPcM62nV7v3dUJllHnZAtb7Apiu0WzMA1mwI5LQ5DhW+WDMir55AiJ6cAQYJhBB4Gx9oBA6zhrAVumsC7aHtZNHwuwrddxgOgKXvV+RmdGTWf/MkR1h/HeG2++K1bEqRDfEGFt3EhHNDdjBE2Pyd0dSI5mxSTvV2BNt9pZ6FrFmYWiuGGlEWgG49MPiAgG/UEM2S/rSf5uyg/mBm/BoagtekxFTaQcXgBRbwyupb8C7kwd3PGk1M7DhfvkQXodX3q2ZaA1CdQ2k/N0HJFsAwh8PX3glVa+iZ8aX6iejpb8Y94lGLHiTCQ7z2Su7wCid6iRiitGutgMl33GCqOf30fp/RRbwHz7jAPA5GNrJ1P6pibzF78iM8oX6q5UpIbUaCvLI377gteJmx6+DvBQkTpGed1i0uE42QbHIg3tEwnC28L2zkVa93w50e2EDcGZB+E9dm1M2yFaaZLFeD3a3LGXbYhHYVCgUZoUtjsf7u7yHL/5/hQf1zXwsFc0QXt5oqXuwM9gBVIiQx4CtBIrQ4pcE9F24eQ= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-MS-Exchange-SenderADCheck: 0 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93003095)(3231254)(944501410)(52105095)(6055026)(149027)(6041310)(20161123564045)(20161123558120)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061750153)(20161123560045)(20161123562045)(6072148)(201708071742011)(7699016); SRVR:SN2PR03MB2192; BCL:0; PCL:0; RULEID:; SRVR:SN2PR03MB2192; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2192; 4:znwNHbt2CDdz1VJauUEoaLW/eRsgIZldN0aHGUl+WtEK+uPMr/tpklmBtNMFuSui/I7LDo6G8WcTgtVyfWqoBOuNIOUXgapLf7kaQNwO+CkefCSlYqLXNX4/H8NiG2JkGfOgqZezy/wU006cnMBY4WQex9o+t/KdKdIuCbU9Z6dqzMg6jZ1P2yt+wKs4/LBWKRq/jC+bQDdAf/sz9yXKfpInSakIo2lk8O6vE+L++yB36NR6oDSKMuntteTwZIBBMPWGpT2Gmbi11jO2pxjeqApc9uzYTQvZog7xRAzo1gE9G0mVlxVwoKfOLes393KK X-Forefront-PRVS: 06833C6A67 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2192; 23:cfrSpPklZcaiTRTjzlf9TrJrkZxfLhTGSyzfQzLGR?= Nfy4/SdjqSvmDK4LcX+fNycyC4Y8t/t9SIq0jo55gXIObC5iR5s6FeonVVBM5itT7n8O3tWbDunYEtiFk9aFRsMvMD7rbmzubdr2SFI+4BiYYR+5meLYC54MoVFAI2kPUtrrB0gu1zelUUB6JzSHIbk55R62JqrYCqz7vRy00YwXorPVs/CUh+K0iJqPwv7FVwJwRgff0pqXGcOGF/7f88YAbOSaKRZx8ebogsmy1HVSh3Im93voQRnHp+OKTut3gx+B5ch0O7TQYvtjFwtGEZ/6TYYbepHp891f0QXduZQewUedVsMpiTR1kBz3x88tRcc7XimeB2G2hLwHj4nKngZjfCdy/RwiF1BZ03FCdogp3T2mFmHuo+I1lCnLNTpZKwSg6Hj+woaJXGUyFqIOnc8FMe848G/a341R5xZw2Ci24J7wvWJ0o64jMc9ZtV1JUFpXj7bG4oRaXY01KyuUqUZDQFA/2dby23DPpeAuaaZzU4BIx7fWC+YWyk2wk8ooSJPj6KBGELfc815cT70VzlYd8gdxpAzeyi08lYrGFeG8cor3su1ma+oCQZzTXtZyLPe+2bzT/dX4ebcJfzPkLfINwkOQv9zvMlotntIn6EebRElMjfE6dvcAzXNA6FwqenUirxw5Rvocp6GajWriaNM9CFxLiYCNBjrvNywgNgBAsPi5DVqU7CiU8gURFz565M2NTS7NGvY0RMduaCNt3CSIQkDoZQsLhL9go4ax7dV9DWCH2Aqzvc+ZDYlA6QjlIQ5WoYw7tlOT3J55HhTV0K0bNMrkh+drvOdMIdCopVbsIANnzkqDim5kSpNmPkLwLIdJIs8JuPozSpWgGi1z2Ag4QiwWH1rX8eu9CLQoL4rLNZb3dnIrBTMirH7SjDjkY3o1QCvlM68E3ib4s9NrEHaBYgRnNABDz+6FaxxvW7zxNVJpaKLeyQbMIwWqA/J3NvrFpdOMfgRPVspdjtca2Qg3FBjFPLsx4PgHLknfwnJxavN4wPLFVO8ElCsluhU1lUmTaJ0iJJHOp5vmSJAsxkeJWs1NTUQ/a/ARfk0688eUaPIUB8crwO+Xow1qb5rg+9R0XQWGXbgh+rojr6nRSc9t+xp9YdAbzgJ+dB0ar++oMhmujjhLWNJ6vfmQqtfkjKgLfGZKcyWwGFn9RLx2ouuo6F5mAHUJ9G49gRJ+azbsST8z7b1MuN0jteXSETZIoD7qxtL70H0xfSReRh/GtzO X-Microsoft-Antispam-Message-Info: CXq1Wk9odqc98sonXWHK7q6KMabUf7fGMVIud+4HYIzsXYuDBJ2g4kLXTNG7OSRvlRi4TxbYlEvt9VSJdNQ0jvwJzXOMSEL+FVXHXy2U+KUc2UfFkHh8Hfe2xWjEvbZIKoEcYYn1PVl1UrCjrvUGc2//3fs1qtGm+FVm+ui7HVUOytPs1yqNp01WaxVFMcoB X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2192; 6:p8JxLS1cHpG86aO+uImepnwgdsNG0n1zuisv6ZJTjpeYX1X5VIGaERFgNFGaXhDeydIxhCwgI51LMpumMKxLCFrY0VELDUydD392JNE1cDEpwc0mYCzhBd/t+Zd/0R62mwW0183lfbtfmYNN+gQWCII6yTG3xsAcn25nDZ8qiat9mv0kvUabclojVgjWNp5DVH79Rf6tH7RLRNJJVmLZTOj2q6Rd6OHWqt8tSCT9hy4tiwsHhwoPaXdsrT8Rm9Cy7JYhN6r+hoquYFwbY6Pem183Tqctw9X/2OMMaOCtRkZezBAlNLjDu+QTq5oL/4CswLUWcabh3MSNwKFFdJGgE7xWo8piuopvr3Vy41xnaS/CDEOIT7NOnc/7Mug8JnIDDTWrEos2cMoV4p4B8mRCPiMHpX+M/nO59VB0fEi4Jp4ZJP4R/WvJnMbT0pXmI/M86tEEvIy/1haiSYwmooo4OA==; 5:pe8U28JbnHHXpL8uqgZjXy+VBp8sd/6BbROz6C/WGRwR5Jg6EONvAu+ed9v+rQGnKsZA6TYznHD+EPC9hMdVKA/glLSNw3V/M2VjHaiFIBvkGA+/2PqtgBHYQbPQ5dqfWVswncialGWo5Pf1DgoUGJKaWPcNyTbCVW9ZFm/k3+M=; 24:9e3BYypRHt2hCUapKPFixTaxENZRL7gw7bhYLclvYBqxr8t4o+YCl0QrmcrM4969S1k/nWgukN9opZ0V68aeoT0kosjVtfDA/6mVXy27f/c= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2192; 7:fVfCTyO4sTDELkK+RH0xMRn8uiCjYs552KUqvFv4bSO/XrwWbduwWI9oZLd3c9Tl2cc51lscxvC9ZkyFTlaep9B1Duoz6ape66AlxaApnqW/BPyQVb/CmsEK+IvcpmLnmMFjr8tk6ZJRnONf4uVawaNlf1YlGylFQxm2zf+7Su+2807rI38xMDH36g1qbOZ5KiAsLRo+aPw49iHMVhUok1aAHWBIbuYoqHbAf2WL4sX8y7ZtBeRoabg4aWuzamXi X-MS-Office365-Filtering-Correlation-Id: d0477e77-81c4-42f4-2951-08d5c21f1337 X-OriginatorOrg: freescale.onmicrosoft.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2018 09:08:26.0894 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d0477e77-81c4-42f4-2951-08d5c21f1337 X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[64.157.242.222]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN2PR03MB2192 Cc: Yuantian Tang , michal.simek@xilinx.com, u-boot@lists.denx.de Subject: [U-Boot] [PATCH 4/4] arm64: ls1012ardb: enable DM support for sata 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" From: Yuantian Tang Enable related configs to support sata DM feature. Signed-off-by: Tang Yuantian --- configs/ls1012ardb_qspi_defconfig | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/configs/ls1012ardb_qspi_defconfig b/configs/ls1012ardb_qspi_defconfig index 6a8485c..7589431 100644 --- a/configs/ls1012ardb_qspi_defconfig +++ b/configs/ls1012ardb_qspi_defconfig @@ -30,7 +30,7 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_DM=y -# CONFIG_BLK is not set +CONFIG_BLK=y CONFIG_DM_MMC=y CONFIG_FSL_ESDHC=y CONFIG_DM_SPI_FLASH=y @@ -51,3 +51,8 @@ CONFIG_DM_USB=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_XHCI_DWC3=y CONFIG_USB_STORAGE=y +CONFIG_DM_SCSI=y +CONFIG_SATA_CEVA=y +CONFIG_SCSI_AHCI=y +CONFIG_SCSI=y +CONFIG_AHCI=y