From patchwork Mon Oct 24 08:28:28 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priyanka Jain X-Patchwork-Id: 685734 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 3t2VKB5hHkz9sR9 for ; Mon, 24 Oct 2016 19:47:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 30DD4A7564; Mon, 24 Oct 2016 10:47:24 +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 OmEKPzAr83No; Mon, 24 Oct 2016 10:47:24 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CA829A7533; Mon, 24 Oct 2016 10:47:23 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2096DA754E for ; Mon, 24 Oct 2016 10:47:20 +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 LceZKCflqG5d for ; Mon, 24 Oct 2016 10:47:19 +0200 (CEST) X-Greylist: delayed 871 seconds by postgrey-1.34 at theia; Mon, 24 Oct 2016 10:47:15 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 NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1nam02on0063.outbound.protection.outlook.com [104.47.36.63]) by theia.denx.de (Postfix) with ESMTPS id 579DBA7549 for ; Mon, 24 Oct 2016 10:47:15 +0200 (CEST) Received: from BN6PR03CA0042.namprd03.prod.outlook.com (10.175.124.28) by SN2PR03MB2383.namprd03.prod.outlook.com (10.166.210.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.679.12; Mon, 24 Oct 2016 08:32:49 +0000 Received: from BN1AFFO11OLC002.protection.gbl (2a01:111:f400:7c10::103) by BN6PR03CA0042.outlook.office365.com (2603:10b6:404:10c::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Mon, 24 Oct 2016 08:32:49 +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; nxp.com; dkim=none (message not signed) header.d=none; 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 BN1AFFO11OLC002.mail.protection.outlook.com (10.58.53.73) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.669.7 via Frontend Transport; Mon, 24 Oct 2016 08:32:49 +0000 Received: from b32167-VirtualBox.am.freescale.net ([10.214.249.223]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9O8WWCK019286; Mon, 24 Oct 2016 01:32:46 -0700 From: Priyanka Jain To: , , Date: Mon, 24 Oct 2016 13:58:28 +0530 Message-ID: <1477297710-7581-4-git-send-email-priyanka.jain@nxp.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1477297710-7581-1-git-send-email-priyanka.jain@nxp.com> References: <1477297710-7581-1-git-send-email-priyanka.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131217715692259251; (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)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(2950100002)(6666003)(4720700003)(33646002)(19580395003)(19580405001)(6636002)(97736004)(50986999)(76176999)(36756003)(105606002)(626004)(229853001)(356003)(7846002)(8666005)(305945005)(48376002)(5660300001)(106466001)(87936001)(50466002)(8676002)(81156014)(81166006)(5001770100001)(189998001)(85426001)(586003)(2201001)(77096005)(68736007)(2906002)(92566002)(4326007)(47776003)(8936002)(50226002)(11100500001)(5003940100001)(86362001)(104016004)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:SN2PR03MB2383; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11OLC002; 1:Pc+Otd9h9rss35w3LL4dXE3Pe1X/soD8YA/lf84KfkDNoFRRh+KJ0yVP9VTxGLbVAxm5PJ9Tj3nXQ/6Bgb2XVd5vvMyOrj+C3zm0B0whhazZBUnd3y3BkAqoh7srz5XzRuFe3473zS70GAKeZxyHriPhuNnPv2NhOdFPhz+ltzZJLKG60dB7TMebOHf80ovs3zGqkE0yMmxBiwOAt4+Wx7wRK3rueit3VRPVfK9Xq5sJomP4l8cjx3kffWrabq1YxWpzmr0QlaRty6ySfYVwVmhMyWCQPs0VS4ISFD9LKua/LirFE698jL0kAK0PO8fZ1uJXQoyWwhkELAsKL49Q1qLu7qSvwHTYy0VthPX0gnsjWwuSXC7sGqfqz8w+HRoU2jSTMmkE1odbavl/k5dTbxp3xrSz1a14ZuiRGpwDvEPg8C5glRbik1vESko0ZGBUVkVzPUrzx5FdkCxFc0aeJTAa/S1yyxRqxYolOmTFh7Ww6V/K0F5XGZ1VRjoBHlzJipP+76fAqUYhtaNXVzKpAaCB1Ik9cIIhRuzJ542KUi0d2r8BWpf2egi6ihDSAuKXUm/w6SWBTjt1XxUVO160bsmljb/OJNe/rjsBA6UIwEAGGBRN8Wz2GjvONjF5mwRtUR/QSPQQWWQvqlWpJcHK2uN/BMN7cU1p3cZaRj3oZ0UQajXilqMK86SZykFALFKiWfjgPVX+VMX0smwwZc4z5Arg2YHfixTXIXaFfWJ8oCU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: dde7242c-8af1-4165-e654-08d3fbe85687 X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 2:IMSqsXbHoIwu4E/lfti4gBMeZIabK2VeoPiO8gRZSS6ADe0BmTrXvOKuAezGOlNBUT+7VywBMhc2Bi/I1xDuZ8W24rjRz5KL3fEvhRHWrI+9nKGMlq/sOGDT9oUtVWEnc0gIAVbz4abseFiqj0ZwSZnApgQwXRclX58Nesgc0fS/ZPdhQ1oRo/Ad1iBwDJ9bQhRHUVBwgU1N6CftPqPijw==; 3:/ewraXIAGatCGEJikXOnN5Y6jUJhviHO6xEGef2Bu0W9FVFj0gZIvVNxP21uq1SokIWHYnrTGT2MPskQt/vKc41fbQLOrbdvr8V6iB11oQZcg0vrLtiv7rmjkCcL4WUs4QEflfbarSXxGj7u1xUx/xVFcKMzxgLmYhEXx2VNticjIJt2ZhmUA02XCPlVfbenNFOaoN/ZR230HxFQFbqb72bBCX6eIjtqj+NfoNmtnhSEyBO+qPpzK+B5p1/G0rkA X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN2PR03MB2383; X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 25:I82bv5NEVCd8AmRFKb1BBEvZrT5iCGzW18xtKuFnGCEes/JCkMzJWrlS8u6UQR8wIm+5bedYtlpUSzwk/gAMar+wUG71hsARhTXj1hVpl2vhninLRe1Ut0yWH9piQEoqZCqHS6AidDd1GiFlgzZJreqOYBdysfJ+8gDsMNg5wEj39kViSxjfAXh0gZB3G6fLSatwFMDq0A1nVKVC5QqnzEOXN5xneNMuYH1sbwb1F8gtNELcgFd69A9oZkG+cSy3DLgAM2bJCMBRlRBOSlFihsuKH4l1+eEr1T5HHgiFn7zp8Lg1HCoKVYsf1qrSHUDJf/PxDeSW3b4BOo/XTzwNDO5zS1rbOLt2U659Az8zSqNIIwspVwHFw1sv5Mx4FCmNqXYgf/SWX7SONhj88KcSwBmACWffLoNdTbPtfW68zwmvFPLO1GpwKds2/oPgcTS/GJ//bcIzrOyPWwUUEn+s7lvOW1PDW5fMeUOggYvs2UkvsexUpyljjjyD2QoD6Q/bur00W3YQkDu2/C9qDZEzjOGHqNxPdpoVBXIRm2e565wuIx4ZDBNfSKipcmwAcRexibtoTf6FCMCjb00bTB8OKhWUXo2YyQbxvK5efO5ElPIdzB6phNTqE8GrjHxdAgVLm695ScwhpNwaTDCO7R082nifInISTVhjCSYdY9PB+o4QjFYDTREcfYnMN7D75pMHi0cYRXZZNVwEJ54qTW6T2GDdQY2rQJjR+oJQMYf90Yqcpt3kvkvI6CZHHRVg6VtGz7apsRik6qOMubCKRsoYvA== X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 31:GRnfzcCFIPEPMxsL6du8bdWDTGmHhATNrcjc7KcI97cc1esjFMWTHW9fz2eJX90kQOhh69mw4jxBgOXpfuylG1kBIAx4RYl41xVlyS/RM3vbATagZ/LDs27HHutNxRZ/LT/PzWQyA69QtTA9hv6dyYjvRXjHLjdC2vYHrrxeU/YNo+xAd3K7qwV2tIC1ufLJj4zbFmzgOuD5c1owsYqI91HLODCtf0zq/B4KrW4VJKBeXvbJF5Nc2kx7mZdMkcSpbMWmY/ErfTNlCGQSqrL/Ag==; 4:u0KLdCtdWfpVLG95bvHrXY4bkh/csDV89YadHItgdyRzXprXxX7C0f2dDDC6TvSSsfrijugvt73jZu9KVXbrtzBD3wdDHrU7HYxaC579cEa95jVZ2acAyJZqrDlU8oyAMs16AUnpvA/FB51nDiW50RwjDOJtjz5PUIRNpE2wdeIemM9N3J4QHvX/bPwGVSbfPgD1OhK0eIe+JwBiLGZfQeZ1whlMEEs7R6Kod8mWRBFUrZvTFgVyXO3Mi9iTuQsWJr7pbHREp0DBamJN1W/VkgHTi06TG4K5wh0t9Zic6hrBlNtYVf/aNTVt1P7Cnx6nynNC7kp/sTuhgPM1VnnUVJw91H9zHSG88aanJf812+UpmiAy6iwEoalQ9INrbu6E7Pb2J1myu0G2avgnPppZIqVe+cOiL/eRBQDoIU1Z7Nj0l+mh4HsvEiUAnxvZ/gYSOlXtU2f69BdkaHeaO7oyuLN4MtitoALiRLyxgq0LRkFxGGSGcMXhLSsgJ1xXBGHzW00A57XGdkCXLjCnJjx1dGIY9CEwKBx8nUvCdhbjzji1C7DszlhgvdCg7KLTCcW7 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(13023025)(13024025)(13017025)(13015025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6055026); SRVR:SN2PR03MB2383; BCL:0; PCL:0; RULEID:(400006); SRVR:SN2PR03MB2383; X-Forefront-PRVS: 0105DAA385 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN2PR03MB2383; 23:nPt6MGoX8QR95kxso79TFnuCoxv84fEuBg2G7eYbd?= =?us-ascii?Q?M7h5oiSDhEbM9W9LWcXq3Al1wl7AaCB3k5+IldbqgvH9sUO88OSJCDo+WGL+?= =?us-ascii?Q?5ILilKrF50x752P+HKsz2CXIVg3x2huvmx/pGlWkn/3FRZUfok7ClBoay73E?= =?us-ascii?Q?eYVSLESojdXnoj6PRX26l8FCOkwQcfy9xNguZYMMY8KTQDh6WhuaYh23aldO?= =?us-ascii?Q?um33zxajchJayq4QW1KAtn4qnbjQ1vb6q/hbBGfNxww7/07KI2z2nC52nzob?= =?us-ascii?Q?G6UohjQAVUuDWMT69SrNgF6hCVjt9mEgof1LPp58A2bnWCYlPZfHTjej3r81?= =?us-ascii?Q?Ge7Tvj4D1JK7d/EZzi08sNtVEhDEKE2MrFfvdTp3BUMKjCyrs2BUQCRdzJQS?= =?us-ascii?Q?HxVjXz1s19NEQ+f9zTlvBEa5vlon9d+CjOPxFbB3O6SNfRGyap+4/kF1O2Lp?= =?us-ascii?Q?GtBkOQp8wtd7CIaeE5ie8kRohHttkGF+Pwl9vwCXOb/NfTulgirjq6mQ+e7Z?= =?us-ascii?Q?XZom7BZMroo2PncPBN6Vc9RE9BK8GhJb2C1LMh6oMeU50Hxxrb55JotCdn0v?= =?us-ascii?Q?NV6cHZfwRENB/JmjaYVr0fjW13oFlLczlU+1s4GlbeuRPl1NEZEJBWl7zNxd?= =?us-ascii?Q?DF672XDlIbbXt+3GzF+eNsO6Q/tDqonU15vLr1R4YC6xm26nFEUTaUXz4cgc?= =?us-ascii?Q?HV0MX9NFFA3ti+frEDsrVwLy6MTkry84IDhCFXPLHo283e0xOpYqhB7JRou4?= =?us-ascii?Q?mmAPDZJvDjtzaRLNldVUESoC/Bf1CSjH+aVZQGG5gGn0Fk1hpaNYhfZFJtrz?= =?us-ascii?Q?8NXaQG2ibFHolWTx8USZlXr+vhqvYpWlfx6S8+XB691+M+wsgdYPIEqC3Kch?= =?us-ascii?Q?8Potgl69hrsBV4ZHjO0NYPRlo/IJajOTmq8fOpzqfvCz3xdMdyisNCm/wH51?= =?us-ascii?Q?1RqKGnOWC6EEwf7FlMEMTh0sQ5c061nuTOGS2gEq2TORafVKLmLyapgeNlUz?= =?us-ascii?Q?2deUqfTk8sVR/+Azo7hc+MsBjrdJw6s7vbkf9PzNLVWzhfc8Si0u3e5XuDmY?= =?us-ascii?Q?q3QwA/Q5VUdvaUM8iwxeMfEBGaQqQRIHV6GoHEJ+xmRPBNUfTAPW8SosYcp2?= =?us-ascii?Q?ajOGz+1J2aoV0TeGU4a+N8RfTQtLCVJmyJPQobpevlgJKLaC9jbF9CM9sxGw?= =?us-ascii?Q?tWzELy9ghhu81sNWW1s9f2BG6B7DLYVRDpjB+SE7Iku2m8/oSdDzVsTk5jvU?= =?us-ascii?Q?qwHDZfG4FejKYaSPuU=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 6:1h90JY5ILGcP7pWsQpE0Gs76/kqDsHAxmG2UZglXs/wjX/hFpb7Cm6JVDhXcXb0QXGyUz3sOU6nyZ8Gt4P4qUw53LUGO1zyPaAi+mHiJqmPX5t8oBMEXuEae5/yASNop4bMZjHW1kLVCs6be1rosrrNkWowyjJJhR9XevwDnQcXqIDiMm5HtyRj7+GVpP+b9KhPIkqrLP1X6a/lfvDQd3HGbpqo71nIocvsIDK7Xm7ujrnxw9DWy7/bJCktfiiwwiptJ0zF4mx470tKe36Bylfgn1uPH2H2fMzC1WqB2N8SbJHddh0gdcBGifFb1bTav; 5:NIJ+JnkI28BM0Au9OHZwUlsYQ298Rjpbx+BlE/snyJz+bq1Je/Lx2HlYeAy0b7zffQL9d988bbR8qFivXuBjTFsh1C0pGVWTHtbn63kE/Hm+f9o9xfyYTwfrSp6yGBMzq8LKwdXWQeBtYjj4KKvBcCc8b6He4lJHHC1XC1X05+xRpWov5AFziNfwv9kWkY2D; 24:4OOU8FKnKvSHM44Ql2oXKBF9sgls1F01WZR8GO3bp5e4adEbI1HBlxQYgfbyg1oARCNlt31SIxF6nEwavm1JaBjPxLxcdGRhLj0FzBN+jAg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SN2PR03MB2383; 7:XeGhObHyDrTSsDUaXNhTnv5SdzVpQKeE/yZVAIMsGmaIzXugFhn5VjWEnpt6fyqtdXwD26VN/NTnq/MYsTnoYpzfhmXMut78TLa526C+ZMTBnmW/ZQWMlq8jfm67fFG9RsRwK8i6lq0LKPusouecD3HwMdlyv/fLgY5UYPUlAXjaEwmesNdXVNwWXBfjdPGncRUZ/uQdBq0b3ks09C1Sxf5cwSDxxsdoa00cF9EThAZHP9SvInirAj2pqvg81EiTPwA22Pk7hSTDOXp7ocW1ude0fxmKUQBhwn2C/sF7iHiQaTtFLXtVfDti3bAmWwkGdoN2mdHwufRlNvW69IJ0FbjhnDMVYk65x3RzoPDoQgo= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2016 08:32:49.0387 (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: SN2PR03MB2383 Cc: Priyanka Jain Subject: [U-Boot] [PATCH 3/5][v2] armv8: fsl-layerscape : Check SVR for initializing TZASC 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" LS2080 SoC and its personalities does not support TZASC But other new SoCs like LS2088A, LS1088A supports TASC Hence, skip initializing TZASC for Ls2080A based on SVR Signed-off-by: Priyanka Jain --- arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 19 ++++++++++++++++++- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 4 ++++ arch/arm/include/asm/arch-fsl-layerscape/soc.h | 6 ++++++ 3 files changed, 28 insertions(+), 1 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S index 3274cad..82b7696 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S +++ b/arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S @@ -10,6 +10,8 @@ #include #include #include +#include +#include #ifdef CONFIG_MP #include #endif @@ -137,6 +139,15 @@ ENTRY(lowlevel_init) #endif #ifdef CONFIG_FSL_TZASC_400 + bl svr_dev_id /* get high 16 bits of SVR */ + /* + * LS2080 and its personalities does not support TZASC + * So skip TZASC related operations + */ + ldr x1, =SVR_DEV_LS2080A + cmp x0, x1 + b.eq 1f + /* Set TZASC so that: * a. We use only Region0 whose global secure write/read is EN * b. We use only Region0 whose NSAID write/read is EN @@ -179,7 +190,7 @@ ENTRY(lowlevel_init) isb dsb sy #endif - +1: #ifdef CONFIG_ARCH_LS1046A /* Initialize the L2 RAM latency */ mrs x1, S3_1_c11_c0_2 @@ -198,6 +209,12 @@ ENTRY(lowlevel_init) ret ENDPROC(lowlevel_init) +svr_dev_id: + ldr x1, =FSL_LSCH3_SVR + ldr w0, [x1] + lsr w0, w0, #16 + ret + #ifdef CONFIG_FSL_LSCH3 hnf_pstate_poll: /* x0 has the desired status, return 0 for success, 1 for timeout diff --git a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h index e6cdfcb..1034bf4 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -28,6 +28,8 @@ #define CONFIG_SYS_FSL_PMU_CLTBENR (CONFIG_SYS_FSL_PMU_ADDR + \ 0x18A0) #define FSL_PMU_PCTBENR_OFFSET (CONFIG_SYS_FSL_PMU_ADDR + 0x8A0) +#define FSL_LSCH3_SVR (CONFIG_SYS_FSL_GUTS_ADDR + \ + 0xA4) #define CONFIG_SYS_FSL_WRIOP1_ADDR (CONFIG_SYS_IMMR + 0x7B80000) #define CONFIG_SYS_FSL_WRIOP1_MDIO1 (CONFIG_SYS_FSL_WRIOP1_ADDR + 0x16000) @@ -155,6 +157,7 @@ #define TP_INIT_PER_CLUSTER 4 /* This is chassis generation 3 */ +#ifndef __ASSEMBLY__ struct sys_info { unsigned long freq_processor[CONFIG_MAX_CPUS]; unsigned long freq_systembus; @@ -320,4 +323,5 @@ struct ccsr_reset { uint get_svr(void); +#endif #endif /* __ARCH_FSL_LSCH3_IMMAP_H_ */ diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 58e90d8..c20fa97 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -31,6 +31,7 @@ #define pex_lut_out32(a, v) out_be32(a, v) #endif +#ifndef __ASSEMBLY__ struct cpu_type { char name[15]; u32 soc_ver; @@ -39,6 +40,7 @@ struct cpu_type { #define CPU_TYPE_ENTRY(n, v, nc) \ { .name = #n, .soc_ver = SVR_##v, .num_cores = (nc)} +#endif #define SVR_WO_E 0xFFFFFE #define SVR_LS1012A 0x870400 @@ -51,6 +53,8 @@ struct cpu_type { #define SVR_LS2085A 0x870100 #define SVR_LS2040A 0x870130 +#define SVR_DEV_LS2080A 0x8701 + #define SVR_MAJ(svr) (((svr) >> 4) & 0xf) #define SVR_MIN(svr) (((svr) >> 0) & 0xf) #define SVR_SOC_VER(svr) (((svr) >> 8) & SVR_WO_E) @@ -63,6 +67,7 @@ struct cpu_type { #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 */ @@ -105,4 +110,5 @@ void erratum_a010315(void); bool soc_has_dp_ddr(void); bool soc_has_aiop(void); +#endif #endif /* _ASM_ARMV8_FSL_LAYERSCAPE_SOC_H_ */