From patchwork Fri Aug 11 05:39:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ashish Kumar X-Patchwork-Id: 800410 X-Patchwork-Delegate: yorksun@freescale.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3xTDTB1hHhz9t32 for ; Fri, 11 Aug 2017 15:43:58 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 02E7BC21DA3; Fri, 11 Aug 2017 05:43:56 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=BAD_ENC_HEADER, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D16E6C21DDC; Fri, 11 Aug 2017 05:40:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 836F1C21D84; Fri, 11 Aug 2017 05:40:08 +0000 (UTC) Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0089.outbound.protection.outlook.com [104.47.32.89]) by lists.denx.de (Postfix) with ESMTPS id 6EB28C21D09 for ; Fri, 11 Aug 2017 05:40:01 +0000 (UTC) Received: from BN6PR03CA0010.namprd03.prod.outlook.com (10.168.230.148) by MWHPR03MB3326.namprd03.prod.outlook.com (10.174.249.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1320.16; Fri, 11 Aug 2017 05:39:59 +0000 Received: from BN1AFFO11FD006.protection.gbl (2a01:111:f400:7c10::194) by BN6PR03CA0010.outlook.office365.com (2603:10b6:404:23::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1341.17 via Frontend Transport; Fri, 11 Aug 2017 05:39:58 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD006.mail.protection.outlook.com (10.58.52.66) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1304.16 via Frontend Transport; Fri, 11 Aug 2017 05:39:54 +0000 Received: from ubuntu1604.ap.freescale.net (ubuntu1604.ap.freescale.net [10.232.133.7]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v7B5dinc009693; Thu, 10 Aug 2017 22:39:51 -0700 From: Ashish Kumar To: Date: Fri, 11 Aug 2017 11:09:15 +0530 Message-ID: <1502429956-31604-2-git-send-email-Ashish.Kumar@nxp.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1502429956-31604-1-git-send-email-Ashish.Kumar@nxp.com> References: <1502429956-31604-1-git-send-email-Ashish.Kumar@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131469035944170863; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(336005)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(50986999)(76176999)(104016004)(6666003)(626005)(2950100002)(6916009)(8936002)(8656003)(50466002)(48376002)(69596002)(81166006)(81156014)(36756003)(4326008)(8676002)(68736007)(356003)(5660300001)(305945005)(53936002)(54906002)(110136004)(2906002)(77096006)(189998001)(72206003)(86362001)(575784001)(498600001)(97736004)(106466001)(105606002)(966005)(85426001)(47776003)(50226002)(2351001)(5003940100001)(6306002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR03MB3326; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1AFFO11FD006; 1:pGoqrmU1JmztoGDU3afXMhFqjbmuY1m6L/SMNj7ab?= =?us-ascii?Q?3b79Z9BfsodaegFdhIEwwXbY1+yAIl0GtHeejE/Tus9+oueNoVFt7537M29C?= =?us-ascii?Q?rcjG4DIQ5rxejlZONyerbmFc+CEi5BtGC1/xqoyH0RhxX+QapaLC2ggylKsz?= =?us-ascii?Q?ls8EKojQvXvWNr+aQ3YyrkuJ2Ei50iAsSrGT7B7siROv+Xr+wVtSuGS1xZDH?= =?us-ascii?Q?75jeVpbiUvKFUWY2t9NTbo1ZGJzzGXuh0cCxfTne3Zsp2TKHmstLgTghFQc4?= =?us-ascii?Q?mv4Ekl5hc/lX1y9u2p1iXheXzM0CLiitLOHu0dUAisCtggggLcILd3/B8eUA?= =?us-ascii?Q?xpcy7SyL3ToLmYV9gw6Fi15LBUfY+1i6QRGbHqRmdosxMog5W1hpaoHLKyRe?= =?us-ascii?Q?iRxnBvObQDv5Gqb1R6nERNazsfnYFHMqq1n5i6b09Tsguay/oBJsF+jxtvng?= =?us-ascii?Q?hc0lKq5ypYuMFGrPaTyB1aZlTXvvzOYc4TY4KofLKCnCIClMhqLHviA4EJ94?= =?us-ascii?Q?3b8FshNSsUBtn04inSTbFZ0MjKa7KGjMF+y0jrV6Pus8HafhUITqFQh+eY6T?= =?us-ascii?Q?aSlKko5G/IUhTQiezpTGd04UV/ImvLys8xNY/bfG07WlmMYNpefnkNlDpz+c?= =?us-ascii?Q?ogcuV0MfBIaVGOnnSsM3VOTCCTBDFQG6Z53f04M48WT56SCQSneImajSavdf?= =?us-ascii?Q?oOj8pjPMvLszPJGVVfOpvoOxJb9n4Z2sJRCPHf/Yv3wxvP8tg3XA15JwExLG?= =?us-ascii?Q?Yx8m06/rXgXpGZmI6t5ZDI52ErQa5usT/PnPGuvzFST4P9ufgNzkcF6PkJkm?= =?us-ascii?Q?pfHtwy5wQk3LHIIImLjmqwTWLUmL9LNFuLoZrmwq31seK8uVLqI9VF+uUKSq?= =?us-ascii?Q?vFM6KnayKOAwnOmI5/tv4Hun2iw9ogCsAo6L1UoRKbESVSGV3EheWgJHfxlY?= =?us-ascii?Q?lt+1+KfGrQgObb09Hfw3L7m1xTBad0UbRVNyD0+qQ=3D=3D?= MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f2ce72d5-e75a-4c8e-556f-08d4e07b64e1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(300000503095)(300135400095)(2017052603031)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:MWHPR03MB3326; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3326; 3:Iung6Ybve2oXkZt+1llzhog7Wzd1gq57BbMA/0qynReC9ojDrc01jI1VWi42s7tEYgvHW7pCce8IcBzBMAhMUH7ddMZ8sA2ennJcLoS/dS2voxkf0iS3SDfGQL20LZfLXkjd/iUQMaoWnSuIGV/eWX50/bSWrpWDF4hffNpFc2r4L6uvyQaB9ojkrXtP779nVGBU9geZpOfGNOZOh+g6THK+L9eeYSdkoiJeS9S0LJG2pNQF2vgKGrR18kWK0HF3nbrIOEM8wcoJZrt2BijK5wzhDzG6aq/oOQ+vPMb54huhuSZ/sTwPhkj/s7TgFN4zjR5l+WmR8CjbRw5daR32vQ==; 25:jWKeY9YpObE0ZZCowvu0gKLte9Q/txuBYdUqXGppxtEzhacsTZWI8X3CL0mfVhb7ZM45E3GSmDK6WKUaDwuAD9gzYUQu2hFrLnUZPXYghcDVJgOb5qXPdv45quchbmjPTNJMv5dAPUlPTN3lDYO8W5XWdt4N6S27NEUXuAqsvTAkaC1EeOtAabF/Getlf8uabLXvYe6cN6VNTKpt+1fD2v9ZNRpgHX9obDq66Tu0cbqBapwrrn5On+g2SNTQYX8gNeE/YqhRr+/NHjD8dFjplTLvgBB8IIr4P/ceEC3wQWL3ZJ6k5cXv9IPrfhSXOaBeoMKx1x2WXtu83XFFUrCbSg==; 31:PWj4mXXOGPvcOdT1ycrm9yNt5cGchSqPreo7FEQ3YF7cXiZXMtcZjndVQ/0cH4fXyACmmtSM5+RFY3hN/M3aTXBBm6DkJJYoUW1OK1eTHG1C6sYtHceW3sr1nEcQb5aTaVWW0fZt27PkLIz256N/I9kZcdV6BCcgU2kz2yPi4hGQM8PMNP1OBZFBgA/wkllDd8kLe+e/8nEjFursY+IDVySlxLtnSw3JKnAFM7KL/wE= X-MS-TrafficTypeDiagnostic: MWHPR03MB3326: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(5005006)(13016025)(13018025)(8121501046)(10201501046)(3002001)(100000703101)(100105400095)(93006095)(93001095)(6055026)(6096035)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123559100)(20161123561025)(20161123565025)(20161123556025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:MWHPR03MB3326; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:MWHPR03MB3326; X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3326; 4:5JT+tS3tPpIzG119bXayYM6AK20vvNwxli6F3ZfkqW89bszdES1kSEY9KVFybyBkWx3fX/3DZrnjFDh6VsAszZvPO3V6PHMDB9vW8mj5ItiCDWLNJhhcNxrNTC5M+PwX90AOxSJKYy41BT3YreHkhN1vfLabkDd5PAKOmVNt5/QTTlakGhHkZEb0ofn/p+nieK+qmWF2ULnquRVP6vNIwI86yuYszfV7pPRfTNyyHTaoFzbHJH3RjBaLx4cXkvS3CvnXxkt3y7qJmeyCaL9RHs16PQnXivc8WgWgrBcXitk= X-Forefront-PRVS: 03965EFC76 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR03MB3326; 23:IbDhoB49qGg0GjJr9teYs/yeCpXHfGAInJr/8C9bm?= =?us-ascii?Q?SUbGbiTAJ2VXDyMyTuJScLM374B7brS2Z01z9CGiFMeaghsSsyRIkk11WVmk?= =?us-ascii?Q?dWFpiDuM5iM8QlX4rvhyfAWNniBTD7cPPSrmoSVIAEbpwUaRHUr6LPZx65KJ?= =?us-ascii?Q?44+/Lp0EleG6kUz5cGxcWj+u0LpgJL1y0SvdSYsb5txAF36WOmCAcQTBE8hM?= =?us-ascii?Q?xp7Xjv6vAr9/6oOTBF5PKgpikadwuEtD2brNShfIRxrFr/42wl26cyM2Da27?= =?us-ascii?Q?yev6LqdnQaq5d4AB8S2OvZX3A4fIEp/45auHGGY0Jj4yIPLx3cW5UT7x2b28?= =?us-ascii?Q?/pBjaUte1kpXZTt8bS5QiUzqDYV4YoWXfL94Y8Lwv4hSNdhvUE4wj1UmYFk3?= =?us-ascii?Q?wSw8nmfLaEUySiRuGmg4DwZ9soBphAQYck/mt9NODJijGz1XTOBcE0kqmWDn?= =?us-ascii?Q?ZflOahPxrI0IzbG4oWA+BOv1imN+UckQzKMybK3S3Xw6kcjEHnE6kY/8Shpe?= =?us-ascii?Q?F0cRTq/IUn3G30lZGS80zXZPHeeiR4lKGjrwn729Nuh9dyxEiILBUDD56Xz7?= =?us-ascii?Q?67iEvrlD1YfSH0l/0oFxpbXOmfWNduB7Eqa1JtWCpF0FaOBVzYEOVGwYGz+l?= =?us-ascii?Q?gx9mPZZ8jVoKmkt12pe1RcYMA4UUaOc6jLzhvjevGTNkz8ceCTm+Pq6ru+eK?= =?us-ascii?Q?0N+R6dDjKqrscQW1S1fj3emRlg1VJPSqcEXEuy/JnE3qfHrZVLo3o3SZ38Ho?= =?us-ascii?Q?H04u2i9Cye0Ih0ApOZN6vX2SRYOA8MASPd2Ay//GFY4/OZhMuWYWkWoHbO6a?= =?us-ascii?Q?MwYo3Q/Y7KdmpJwumBqTNckjDmGgJw4DvZ+0mbN2FpmpRikTTIwP9lZ+MUtk?= =?us-ascii?Q?RqKFd1XpVRWKPuGSse5FJBP0kuapBG8ZFSpbtnbW7UzaNZD7wnFOw02D0RKV?= =?us-ascii?Q?uulVBrHiQpeGLNX/LKKOX8VWYMyxiwxWW+N8WPLb159rSCPutYMofeslLJEz?= =?us-ascii?Q?03SSEPyQv8bq+G2CwMTDb+TjiLMS73X2c5CYpE0HpqlIPF3Y8pcYWnb415/H?= =?us-ascii?Q?xItKa48lFQ4gZmTG5lUiW2Szs68+u47g+sf0+dmR97BlQKwjzGoVhvUmOXlN?= =?us-ascii?Q?8dXMKk4tWDuBVu7kMoVV4pTyWrVRDSOEdfj9q4yhmT3kR0uHKN7h5w2uTxb/?= =?us-ascii?Q?ShtLcnovKG+Vq2Oy1KHvlpmLipS86F9N0S4?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR03MB3326; 6:XvVdVMpdf8+NDGEMs5LyB6J8wAyaFpVd8B2Csfs6Glljnd2l1Fq/bFbDKWSUFZfH/BSXWOCzdUyVDwo0sGM8FsbgRZRgB63VKWRW1rruwMptKIsMTBFczVBl8AeWtccVUarLhWQnyQbx/LiTykdy5rcFaOuZBHzoOPXTU/4CsMEwu3fjm9BBeaTApo5mbj6L2sDZ8MGMitnRSGIcOuZJ0F9O+sFaw3m6Y3AZh6DAGsIxVETfuGCjIQXx8zMKW31UbRBKEktqEFDyFlOW0ViGC0hDuqShRoo3nYxDXW5+aeO3KW4E4jpbQyxKb6ooSrCVq1TE8ZgaB5gDtAAIuInR1g==; 5:hDPqGwQ+dcZ8sQhr6hbTvgZSlg2eHe5YEXd244rmR1K5c5I4QwyQkWSpW+ReFNlTVp3+rUlzt3syPtMfb8POUqMrjADLVMdCYOhorzhheb6kQKiY0G3efTSkS33ONyeDMeES1FqrocA49rqy7cbe+w==; 24:w5CUpYAnrs9AP6PbBQMG1Qrqx83R7nDtvPowDbmzhTFVxhVm+mZqpWm4NJKaKcQU4UxH7Ljvgt2QW/CBuCFjasi6fhQ8JepLiq+AD64ca/8=; 7:LPg2nFNLYn8ndd811FmqGzOrJPGz1+e0kVeJJaNKxxjeHuKLzCP3hHQNIC30mVlgs2IXX/nbjeBlrFFotng0LT7oL4ZoBTVUwRhdIGncRFeJXit9OP8Ah6ZZNm6SMz8FQKzF1yR4FDec/viFBWhOLrTIekGa+EhvA09Z9w4USl+fuZq49A5lEzN4qzhp0NS6n1Aerzk1uOdX6Td3h3G9MrwZjmYoblBBtFWiya3tk4U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2017 05:39:54.1830 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR03MB3326 Subject: [U-Boot] [PATCH v5 2/3] armv7: Consolidate registers space defination for CCI-400 bus 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" CoreLink Cache Coherent Interconnect (CCI) is ARM BUS which provides full cache coherency between two clusters of multi-core CPUs and I/O coherency for devices and I/O masters. This patch add new CONFIG defination "FSL_SYS_HAS_CCI400" and removes register space definaton of CCI-400 bus from immap_ls102xa to fsl_immap, since same is defined there already "CONFIG_SYS_CCI400_ADDR" is depricated and new SYS_CCI400_OFFSET is introduced in Kconfig Signed-off-by: Ashish Kumar --- v3: This is v3 for https://patchwork.ozlabs.org/patch/731464/ v4: No change v5: Moving ls1021aqds here arch/arm/cpu/armv7/ls102xa/Kconfig | 12 ++++++ arch/arm/cpu/armv7/ls102xa/soc.c | 3 +- arch/arm/include/asm/arch-ls102xa/config.h | 1 - arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h | 49 +---------------------- board/freescale/ls1021aqds/ls1021aqds.c | 9 +++-- 5 files changed, 22 insertions(+), 52 deletions(-) diff --git a/arch/arm/cpu/armv7/ls102xa/Kconfig b/arch/arm/cpu/armv7/ls102xa/Kconfig index 6a013b2..61dd522 100644 --- a/arch/arm/cpu/armv7/ls102xa/Kconfig +++ b/arch/arm/cpu/armv7/ls102xa/Kconfig @@ -5,6 +5,7 @@ config ARCH_LS1021A select SYS_FSL_ERRATUM_A009663 select SYS_FSL_ERRATUM_A009942 select SYS_FSL_ERRATUM_A010315 + select SYS_FSL_HAS_CCI400 select SYS_FSL_SRDS_1 select SYS_HAS_SERDES select SYS_FSL_DDR_BE if SYS_FSL_DDR @@ -48,9 +49,20 @@ config SECURE_BOOT Enable Freescale Secure Boot feature. Normally selected by defconfig. If unsure, do not change. +config SYS_CCI400_OFFSET + hex "Offset for CCI400 base" + depends on SYS_FSL_HAS_CCI400 + default 0x180000 + help + Offset for CCI400 base. + CCI400 base addr = CCSRBAR + CCI400_OFFSET + config SYS_FSL_ERRATUM_A010315 bool "Workaround for PCIe erratum A010315" +config SYS_FSL_HAS_CCI400 + bool + config SYS_FSL_SRDS_1 bool diff --git a/arch/arm/cpu/armv7/ls102xa/soc.c b/arch/arm/cpu/armv7/ls102xa/soc.c index b84a1a6..c043b82 100644 --- a/arch/arm/cpu/armv7/ls102xa/soc.c +++ b/arch/arm/cpu/armv7/ls102xa/soc.c @@ -80,7 +80,8 @@ void erratum_a010315(void) int arch_soc_init(void) { struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; - struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; + struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR + + CONFIG_SYS_CCI400_OFFSET); unsigned int major; #ifdef CONFIG_LAYERSCAPE_NS_ACCESS diff --git a/arch/arm/include/asm/arch-ls102xa/config.h b/arch/arm/include/asm/arch-ls102xa/config.h index fc954c5..ff0fc47 100644 --- a/arch/arm/include/asm/arch-ls102xa/config.h +++ b/arch/arm/include/asm/arch-ls102xa/config.h @@ -20,7 +20,6 @@ #define SYS_FSL_GIC_ADDR (CONFIG_SYS_IMMR + 0x00400000) #define CONFIG_SYS_FSL_DDR_ADDR (CONFIG_SYS_IMMR + 0x00080000) -#define CONFIG_SYS_CCI400_ADDR (CONFIG_SYS_IMMR + 0x00180000) #define CONFIG_SYS_FSL_CSU_ADDR (CONFIG_SYS_IMMR + 0x00510000) #define CONFIG_SYS_IFC_ADDR (CONFIG_SYS_IMMR + 0x00530000) #define CONFIG_SYS_FSL_ESDHC_ADDR (CONFIG_SYS_IMMR + 0x00560000) diff --git a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h index c34fd63..1415b0b 100644 --- a/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h +++ b/arch/arm/include/asm/arch-ls102xa/immap_ls102xa.h @@ -6,6 +6,7 @@ #ifndef __ASM_ARCH_LS102XA_IMMAP_H_ #define __ASM_ARCH_LS102XA_IMMAP_H_ +#include #define SVR_MAJ(svr) (((svr) >> 4) & 0xf) #define SVR_MIN(svr) (((svr) >> 0) & 0xf) @@ -374,53 +375,7 @@ struct ccsr_serdes { u8 res_a00[0x1000-0xa00]; /* from 0xa00 to 0xfff */ }; -#define CCI400_CTRLORD_TERM_BARRIER 0x00000008 -#define CCI400_CTRLORD_EN_BARRIER 0 -#define CCI400_SHAORD_NON_SHAREABLE 0x00000002 -#define CCI400_DVM_MESSAGE_REQ_EN 0x00000002 -#define CCI400_SNOOP_REQ_EN 0x00000001 - -/* CCI-400 registers */ -struct ccsr_cci400 { - u32 ctrl_ord; /* Control Override */ - u32 spec_ctrl; /* Speculation Control */ - u32 secure_access; /* Secure Access */ - u32 status; /* Status */ - u32 impr_err; /* Imprecise Error */ - u8 res_14[0x100 - 0x14]; - u32 pmcr; /* Performance Monitor Control */ - u8 res_104[0xfd0 - 0x104]; - u32 pid[8]; /* Peripheral ID */ - u32 cid[4]; /* Component ID */ - struct { - u32 snoop_ctrl; /* Snoop Control */ - u32 sha_ord; /* Shareable Override */ - u8 res_1008[0x1100 - 0x1008]; - u32 rc_qos_ord; /* read channel QoS Value Override */ - u32 wc_qos_ord; /* read channel QoS Value Override */ - u8 res_1108[0x110c - 0x1108]; - u32 qos_ctrl; /* QoS Control */ - u32 max_ot; /* Max OT */ - u8 res_1114[0x1130 - 0x1114]; - u32 target_lat; /* Target Latency */ - u32 latency_regu; /* Latency Regulation */ - u32 qos_range; /* QoS Range */ - u8 res_113c[0x2000 - 0x113c]; - } slave[5]; /* Slave Interface */ - u8 res_6000[0x9004 - 0x6000]; - u32 cycle_counter; /* Cycle counter */ - u32 count_ctrl; /* Count Control */ - u32 overflow_status; /* Overflow Flag Status */ - u8 res_9010[0xa000 - 0x9010]; - struct { - u32 event_select; /* Event Select */ - u32 event_count; /* Event Count */ - u32 counter_ctrl; /* Counter Control */ - u32 overflow_status; /* Overflow Flag Status */ - u8 res_a010[0xb000 - 0xa010]; - } pcounter[4]; /* Performance Counter */ - u8 res_e004[0x10000 - 0xe004]; -}; + /* AHCI (sata) register map */ struct ccsr_ahci { diff --git a/board/freescale/ls1021aqds/ls1021aqds.c b/board/freescale/ls1021aqds/ls1021aqds.c index d81d8ab..8b3f4ad 100644 --- a/board/freescale/ls1021aqds/ls1021aqds.c +++ b/board/freescale/ls1021aqds/ls1021aqds.c @@ -204,7 +204,8 @@ int board_early_init_f(void) #ifdef CONFIG_SPL_BUILD void board_init_f(ulong dummy) { - struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; + struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR + + CONFIG_SYS_CCI400_OFFSET); unsigned int major; #ifdef CONFIG_NAND_BOOT @@ -425,7 +426,8 @@ int misc_init_r(void) int board_init(void) { - struct ccsr_cci400 *cci = (struct ccsr_cci400 *)CONFIG_SYS_CCI400_ADDR; + struct ccsr_cci400 *cci = (struct ccsr_cci400 *)(CONFIG_SYS_IMMR + + CONFIG_SYS_CCI400_OFFSET); unsigned int major; #ifdef CONFIG_SYS_FSL_ERRATUM_A010315 @@ -460,7 +462,8 @@ int board_init(void) #if defined(CONFIG_DEEP_SLEEP) void board_sleep_prepare(void) { - struct ccsr_cci400 __iomem *cci = (void *)CONFIG_SYS_CCI400_ADDR; + struct ccsr_cci400 __iomem *cci = (void *)(CONFIG_SYS_IMMR + + CONFIG_SYS_CCI400_OFFSET); unsigned int major; major = get_soc_major_rev();