From patchwork Wed Oct 19 09:36:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priyanka Jain X-Patchwork-Id: 684065 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 3szVfp3lnDz9syB for ; Wed, 19 Oct 2016 22:52:18 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 8A8F9B3817; Wed, 19 Oct 2016 13:52:16 +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 FKNEZfhPomlr; Wed, 19 Oct 2016 13:52:16 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 80A88A7550; Wed, 19 Oct 2016 13:49:46 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DACF9A7544 for ; Wed, 19 Oct 2016 12:19:16 +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 H4RwcWKTUXGt for ; Wed, 19 Oct 2016 12:19:16 +0200 (CEST) X-Greylist: delayed 1109 seconds by postgrey-1.34 at theia; Wed, 19 Oct 2016 12:18:25 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 NAM01-BN3-obe.outbound.protection.outlook.com (mail-bn3nam01on0065.outbound.protection.outlook.com [104.47.33.65]) by theia.denx.de (Postfix) with ESMTPS id 5D9CCB3815 for ; Wed, 19 Oct 2016 12:18:24 +0200 (CEST) Received: from BN3PR0301CA0035.namprd03.prod.outlook.com (10.160.180.173) by BLUPR03MB1409.namprd03.prod.outlook.com (10.163.81.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.659.11; Wed, 19 Oct 2016 09:45:20 +0000 Received: from BL2FFO11OLC010.protection.gbl (2a01:111:f400:7c09::103) by BN3PR0301CA0035.outlook.office365.com (2a01:111:e400:4000::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.669.16 via Frontend Transport; Wed, 19 Oct 2016 09:45:21 +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 BL2FFO11OLC010.mail.protection.outlook.com (10.173.160.154) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.669.7 via Frontend Transport; Wed, 19 Oct 2016 09:45:20 +0000 Received: from b32167-VirtualBox.am.freescale.net ([10.214.249.240]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u9J9iYve023163; Wed, 19 Oct 2016 02:45:18 -0700 From: Priyanka Jain To: Date: Wed, 19 Oct 2016 15:06:40 +0530 Message-ID: <1476869802-30528-4-git-send-email-priyanka.jain@nxp.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1476869802-30528-1-git-send-email-priyanka.jain@nxp.com> References: <1476869802-30528-1-git-send-email-priyanka.jain@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131213439210286352; (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)(77096005)(86362001)(305945005)(2351001)(5660300001)(6666003)(36756003)(8676002)(85426001)(229853001)(87936001)(106466001)(81166006)(356003)(8936002)(68736007)(5003940100001)(2950100002)(4720700003)(48376002)(50466002)(81156014)(586003)(33646002)(47776003)(189998001)(8666005)(105606002)(50226002)(6916009)(2906002)(50986999)(19580405001)(626004)(76176999)(7846002)(110136003)(92566002)(97736004)(19580395003)(104016004)(4326007)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR03MB1409; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC010; 1:9rcrQc78B5+kXM4ZhB9c/jFSxchXA0fYVRfNN8nTKu/DB8d+atKC+OIUEGEPE6zmO12K7cTFNwlfSwp6yefglAHMsFtYr+dvFmV2ZScSp2P23tym+RSwr1KlK6nXu2ZyrqSGqAMoQ3PSLsJ1UKf5k/jMxMprJSUyUOZZ5WmrFuHPQmAL/kG6d4AisiUE7PFQfichUjtI9rmtDa5GpxUAtxMBO8Jd9xjd1vjN5nkdT36E2jRr+9AmQFYImy4OdpG8nGsKh/eVu3PKwb4HQohgn3wa7yx0TRz3hO3vYx7s1Y9/tZI+Dds/rdxEea1X5msMayBr+zHvhUkGz2lAkT+Q1iNMhOyfriY8/TNRAsZfiCJ7a8k3Y1ahnlP2S6abGd62cGURM6u9fz2717/C7SLIZA9jiXF5CFA5Ewz+Hat8Hhfm1PZpV1svorrRJIJfZ8oJebcs4DGcOJdQ9tswTuAjtbrXOdZaAFMHwJiF2kPaeuQ1kdWhAaBHF+qe85TBg4ZJkXtx2uajfmFQu8HqvvVNoqujWIxWH66xkGvDNNAInd+MHfHmbwht9SuG0WDztfowTY060rmMrWpy4gjfymC+czk1JEnZjxyDcdAidQalq5Ozac7BQ5EMmcfoDGHsu8aIuH0TrlmBZ+YdAuozmavSbAoIjwDk+AXvQVJsAWvWbEJAXkVWJjNd/KhqO78L7WiesIgdIsw6xgEhF3JQhf60YTiEjlfWqqyyRAMYWgagXfU= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: b3b46ef4-a8c5-44f0-ed10-08d3f804a459 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 2:0CnQDb7x/52GNEaq31EdRo7RN3i270zHaQW55wOaDbjpSYn51q/DuUVkOE3X2gVeob1CGeW33Cxv/NaxfQfi0+yR15EGZZXCq4hCqcHyM8E2m0dhVVtNbconfqhZ8XKjYd4rZtlsLsfu/JQZ6kbZhvgxjiZBOKKV7qx81j62tKl5FTNnuUH0cLQK6w1fNlCQz/8Ep6EG2pKvFTHL+/eKyw==; 3:NH+HmKxKB0kmXICmsry7mwt3CfJCWav3UfFD27u6mRVL7B7BVjY5RpM7oEpGs0h/DolX2sf//SPF31OfgvjJoNMeJZ+gADL2HDka5P6T9I25SuLj2GWQNnm5lxDet7UnXS87mqc+Z36e57pzzBGP1f7l8uWtId4/qbibwCuOkQZMRi2JXRQ73oa/v4NJquq1O8iDNh4MZZB4+dqixbmwAkNyyVTGPV3SQ1gszc48z/As3n0oJJRlk84KIb1YOOim X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1409; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 25:REHve5uQodEzKfN5QUI2lDPNdLPRS84SLy8rd1yqRxc2ll3/pa3u58NeHSBTnj66iJdB0uTU21uaUQnlOUGj4C0kpWARsb4vjfa2zS57FkEnweV485Cs64hDnYQ5kpYBkfCNgh0KE1hDs/28AF8tk47TGkWGNhp6i5mrt6VYfEKRL4cQYzfKAUGZI+dK+bvcxi2Kdswyr2k95uzQEky0MVVTSA+Kns5L9zPctE33LLG+PJj/6m1XusMRFrEj5TZxHLg3Qp5B291ndDiN6wtUTgC98BhNSq4q/IroLs3FVERWyFNpfPAgH2Qxk4wZx1cLgWfw/vXt43NCl5wm0CbOpxZMkNe7WRXfbxT40osZOGaKYfRzxn45V3IonGHRdhLU3g6fnWYLaIXXJ/+4kRN+k/oJsQFfsupK6GXQ0Tb6KhdKgqBa10NOlv/6wW83jZaS0q5UgFbJEjk4Ol4MRWpd49K2oTVzZYxMcUanfrXJKtREd2L95sctjw01Ah0RtvDIuSii6V3PB7peD9G2QMF0qkTM96/t+yKtromMlAV03drNndATQN4xy7L48Wg50yNOIxSGfnrw1nZfEY3zyAP6wPNitPAsE/p+XuFvwngKicFX/zcdfPj8Cr8q88RrcJNbYyTb5ri578cxh2nn5FCYBPcgaioXbngm6Y7KNodZGvHIn7lf+qskGQR/wiXohF1zvP7vXQUsKfLn3utONH5ty7bburxqWAdjmqQxN+8XHP+pz34G3XT6H8VITU9BUlEyVRDQEAC4QWHmqhbHMz2/2wHK/gXeIOObnTZrMNLZzhE= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 31:PRw8YyO8DsNxvzS0DpD/7cjblZfeq6wD34DHlBSaUuMYlwovfFXL0WiB9QrPjzoEpWQiGlj/aZCiTGJI+9bS5yu9Pn5k+OvxtsrOA7xoC6gy8kYEhwLbHyhQLqFFudRfX1i8nChD++PnsK22OGm0B9xAjaoi5bofguesLPVhqdfr+SG57ka5ijysljNA96g4ouYRrYou96zpfKxcpY1u26EH7kCzK7WUgqtVAvPVX7Lx8c/AUxkhMxSwzFxF4oMHIdqwH3+nW3J3a1MF6PuJwg==; 4:q16zzetfd6uH4VPyt8TreeEwrBtqtDjQ40PnJ3eABvvsyYnatx0oXQij2tzlsz5JKPDnlTaI7x5boPHmlS2lwNmzr2xSs1AgMzal0N2/KUG0O3aQqjnQL6tKPsPvlwcDgVWtjfBptDKEtVwAaqf1rbm/b17BK44Sy/ufNClMwwTHrNgdIg2qWM4fHVJ/8VFFE93rkUMl7HftoQ46dU1viFX7gAPBM+sDCkYjBAZzHWrNjQdNg8e73jUWSTP4zbBA2PqFp01OMflxaOnb8VOft1Q/p2VG0DZISR9mkazpSmkndQ5RP39k2CL/Xq0q8wKpPHUzbLrLEqFOactQ4TN0NpzwPKtzVZ2Zm4xxfHFDcGJIJMVFWmkZFBXYlNQUOt0AleCNuHRy5oPHMxXed3XlO8jazuy9A+Ni5whRM1M90hwE683BfeTimiaL5qtc0qZ1sf19DgdYB3vCr6j+Gx7vBlnCcCeHPqNW+EhGmvFa6/yZ+MDSZN67dBT++quOkXcGrOke4XLGLRVrctP+AJLNx9HDb3qUb/M8KD/HUKpXT0KyaeIBH7BBBUy45zu7IT29 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)(8121501046)(5005006)(13015025)(13018025)(13023025)(13017025)(13024025)(3002001)(10201501046)(6055026); SRVR:BLUPR03MB1409; BCL:0; PCL:0; RULEID:(400006); SRVR:BLUPR03MB1409; X-Forefront-PRVS: 0100732B76 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB1409; 23:sU6lu3mRkVjwUCvkB1xtFXk7I/JbikWm68J//V4rF?= =?us-ascii?Q?BuX9KprgPNaE2oJC8VSd9KtHZUywi7iIbI0E4zC3Xj5a1bsVp5EsM7oO4fjM?= =?us-ascii?Q?TAtGB/gRLx4pzuKslWL+MJv+15FNcLo4Lwwa0GszsvTslLHK3jyiW8qN58jq?= =?us-ascii?Q?DhDdXX3fsYPQJcq/jw7sGrnFFJgjBi3d4CMyZJveePRBgGihzTPekzNwx4ko?= =?us-ascii?Q?K+Oz6oIbHzfnxYSK+pNw6eatHS3L+2pVvbt3mq1S3bMJ15uvND4UvLuPmr9q?= =?us-ascii?Q?F7JA3H0lPW21n1y5Rl+2u93eJsCfy6P/VLAZV7qNkbu3TgbwdMWoCuicQrA0?= =?us-ascii?Q?2Kv8BCz/IDNEK/2oblqaMSkKcxNCTHvoRgjxEnJpCv9Wcdq6oSYEsKd3J28Z?= =?us-ascii?Q?VfQ4B9S0kvuqq45AkcnM5ggCn6udukouXFwNVlQbgnfIMzZePHi0AtBSep47?= =?us-ascii?Q?E7K4Dk7T63d0+3h5xslzWpiUi4dk3MkGBfNsvgIRk8gVGNDbXnuOm/t2hWIg?= =?us-ascii?Q?a+ZAnhARnP9NqFHjjydT11jsw8eLN15VqThA6fny3WPtg/K97Qb0sSDT9J68?= =?us-ascii?Q?Q82bdW25loXPOU/RsXhS5C/KJPJxE/3Ddl2As2wagUEEBJDtCyRFGNDRKnvK?= =?us-ascii?Q?PmF1vBbK0dp3cirhw2bWJarLYcAHsLqUn1+LqGtghG0wrWlLflP9IwWqwJsF?= =?us-ascii?Q?P3QZid59NC+MsGmGjNuP8Zqdg6CNtKnRbvJkR1p0roOi1YoalH/KA9/Nl5FL?= =?us-ascii?Q?6G6iQ++0wK9tM46nQ2V4X0McLa7IXH7UMRyGmFzbhFByBAljrHSVVy5o6HVt?= =?us-ascii?Q?MDkDtHrXs0JNcXTAVsIHCtCCWBZRVtrTzU1fEpBbduECR5/P8VJdkD5gWqpx?= =?us-ascii?Q?BGEzbr6ATmH1fC7lgakAbquRpB736gJPrbaacJQz7PTZhEKzNfO/B62Y8zrB?= =?us-ascii?Q?H3soDtCojI0kA5OTJbF9IZQu5+boLZK3MYxgmowN0S6gm+EJF/hBuTHfUJlE?= =?us-ascii?Q?Hs01bY9f1O47lnjTDzvVfQK5bVlIKSGXmWFi44adFGfOmXn0Gy18wHP3gKIn?= =?us-ascii?Q?ihawFjE4iKsaYp1cPxlzPXltaRw2PdiQMibaHPnw6uIqiLVdOYmCZBhvM75f?= =?us-ascii?Q?vs/dbJ4WYxJy12QnufsLpOH4eMp/83mrkaPtLJhooT77TUPbgMtBRdjh+pEW?= =?us-ascii?Q?Rz6or0ECEJ8o/7bUsvklNijRwUboMopQTK0?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 6:mHvEPM0J5qBLTWaA71ZorJh/1pA4YVd4fazzrwH7F+C01KAt9k1j2Y/hGykK16yyc2bU80r4gCMM8Xw3Kp87mmrdbEflMFtBU+HnUJR/e7XhJxm+7hSYiACJWWRKx8SzC7ZATOmRFCHDc6dFdCWwJky96q9ot98cKrfIz8Z1uvLQeEd6skCwXvBJMNGFKIk6M4kV8GH7wewXY2K7676j2tdNVEBz5yiNxx7fH5WIVaM+WOnX8Caqmbo2oLLnUthasm7s1P1SmxykBW2ExWIH45JbJ2RDaSN1guRHHI2v8G2pvmGH+w33Ut+v+cQIVDjf; 5:qPw4WOpqphH2W2EUiZUfcn+4+G7urLrLYGbw2GnFkIUuwW956zenuW6jeBjo+m/6N8UiNebVxL3kwglxxRLXMwc5Iw2syQCCFi6B0ENEUqDpwNI1JVItG93BHyc6BQWSX61m9XG6JQJQK5TJdoIVkNsYu/QsI314tiwC64UtfwkDwjQMrwOjxk1m8ov2zza3; 24:iqPibinI8cRir9pHu4Zz5WHj4dOQ9fFQCfMzQLsLWeeToqG5wH8fix7kshdseOK5PU2IMUCzOZoP9E9unqfeq+rBNLI7rEWa18k0paioPPw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 7:bFog3ECZIQXd/Xrxxv9Kr7I3tNYlEkH+TQwSNemTbETOK1APkvAZzM5CwkV3T3OT0H0xVvmVGFAvX52XuAsv8on7cnzgBV9iPnrUkwTzAQevv/3jqDqs5aamRSTog4EaqJOEXeUyBDBl8cympHG8JTLELTjVRV8CoAhxYTvHvoXQyKLuUCC1LaWYjXG0wSREQ7e8aRd6VUAmCHH4EctXGTAQGxlerpHhAU2MbTZgFTIY2GzZtNP3O0qShX6X64HZs5SFHSgfVBUAvF5ZWJPOi42smM4NcyTrwg3UP11WxqtYB19r36pz0vzRVqrE0ny7QZqReRuMySf+Z1qR0upN/70VSfFV4JJzMW22ZJ/QuKk= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2016 09:45:20.8570 (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: BLUPR03MB1409 X-Mailman-Approved-At: Wed, 19 Oct 2016 13:46:20 +0200 Cc: Priyanka Jain Subject: [U-Boot] [PATCH 3/5] 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_ */