From patchwork Wed Oct 19 09:36:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Priyanka Jain X-Patchwork-Id: 684067 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 3szVhR2bkCz9t14 for ; Wed, 19 Oct 2016 22:53:43 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F06D8A755F; Wed, 19 Oct 2016 13:53:39 +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 7KM0sElTsScO; Wed, 19 Oct 2016 13:53:39 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CC6BBA7579; Wed, 19 Oct 2016 13:51:00 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id A72CAA754A for ; Wed, 19 Oct 2016 12:19:26 +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 GpXiwVvY03H0 for ; Wed, 19 Oct 2016 12:19:19 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0079.outbound.protection.outlook.com [104.47.42.79]) by theia.denx.de (Postfix) with ESMTPS id 4A52AB3817 for ; Wed, 19 Oct 2016 12:18:35 +0200 (CEST) Received: from BN3PR0301CA0033.namprd03.prod.outlook.com (10.160.180.171) 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:11 +0000 Received: from BY2FFO11OLC003.protection.gbl (2a01:111:f400:7c0c::107) by BN3PR0301CA0033.outlook.office365.com (2a01:111:e400:4000::43) 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:11 +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 BY2FFO11OLC003.mail.protection.outlook.com (10.1.15.183) 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:10 +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 u9J9iYvc023163; Wed, 19 Oct 2016 02:45:07 -0700 From: Priyanka Jain To: Date: Wed, 19 Oct 2016 15:06:38 +0530 Message-ID: <1476869802-30528-2-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: 131213439107757635; (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)(575784001)(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)(11100500001)(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; BY2FFO11OLC003; 1:HYV1HEiGXXCAkXHpN0IXq3iYjbGlfuTHC8FiFcO82SZ5g9ywowxYM9CMChrWx/W/0rIrvM9l9Wc2nspCO8FL6Nd0ZKeOQlez/q0yqH/+dPR8LlE5oGR4V4h+qoAGwtR8lNp1158qjfKJ/0+8Wf0Rx76/+mREDCPVFsOL9rPXoXqfYmtS3chSkHY7ZuAlNwMmdGA7Cvc/3niU6gVYfcUfsneJZ6EsvQbi+t3Y1U8AP6cp507l1v8xr6gzZ0Q2xwO7EVb/WI2FrhdptqvoredWCBVZ8Ctu5jjQptqD960O6xRzlXJrr2YlaNwUcIqMjkQFHMkr4rh7dJ7dT+dmjBKoEcCHIBBXYYPSFaekwnw+JMzilb0Zo0KgAtUinCfSPczUuteJgLGlA3StTsJ2Ez/rk/IjCPJyWg1oXUpa7JJIH3QboCwSoOh5GLRPzDba8LkNdtDREkppjgmaTb+YhRnEkL3rYRCcEbp9gbplufVEdfDtcBRyVk2qR3WJ829kUOwxdEulW/TrQOi1vEtDWLVlhw6QqgcNx1Oo3mFjVTxu9QIPaE9ZRNe8vgHq37bXPyVw5dlzLR2Y0qdjH0hYoisnfueJmxIBFEjUlWJKDOxmvkDkQ9iMX7tdq/GDcd130M522O29wBts85BYLIz7SVkTSdw3hZEca+jDUE3sGFXtbXYFdJh7b41PsktO1FQSUbdPqnNDspeHtzf1K2QFYhenX5zXacBdRteUz3VPxKFbBbE= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: d3c59c21-d4ce-4660-6b6b-08d3f8049e2a X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 2:VdB36L1F0s6dSvyDVKSN8WTQwobfz71is/2VOaWv79/UjHHilrS7Ehiyi935CTCSxYw1060s7EE64zjCYlYoocdBqrWWmaPvrf2ISRs0DQpkz5SISr8C3zo4ujfDMEUF73UqNhbYy4edzF5KWflUjyT67noWv/rMskzDCscc8qLaG88cc2e0XpIshXYosMtru+TjdtpLLq6XIniFK/X/Ew==; 3:dQbiSykWVtKNqqWmzol1sK2D2JqSLCRE4a/8wzGuaMMjNhECXMwwQyejC4iYpOudIj1UTuyvwHEsh2HsvTUwdVKtdW7GRAi61GFn47dwB0+2Gh8HBVKemAryiKKr7fIeeewSHLIpchwwdsXUS2yJIMVxlbnF9n6guKxH9iQgQ+KEf2yGb/zZWFjBycGdz6PVY7di+lVXf21cAG6jRBG6/jpNAYsRC/93zPPKR2zjpe2t6tYDjlmTHRelkyTh7WKh; 25:+S1MzOBzsJZdMza2+1oc5Rs9VQA4f2SdXXcpnGQta6GrI3bEqtT36gNf2gTAfmzSZknPzI3Hd+nqUuEh2gzz79t223DP3FQv7rpo07D1hXpwWtytLsVRY51PQXixkfW4Tbf3DACgMoy0TqsVfX/mmkAiUrmxCclEHnI+fR98jkHsWpbcetlWNs5n+LuxjllF9g1M3CNsT1rf3WF0fcwSYWB2xB+ecMT5QgyxsTiL7Rl0Vj1toISTqAnR/D8e4JU7ZH/d/RUJoG0bx2XsMNIfBtRyKKeJQ/9ZGI5rM6tFpWzl9/1FfwJEraf2Oihj2YYTqEqjBpfPgByJfb9F8ejVRJW4y5ETnVUxu9KHH30uxs6Kj0ENVdY2CfUgpyLryXCyDzyn4XBXmr6RPI+pO3jGYyZUDPeFPeALY3KWCmxMY2XMpGe6YlDTfILaBbnZez51NGO2GK/vtam9z7743RA CoA== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB1409; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 31:FKzacDNwLBaKbn2ek+OMif1N8hdvT8yk2hJUecVFhBtwexUoSdtBzKmmO37EbX96gJ5iDerchgkXGMcOL1sJekgcmkTV12jC/s5ASVJBrbkXv2UmoyUmgFw1RHnk92ui0Bi2xC/1Dx2RigSMR/FFe7ubK+b+dl2LdxrervwP/JsxY4J8ErPAO2E+caZrK9e+7h0vvPjcPd3KL0JCXyx0Sd4r2RvODR08qPA7QtWTRi7Zg12DqsxdxznOvjWW53pYuTfXKhsJYhKXVTyvOTvXg88d4GSH36Kxm92OUKrF2rM=; 4:fNk/6q7+ovd6z6MI6nF4Q14hEr810285YLVyCRXMuBTgZHu8DzZ5MA+6ELk7YWCLb1Va34GxENN9tcZtHrQh/RAA3ddaop1AAfqqHIp/WRoeoNqJ+k3qIJ+xsYZyBT3NXmFC/qSxbZ19tEVAvDZ4z1YM736sVxjIo2XaJ81Xq3vq2z4he9N2xBrXzU7VlyleVMDR4sc8WlUF8NspDBCGWZmh8TK+QwFeMo6av5LxAM248vwcepQvo+Oth8nC0RPxLB+M3gZ7aYPuVOH6LKEaTuoUXI/8gDHnxOFQcG60dplH28dUCSvyd03H6SrXa9BpItGccVmTqj3iCnS9fckJnJXM8zD7JeDf6C0Vtt/V9odLQ0C4PtPgCMUBbZlO88Mc7LYBkPpipFNhPsqeU7jQKUBN+mVVMHxCm/WkJ4MN+CP3yNsu3Hf+kgt+B+4ZQaIzF8GbsjDB7FnInOwTctUL34docs13w12C4AHUK2SXnYe4pXDV+vqX1S+15lUO1X+Sk1putCqG7ujHmB+BLq+XXvgcr324Esel6F9Xf1FSWkhl1BCxo1v1kyvj4U+2odhG 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:nQgBthWHjnOW26o5OwrYRkmizD7dNZlASDg0Th2da?= =?us-ascii?Q?gWEjmLF6TNMP47qzOlz7JOsPfZlxO99ruQ/T4yMiqy3qndzqBRhqrSaQvtEg?= =?us-ascii?Q?+0smz2uKlcB8+Vezsx1DksG6JJpjhoz3A3NMJwtStQ/5/PbSZfk/ovBhINLb?= =?us-ascii?Q?31hyUGi6z0X0kIjkptGclQs7SA//UjlbQigbG2loydMQODHTzzIzYDE1Rs0S?= =?us-ascii?Q?a0nT9JZTcRYY/bhgX14zz5JPMGR833RFtQ2VFqedboLC3jzbmn9L26Ahxdg6?= =?us-ascii?Q?GuoNf3odXaav/YeWENL7qRKQWD5NekvsomPCPi4+ifJUJ57x9Ptmefu/O5eL?= =?us-ascii?Q?5jzW4T+bUxYUSmN/BErFYqsv9DxxSHWknpvBptIdBQxeYKm+xyHLq13OLEyU?= =?us-ascii?Q?rAwIsOLHxWusu1Z9+uR7b9Q4uecs3PzKSVC4VBqZDpRiyru98tAxePLZAxow?= =?us-ascii?Q?WfuiaY43HXd7vR1wMe5TM1MF6NRzZiKvKcsrRSGQ4g9gqpkoSNGVZI7WRkbb?= =?us-ascii?Q?RxOFuZoN/+GeKiWKJKkouSKCHzyGshX847/2ulDizAaYKkWHgOQJIIRkO3VY?= =?us-ascii?Q?v+mwKXDjNLrp8CzXjBpBrabBMphUo2ZtvwSmKwI+HQD2HHstzPnY7MpStU2s?= =?us-ascii?Q?gMPloSUpp+JNsd/OL7EVEgEgEJhquMaNdmvZmnWg0PbOyO8VlLwxCHA+RMUK?= =?us-ascii?Q?/EJpGfaVXnjr4ToQ4RoQ5wSLjwTLm2KqlLHGy6T9j68Gy1mheW+kW0VOkUrv?= =?us-ascii?Q?2jajXVbiVdXwdGpimg1cOKytNM52xJAh/g7SCkEGrwcdRbdNfwWF9kVABPkk?= =?us-ascii?Q?j5UOvKnKawLh0WcXXeH6Jz306m1hPZLLisjTtxjln2WEV7wiry4cQGaNmJXN?= =?us-ascii?Q?nuMsgJtzhV8lhoHy54as1qCD4sQgvVrvNSoLs5VzOvr1LgFuCYbDsx+3b/Hv?= =?us-ascii?Q?su029NQX2augk9binBmQ6nRAVtP6JRx8+ygE6/xuReJqFbHimsrbc11PYlOc?= =?us-ascii?Q?5dkWBWFk0v3QTH7y5uwbvW83pcXeWLlyeZMNkjYiyl5+l012H7Eob7V9n4az?= =?us-ascii?Q?UKrymQogxCWZEhy8s+JGYgTkHaFFRgoB1N/ShW3X1poaJg9VCBasxfVjh+Dd?= =?us-ascii?Q?PbRv0bNL1+2oDK6PyoJTGlvPgpEA4RRxAZAIRXKFiseYq9JyO3s4AmL0txsS?= =?us-ascii?Q?YUtsZj/GSHlB9vlW9goa4L0GFoYCweGBFMOCd8axDz0J5kTlmf8Ww+XcV6l+?= =?us-ascii?Q?GUFyE2M7xiRW+dplUxoUoauIv/St0w9apWtFyO8?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 6:C0DD6upzgKhhZpHHfvAtuCvQuAwsLOOstZrDFRcTPwr/oESo1XeRvpAGEZuZnRcv5kecTyZ1S3+YlBFH7uXqv2M7nRN9NDl2DHJ4J8ZOlKpt6FpS+BztAjyAk0cn1CDlLFBmiYKn3fsPOVzAyRL4LxtrtYZPhIvit24b1csXrLKYpSh3XqRsYUXcWLOdmyn/T5rAKALfVCRfcBAyKREB9FSZqeQIPiEvTpe94Y1uyQ0Z/EB4uyVslgP7AFsPBrPLNXE7tOBohE4llfyL8H6ighO/4Cv5eydy81oYmIiWPXZtJvnz63RhYSOpFLrmZz/5; 5:PCBpgjrZ+WH4F1loiJoIVKzzd4BSFQiTVFqwo35LhWjF7AtGhJlTolgXGcXr/b9qoWwxJwkUjqPGwapICOjgs53KxXOqNPtnsrdYtLUSbvs6qUScTKm3RNme/ONZHFF2R3PW1C0pj44VsQ4sLMOz8Z5rpZGOTrrFf5X8KAfCcJdYEiJ2uaQmyQYeZJ4CCnE/; 24:JFsuqSZKbqZ12bt8uUY7FPwIDE0Q8LECEQDNxjaantb5Z3/9MmfKU9m85xF40sAW7uy87jOBMbgQBrVjRrbGOwShiFww3V86fPHdZsJbrBo= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB1409; 7:tJQ7h5EX8WSVxyjaLichVdiFiN5qNITyTJ3lLpqUWQ/+WP1DmfW7yStrHryZg+BjtH0ETKZHMSiCWuWOT0pzfTV7fTWDsZ7qq90joOV81i7dw/5AQ5b/AIdIp0UMUqJBFToTtG2O04dkuTF/GDlZrQfyFhjfqooeA/0QzHb+DMBKJFzTZowJtKiDOLxMQmVy/ahyBTLcgejgDi8pzdyyGFsDUNl9xMC+vmHHglYnPbltjTp/4ekW05mT1DuXIWIft+UgTiAlYOW1Qd3HguComilM9QBJaOteBZzFj+amuLY0k7ROOWrLfaCLQ6kQ2yO0zzqK+eVKIS8dZnr2MjmDN8BtLwcdPVThSLZkB7UpLtU= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2016 09:45:10.4481 (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:23 +0200 Cc: Priyanka Jain Subject: [U-Boot] [PATCH 1/5] armv8: lsch3: Use SVR based timer base address detection 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" Timer base address has been changed from LS2080A SoC to new SoCs like LS2088A, LS1088A. Use SVR based timer base address detection to avoid compile time #ifdef. Signed-off-by: Priyanka Jain Signed-off-by: Prabhakar Kushwaha --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 14 +++++++++++++- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 3 ++- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index b7a2e0c..ce04e48 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -424,8 +424,10 @@ int arch_early_init_r(void) int timer_init(void) { - u32 __iomem *cntcr = (u32 *)CONFIG_SYS_FSL_TIMER_ADDR; + u32 __iomem *cntcr; #ifdef CONFIG_FSL_LSCH3 + struct ccsr_gur __iomem *gur = (void *)(CONFIG_SYS_FSL_GUTS_ADDR); + u32 svr, ver; u32 __iomem *cltbenr = (u32 *)CONFIG_SYS_FSL_PMU_CLTBENR; #endif #ifdef CONFIG_LS2080A @@ -439,6 +441,16 @@ int timer_init(void) #endif #ifdef CONFIG_FSL_LSCH3 + svr = gur_in32(&gur->svr); + ver = SVR_SOC_VER(svr); + if ((ver == SVR_LS2080A) || (ver == SVR_LS2040A) || + (ver == SVR_LS2085A) || (ver == SVR_LS2045A)) + cntcr = (u32 *)LS2080A_LS2085A_TIMER_ADDR; + else +#endif + cntcr = (u32 *)CONFIG_SYS_FSL_TIMER_ADDR; + +#ifdef CONFIG_FSL_LSCH3 /* Enable timebase for all clusters. * It is safe to do so even some clusters are not enabled. */ 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 7acba27..e6cdfcb 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/immap_lsch3.h @@ -23,7 +23,8 @@ #define CONFIG_SYS_IFC_ADDR (CONFIG_SYS_IMMR + 0x01240000) #define CONFIG_SYS_NS16550_COM1 (CONFIG_SYS_IMMR + 0x011C0500) #define CONFIG_SYS_NS16550_COM2 (CONFIG_SYS_IMMR + 0x011C0600) -#define CONFIG_SYS_FSL_TIMER_ADDR 0x023d0000 +#define LS2080A_LS2085A_TIMER_ADDR 0x023d0000 +#define CONFIG_SYS_FSL_TIMER_ADDR 0x023e0000 #define CONFIG_SYS_FSL_PMU_CLTBENR (CONFIG_SYS_FSL_PMU_ADDR + \ 0x18A0) #define FSL_PMU_PCTBENR_OFFSET (CONFIG_SYS_FSL_PMU_ADDR + 0x8A0)