From patchwork Wed Jan 13 16:20:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Gerasimovski X-Patchwork-Id: 1425851 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.a=rsa-sha256 header.s=selector1 header.b=PxsC1nlJ; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DGCNd1GPVz9sB4 for ; Thu, 14 Jan 2021 03:20:49 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 8B59E82688; Wed, 13 Jan 2021 17:20:43 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.b="PxsC1nlJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 054D78268C; Wed, 13 Jan 2021 17:20:42 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on071d.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe02::71d]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 040948267E for ; Wed, 13 Jan 2021 17:20:37 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aleksandar.gerasimovski@hitachi-powergrids.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eeEHNENWgVlFd73nHY+s1x6fiiu9XZ7jq1xm/yyVYS3LEfyHjtAwMDZBBbb06KoraKyJmLvvt9S1A6wNf9JT72oCiqcykLBZXPLkcf5O6gCxT22zUAwWgjPFzoCxqrOooR2wmxlipu+ZKms0yAj5Xn4UTDLdIfQ5HfM7Vvu2uQ5CHfgU0ZUt/jYcZiK7SAFB18YfHDMqJ7UK5Hx8pGsctQNA+iZf15D9DSScL3yFYlhx1TgMcAreUIaXpr1FDCaoRa3ti4x13xe9topigwJb5iJQqxTHg/nCKUnRqfNShxnw+ZMwH4krxHzXs+E4b+2N1ogDMeNJFUCJz5uS8LE0vQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gBMLYeW89QX5s0kaBtRDSRVuKrMt8nmafczyv41Ag+8=; b=VZf62dCpD2ioas39e+6/66ZJdfP0vZ9mNISeYoq9X0V1ZvOC1Ysfb9CSjtcXM7KEjM6v6M8gFz8mnR+wsTJ+LZ2dCjXI/FPkyTwyceTsGsBRDsPx4PoNIETzBCfHD34yYPgRIlXafoMaepB8h07w1LrSvrVp+jmMC81MkcDrWYe0yQjIaru6eZvAmh4K06odN79hfEC8svZVH2xcTJI5PitnDrzNTCte8F8yquGtZjQ5TIVb6+TddhfkoGQWMxIy9UL2HvhxurmNF+eRjFu9DyYe0zEo6t9hd5p+nWAeMd7g84/AXYvdiws58bbJMTrC+GFnhYjqhaoYmw6oqavDtg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hitachi-powergrids.com; dmarc=pass action=none header.from=hitachi-powergrids.com; dkim=pass header.d=hitachi-powergrids.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachi-powergrids.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gBMLYeW89QX5s0kaBtRDSRVuKrMt8nmafczyv41Ag+8=; b=PxsC1nlJhaPLSCpS6w/io6DhdNTAKQbY/OGbEtFnpT89t/RWpO+Wdb8cl+baZY2ucjChOfd6cQtcXQKmuxydH2RZHOBt1+8nN7xqavVHciieKK+6j7sKTnquVRL181OPU1LawC1/i8lqbBSo7HnGdsS1+OTXtiGIztV2GnrPK9A= Received: from VI1PR06MB4029.eurprd06.prod.outlook.com (2603:10a6:802:5d::10) by VI1PR06MB6077.eurprd06.prod.outlook.com (2603:10a6:803:90::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Wed, 13 Jan 2021 16:20:36 +0000 Received: from VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b]) by VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b%6]) with mapi id 15.20.3742.012; Wed, 13 Jan 2021 16:20:35 +0000 From: Aleksandar Gerasimovski To: "u-boot@lists.denx.de" CC: Valentin Longchamp , Holger Brunck , Rainer Boschung , Matteo Ghidoni Subject: [PATCH 1/4] board: keymile: common: fix qrio compilation for arm Thread-Topic: [PATCH 1/4] board: keymile: common: fix qrio compilation for arm Thread-Index: AdbpxwsPNQl76SvUQwGfGdrr5e4FHg== Date: Wed, 13 Jan 2021 16:20:35 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-processedbytemplafy: true authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=hitachi-powergrids.com; x-originating-ip: [80.75.192.109] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0a0e9e24-8863-4d73-f5d3-08d8b7df2891 x-ms-traffictypediagnostic: VI1PR06MB6077: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-abb-o365-outbound: ABBOUTBOUND1 x-ms-oob-tlc-oobclassifiers: OLM:422; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9R/hOokwr5Q0nRc0VVeRgrkoHZ0Uvt273OWTB8+jFAZFbc4DU3U3EccrFfhDIXDsxPU5WQffVIkwZL2prIw9UdIkPvk0/YyA2zo5Ucc9KZT8AftqiwTwKTe4wdpDksOO7pgVttde1Sj8CnvWhbPZYFm5Su1ZICWSfEyP9TI8EgE/1jTRMmj2peXe3Ey+ZMDZ9u/x2dL8aNLV8E5XEFRnkkzBYFZOE96nO0xSmf2epQTy0hAVYkIv5d3wE0gSEiFmgTSMnkzfhVSqHa5lo/ZtRmAYktz3iAtOOH0W+LxSQxSx6tacQqVevflSYN5ciSfVTgeEurmQAo2H9Qs6UyuosQM04dXmzwoyVuz2swxOQzpzKVgEBM1qKdGzhpashTKV4ExXyA9TpG6Q2zefjs4CMw== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4029.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(39860400002)(136003)(396003)(346002)(366004)(376002)(83380400001)(6916009)(71200400001)(186003)(9686003)(2906002)(107886003)(5660300002)(66946007)(76116006)(55016002)(54906003)(86362001)(316002)(44832011)(52536014)(26005)(66556008)(7696005)(8676002)(33656002)(66476007)(64756008)(4326008)(8936002)(6506007)(478600001)(66446008); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?Uuqp/EV2dRMSklSq/eNKfL70r?= =?iso-8859-1?q?ZSwjN6B56Yk9AvYp8ncuT5azFB3tCSYAn4ANoRPiQKUWCAVy8Qsm0QVynuv4?= =?iso-8859-1?q?a/bSZgePAIMtTqLkTvoZyY8QQT3/3CKDRUuKJA4DAObVuJHk3MvD0lbS0r+1?= =?iso-8859-1?q?bjd67QY/BakeAG6qIijDgSO1UJhRq/TkqOVFtqwGP5m6cRFfPj3zz+NZ3Aqs?= =?iso-8859-1?q?gsZqIIjHNJHqJ3Hf2ozvz3oO/aJxTW8HWd0WIXDygM8L2Wg5qcO3UCoqoU/x?= =?iso-8859-1?q?LVbJWvrEumWdibgYhksY+Cy4xOUcWQ46QxcJr2tVb4+CLHROfsF2ZpCP3m/z?= =?iso-8859-1?q?ofIMT3SkDHs507/fpEJhArK62jNd3it+1ZiylMDtbS9r8ZtxaixYDV1M4oaV?= =?iso-8859-1?q?eToPCtbSaKRoid/WdQJX9jDLd2mS5mnmOhxhGHITJ5wAekF4wMJWJmCbgmDU?= =?iso-8859-1?q?wmq0sUpu+L7gY8056zRC0zldcxam5Bq4PPE56T8v+q2S5Qwepj43e176olk3?= =?iso-8859-1?q?UOy1az8lpX//390BCTBNASDNdUsexQJThafPwtAIrclHvxPLUK4VIrIFow3P?= =?iso-8859-1?q?Kb6Z3QtyKx6n6STDp2J55jU2xn9Kr8ZjEODMEZ+hObGYGcCDwGtPftl5fAlu?= =?iso-8859-1?q?W0A1EM57eK+5imCMw6h1xZ4dvIFUhKPDbztVnh4JpacelVQKq0NYzkUiNOlI?= =?iso-8859-1?q?zU3akliumf7eiGbFdvkcNZdsdZnk6dt47rR0W//pQ3sl9tzzpa3RiLUv09xl?= =?iso-8859-1?q?N15z3nzhDZQWowclHhOCUmxm2hBe++IlcobtFPwnhR8SBTFV5AhNatKdFFBy?= =?iso-8859-1?q?4aRRmS9eF27cF6EUIh/TXxCRrVdx7BR8ylJwNxPSExY2E3To/Iv/CLU3dREQ?= =?iso-8859-1?q?8FypcytSrLzSclMcWoaKn1W5IkyrKhBN20IoKwU20s7KfIipoMZQs1PEcanp?= =?iso-8859-1?q?J1PuXjXQ6pUK3JjI9GVWoOGqHiW9vYt/N98LASnb14Hysu5/RR9Z1uoPDPR0?= =?iso-8859-1?q?uSpvzGN6m6IlB98zqM=3D?= MIME-Version: 1.0 X-OriginatorOrg: hitachi-powergrids.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4029.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0a0e9e24-8863-4d73-f5d3-08d8b7df2891 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2021 16:20:35.7910 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7831e6d9-dc6c-4cd1-9ec6-1dc2b4133195 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 6IEVdG1lG4PQfTueDTj1jvma5WKHRGG8wAy/eH5AfPsBT/QUmjeNHF9+9GiroNFJ3A58S2koVX6HCoXJvPdrOKeU+6DNi/dmKkVWAZHnOgRsnkGO8UlaBZx/VMCX/Hyl9OzVxEfGqZ/eQaxp/TUZTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB6077 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean This patch is fixing qrio driver compilation for ARM architecture: - It includes asm/io.h for in_/out_ access - It use correct names for set/clear_bits as defined in linux/bitops.h Signed-off-by: Aleksandar Gerasimovski --- board/keymile/common/qrio.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c index 06a4e67..d4e75f2 100644 --- a/board/keymile/common/qrio.c +++ b/board/keymile/common/qrio.c @@ -5,6 +5,7 @@ */ #include +#include #include #include "common.h" @@ -129,7 +130,7 @@ void qrio_prst(u8 bit, bool en, bool wden) void qrio_prstcfg(u8 bit, u8 mode) { - u32 prstcfg; + unsigned long prstcfg; u8 i; void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE; @@ -137,9 +138,9 @@ void qrio_prstcfg(u8 bit, u8 mode) for (i = 0; i < 2; i++) { if (mode & (1 << i)) - set_bit(2 * bit + i, &prstcfg); + __set_bit(2 * bit + i, &prstcfg); else - clear_bit(2 * bit + i, &prstcfg); + __clear_bit(2 * bit + i, &prstcfg); } out_be32(qrio_base + PRSTCFG_OFF, prstcfg); From patchwork Wed Jan 13 16:20:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Gerasimovski X-Patchwork-Id: 1425852 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.a=rsa-sha256 header.s=selector1 header.b=Uw8gFl9U; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DGCNv2t7zz9sB4 for ; Thu, 14 Jan 2021 03:21:03 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 52A728269F; Wed, 13 Jan 2021 17:21:00 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.b="Uw8gFl9U"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5AF848269E; Wed, 13 Jan 2021 17:20:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on072e.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::72e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 4A656826AA for ; Wed, 13 Jan 2021 17:20:52 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aleksandar.gerasimovski@hitachi-powergrids.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SCctsiUPrwotBGQqHQ4GKvMDvwqHwb4wKfZioI9kwH6TKxXMi0E9lQq+kbVyf7vwnX5wALqXTcDcIq3nxqcL3BY24hXjQPsVgsgwaf7S3lB0aU1P3YgaSnrkplQ26TLGO6Kw9e/Xl10r/3sBaHEd8pKd451Xxo6WD7pYSWuFmJkqVcAPXbBZKFluK3JKUFeffYXGB75e9rgw7eRV3mYbr6eLqXYNY+2F70o/3W93BRD564Xgo13POMf2aY244M/oBOKbdyChLuML5Dr5sk0dLWeCw6j+ITLpxmeeP401Elcr1yYNKJjcMKoLNEVGegwYq4/EoBfvItHqHS7p5H/E0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EITOBFFtHuZ71WOiXPkTnRkNu4M94tm6HMLFt2Dpby8=; b=k1YePSm5jUI4wWmt/I8yRm/aJvkqn/RG6XO3MbY87kgz85xkGoEWLPbm1n87+dEZV/x60cgzLkxzzdXxk1iKNLnsrJ6xbCYv766+LuwK74jYwBq1OXZH9oQg6box4PkpyGHjhl1frGCgzN/zlelFcDyn98tF/jMt1x82X18JNfc0EYJfCDgha/MmkyKFwU8HisYHF8xXj1cMdEl4GFEHkLX1iikStNSxT93euaSW5St2ZwoNPlwgSTj0SfxxnPOLEv/lvaD8Y1JEPbPV6R1Xf/JnYcz6OHXo9Z4eMAOuYSNbKH89FPLRnCRg05f+9cf4rSCfKJPF+j+gN+hC9Dbcaw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hitachi-powergrids.com; dmarc=pass action=none header.from=hitachi-powergrids.com; dkim=pass header.d=hitachi-powergrids.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachi-powergrids.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=EITOBFFtHuZ71WOiXPkTnRkNu4M94tm6HMLFt2Dpby8=; b=Uw8gFl9UBaod2Bq9qEI7nC/pqqh3GQk7/4IZL6MCUunz7COmxVW8FCPc2yKB0igTKaJXck/PFLEJqolcjOgIozIuqZEnKLK1uZM6p8jfXb4ntHaATeBb1wG+cLYdoslcftYvy51UdCLaYmptg7h7GfteGBWiN49EEJoEvPW3fY8= Received: from VI1PR06MB4029.eurprd06.prod.outlook.com (2603:10a6:802:5d::10) by VI1PR06MB6077.eurprd06.prod.outlook.com (2603:10a6:803:90::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Wed, 13 Jan 2021 16:20:51 +0000 Received: from VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b]) by VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b%6]) with mapi id 15.20.3742.012; Wed, 13 Jan 2021 16:20:51 +0000 From: Aleksandar Gerasimovski To: "u-boot@lists.denx.de" CC: Valentin Longchamp , Holger Brunck , Rainer Boschung , Matteo Ghidoni Subject: [PATCH 2/4] keymile: common: qrio: print QRIO id and revision number Thread-Topic: [PATCH 2/4] keymile: common: qrio: print QRIO id and revision number Thread-Index: Adbpx0U1UyrQsdC5So+CFZZLvYJ6Fg== Date: Wed, 13 Jan 2021 16:20:51 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-processedbytemplafy: true authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=hitachi-powergrids.com; x-originating-ip: [80.75.192.109] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 22d05468-402f-4053-9f96-08d8b7df31ae x-ms-traffictypediagnostic: VI1PR06MB6077: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-abb-o365-outbound: ABBOUTBOUND1 x-ms-oob-tlc-oobclassifiers: OLM:324; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: jZlTDHJlmPt+wXHILavx2G93ZC5rUT/yx6aDZEPZ3ZhG20dZhVMT85htVQXVm4L2Hbq6oTwzQd4AWHNcEmVHjoZCegvYsrskBPt3+skJtPjePUISHoY/Q1x75KUFL+dc3fYE6K7LiLcCCL8vTLQteWJ40FYV9TuiEuJqg+pe+BFrPYrPxhGEgecGD9xbKXAHWEC1/ckXgsFYrVkAoxOUf+pSis+Q4UnGdHDIUE3vvk5PIZG49LTV1+3hUtc2CvS/PgJcpaB/3TldhQL9xSFT8+8an8+kkFuEX2Y3aQ1itF75rXWnuuljbT3Q0oMwd9FbpTk0en4zVPOt4nCrXt8d43uI6xmj+eaCfsuZeJhhTUTCNJ9rdxwh04pkd9f0VDTeD1g7xhJ+9zpPKU6Q2CVDTg== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4029.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(366004)(396003)(136003)(39860400002)(4326008)(64756008)(26005)(66556008)(52536014)(316002)(44832011)(8676002)(33656002)(66476007)(7696005)(66446008)(478600001)(8936002)(6506007)(76116006)(6916009)(71200400001)(9686003)(186003)(54906003)(86362001)(2906002)(66946007)(55016002)(5660300002)(107886003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?AiCckCo5KlFFVrQEyYqSkq4zn?= =?iso-8859-1?q?Yl49Q6gXYdPhKbKVoPen0pTBQRwRKP8dlzH0zEqj412w3BkBOhIYeuhfLPgx?= =?iso-8859-1?q?BS2XuEjKRRfCRulPD7MZRoKGNEuA0aVeJniFyiu39gGCrb6h+S/eTPtODF46?= =?iso-8859-1?q?opIAaLbitUopnXb7bwK02wp0GMGsM9LSTpu6ZXCDds2eoGWeO20anv7DD1H+?= =?iso-8859-1?q?0HX3EZQBUkEdT9pJM5sprUxOE8Awa4yhJdkm+3z6cXffnkA7+xMSwUfxHPP6?= =?iso-8859-1?q?pWsvdS6SwKxeQPgaveN+HGpGT1mbGy0UOahZupuyslky1sBInVjeq4sPGOah?= =?iso-8859-1?q?LB5Wt8ldqvuzPY/KqgVJEdBhpPLlZiqMWauzTr3/ruLdY4xfRbmGIborM3y2?= =?iso-8859-1?q?LSQP7TAKLMmvmT+Eqt0YvQD0ZuG8QNsddPDbKNFfSVDMgKIUeNheRWJh10Ic?= =?iso-8859-1?q?9bAwd+C7gPP/KlrMohdcvh6aHKRlnCoX8WXhKlwgKIVUIaSoCh6nYJLWnaE7?= =?iso-8859-1?q?c0yEns+zX2DhSP6Sfz1u7mWW5gQWTxrOtJfpPPSfNzlOCI5M0OFUYxTiSZSS?= =?iso-8859-1?q?wYb8GBfPvxCUQ9p2J7frIpzHy0G/aJXYnP66MLOdpMyDlM2AMKhT38m2fgl2?= =?iso-8859-1?q?x4UdYVoLiZFJbZ4nvIto/yPIfSNKyIqNKbjONNS7o/VQf1Y+g8UKc6HNdrkm?= =?iso-8859-1?q?5TiZWn1H/YE2qODbqRWHSbixz3EBDEIgTc8IQivpH0ESEanyYVMRc9AgYRRd?= =?iso-8859-1?q?/wDU4fZZeq+Kww3Vnr/pbqu2TrEYO9qQ/9QtDuDKE7YK98HFW1JQNMLKU5E3?= =?iso-8859-1?q?0RD/c0dWrctsLT8cq+9SXognmIgfHUlIuC4DDo/raFnSf1oA1YMbkdif2y6H?= =?iso-8859-1?q?0YSqWRiPYaY7kPOCvyqTf91R4IrWox82UN/2jLuZn1Je64mQLqHam6Af4Xj/?= =?iso-8859-1?q?F+D/OwQiVisIRaJC/1uZVYdB2SIDKNh4tDpx6oQbrnOsiXRVkzdsjtXY9swt?= =?iso-8859-1?q?MbXykNOqlxQ/+QaYAM=3D?= MIME-Version: 1.0 X-OriginatorOrg: hitachi-powergrids.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4029.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 22d05468-402f-4053-9f96-08d8b7df31ae X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2021 16:20:51.0333 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7831e6d9-dc6c-4cd1-9ec6-1dc2b4133195 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: V0+IJaSDoHHDdUYlGLhPuTpT//nbYBTYYDANnJBK9Sfs6/rT44BtXt9tCpqPllv9g5SUSaBGrgpCAHj+pC1yNVM/23ChW9+4kwVvm7CSRnxpfdNHcEebgEsdgL2bdk4HDNYdOtlPOwkg8GwTpcV3+w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB6077 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Add show_qrio function to print chip id and revision information. There are already multiple QRIO chip versions available and the upcoming designs may want to show used version. Signed-off-by: Rainer Boschung Signed-off-by: Aleksandar Gerasimovski --- board/keymile/common/qrio.c | 12 ++++++++++++ board/keymile/common/qrio.h | 1 + 2 files changed, 13 insertions(+) diff --git a/board/keymile/common/qrio.c b/board/keymile/common/qrio.c index d4e75f2..25937ee 100644 --- a/board/keymile/common/qrio.c +++ b/board/keymile/common/qrio.c @@ -11,10 +11,22 @@ #include "common.h" #include "qrio.h" +/* QRIO ID register offset */ +#define ID_REV_OFF 0x00 + /* QRIO GPIO register offsets */ #define DIRECT_OFF 0x18 #define GPRT_OFF 0x1c +void show_qrio(void) +{ + void __iomem *qrio_base = (void *)CONFIG_SYS_QRIO_BASE; + u16 id_rev = in_be16(qrio_base + ID_REV_OFF); + + printf("QRIO: id = %u, revision = %u\n", + (id_rev >> 8) & 0xff, id_rev & 0xff); +} + int qrio_get_gpio(u8 port_off, u8 gpio_nr) { u32 gprt; diff --git a/board/keymile/common/qrio.h b/board/keymile/common/qrio.h index a04a732..757bcbf 100644 --- a/board/keymile/common/qrio.h +++ b/board/keymile/common/qrio.h @@ -11,6 +11,7 @@ #define QRIO_GPIO_A 0x40 #define QRIO_GPIO_B 0x60 +void show_qrio(void); int qrio_get_gpio(u8 port_off, u8 gpio_nr); void qrio_set_opendrain_gpio(u8 port_off, u8 gpio_nr, u8 val); void qrio_set_gpio(u8 port_off, u8 gpio_nr, bool value); From patchwork Wed Jan 13 16:21:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Aleksandar Gerasimovski X-Patchwork-Id: 1425853 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.a=rsa-sha256 header.s=selector1 header.b=ArpeJsSb; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DGCP62pz1z9sB4 for ; Thu, 14 Jan 2021 03:21:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 09C3C826BA; Wed, 13 Jan 2021 17:21:11 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.b="ArpeJsSb"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 582D7826AD; Wed, 13 Jan 2021 17:21:07 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on070f.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::70f]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 33715826AE for ; Wed, 13 Jan 2021 17:21:01 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aleksandar.gerasimovski@hitachi-powergrids.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y3dq947JwqwueEAS/83MVs3rF35hXECG0X/b+ST7v1024flH3LvVIwEPyZ+a1XSkCg2o3udKdEVucex5PqncatZgKzHJQ5auVhPezFHem/aPa2xX2e4kYqQ4x9VTFHlbB8/FgWwY8zs0M0/+lkLlivR7oKprBPyvj/b4R+qlwwAQOAGBUxd7UW9CQplMZ25oxiuJu1mFe58+VHzTwkCK62uUAMooLPdv5ZNjvWQo+ESDvpmkSK8oGd56UK+/26m8GDyZxxOR2mQmqqIIMSamfDccXZ3gB+THINOutUKbqNB+IL3ErvXUvEq2o8cFxV/cFs4MRErh/wbKleV95LIkOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3cD7dz+3EU1Ql/SRHt1r4DBV1hgRqo0ME+yxt4puXSQ=; b=SET/Fr129bZEBFws71iJf6NkEXL1Ihu2A03JpXBtdEqZ++0OaFGCh46ZoFpx0jjB6kp7SwiG7H7GbnDYWbrvvZ/Nk/BnHWRXvqtOT92MztQnwnzqmUNAiKf1DPaAnGKz57i92X2uO10qWGHfhCDP3V0s1CZs5Ly39CdOfP6hwzYFT1wDS+HFZiXYL1DYzLzpAQV6zlfliWd1mfT38pFDuBOZbZw0issUTPYR3hDHkut73pEcCNRYJSgEVvVzTS/705VC4cKYkjlOPuQ2BlYv4BahSi846UEZFS+egkTggnUTzY7wOigdxvZ4kyv2R2J/QH3in9hMWVDInfqsCW0iTA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hitachi-powergrids.com; dmarc=pass action=none header.from=hitachi-powergrids.com; dkim=pass header.d=hitachi-powergrids.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachi-powergrids.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=3cD7dz+3EU1Ql/SRHt1r4DBV1hgRqo0ME+yxt4puXSQ=; b=ArpeJsSbBrbUJQdNjDrwAEDHumk1zD4b7emhLIHjTMuIUfYmSikrmtYrvrk/bZxAsag2LePUq5r3I5Jn7u+dLV2Xqy3pnkJh5D0pk3RhuCcFbcydtJlK+QwEoB8YUzFHrtMqKwE4YK+EshYGhnvAojRa5gJYxjqKmd2tpAQHBAY= Received: from VI1PR06MB4029.eurprd06.prod.outlook.com (2603:10a6:802:5d::10) by VI1PR06MB6077.eurprd06.prod.outlook.com (2603:10a6:803:90::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Wed, 13 Jan 2021 16:21:01 +0000 Received: from VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b]) by VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b%6]) with mapi id 15.20.3742.012; Wed, 13 Jan 2021 16:21:01 +0000 From: Aleksandar Gerasimovski To: "u-boot@lists.denx.de" CC: Valentin Longchamp , Holger Brunck , Rainer Boschung , Matteo Ghidoni Subject: [PATCH 3/4] board: keymile: common: fix pnvramaddr and varaddr address calculation Thread-Topic: [PATCH 3/4] board: keymile: common: fix pnvramaddr and varaddr address calculation Thread-Index: Adbpx5BBHCGLuP82TfOq4KLj/T9aIA== Date: Wed, 13 Jan 2021 16:21:00 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-processedbytemplafy: true authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=hitachi-powergrids.com; x-originating-ip: [80.75.192.109] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 4f7fa756-21d3-467c-0923-08d8b7df3788 x-ms-traffictypediagnostic: VI1PR06MB6077: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-abb-o365-outbound: ABBOUTBOUND1 x-ms-oob-tlc-oobclassifiers: OLM:5236; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: k61PEzk3FIvrL8vdeqlhu8sWe0Cd/J79cIl91gRI8OeFpifMtBQtXzyztabwJXnmqCMWxRSD++wKBGQwRp554SeCVMuHuKlafzlps3eVnx7AWVDDzYCFvBpuVD8dGJIpbfCCcFn3nSEVuwx1/UvHXDZrU5bWcJzkxbUnY7+9i+JmrG6e5Hm/Ha7yIW0+i+EQAe2nT95Ddn8rsBnyBfAFOewvE0x+66pFzAkEHtbh8FHUbzpVOrIpQ00IzZnXz398D0GVXXRdPE8pORukviko3ceG7VukPKs3RN1cGFyKlPa+Wtcsx1zW2/E7yLQHThBpeuWXXABLx+FkHTfqhr1CFn8+eSJFSOx/BiR5LldaLYn7y6ESF2eOtuUt8XeYu7WyUOPzqLbPdysXg05QYcqadQ== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4029.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(366004)(396003)(136003)(39860400002)(4326008)(64756008)(26005)(66556008)(52536014)(316002)(44832011)(8676002)(33656002)(66476007)(7696005)(66446008)(478600001)(8936002)(6506007)(76116006)(6916009)(71200400001)(9686003)(186003)(83380400001)(54906003)(86362001)(2906002)(66946007)(55016002)(5660300002)(107886003); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: =?iso-8859-1?q?5vTfKkk7qI/OZhOlG2eHxzVPU?= =?iso-8859-1?q?Lc+QI9irQq4hk9FiauY9aXUocR50EHvFpJETXnItxPRx/5jPdHll5agf9+XJ?= =?iso-8859-1?q?pjteFolSIta0w9BB659DAr+yf3DwXPPHo0IquvlIiuL834CnwEvmoRPRae3z?= =?iso-8859-1?q?Vocp+v7/jpiNBLFW05vxwCHo0ULaomTyVRV+WPifvdngvDJwlFgJMurV/7tW?= =?iso-8859-1?q?8iedSMDVEfMgs9jAM0i63Q5vtnY4S/6ap8s8rxV/HFPDe9X5Nf+2aE2DQ9CK?= =?iso-8859-1?q?jYqxGrE9N4EuGlXA+0Y+DsmTiZgLrinnU3kl6LCIo9RItgLd9tMOCK3lZ4CC?= =?iso-8859-1?q?Jm04tQxnGYSZPVDrlYF6/SIDePF6Z2PY5MAi1kO3pdO4jKKBCU9YTK1nwZR+?= =?iso-8859-1?q?h0WncJz9igemopkVoG7vRzw/nblT3Wuou4TIRSb2b56bWN/gwj9dFb27fvNg?= =?iso-8859-1?q?I6f1CJEwO8JuKozMg7Hx48yDaDZ+ZvCSgktC1aJYblKq0/kqx5OBYwhheMGN?= =?iso-8859-1?q?7/eQMrvdpVvcBipoBL+kdfsVIwKcg0IZ06c1Ak038+zL7fIfAtiwixOs93pz?= =?iso-8859-1?q?yd3zLAwuiHPih6GtM3m/Ihu1ze9+sHmLdD0KrQ7Ih/3eQYMrEZbZuPyd3C7A?= =?iso-8859-1?q?xWhsggrJUWEP2I9L2Um5ONlvD/kRCpF+XwO8oPyA8n4eMMbyttzzLn1m4tFB?= =?iso-8859-1?q?n+K6vOakAYL92/uneLmalAUmTWN4HzLSqlGV70SWRhB81VPYH9TKov7hHIJf?= =?iso-8859-1?q?EgOKx9GRWTiLC1VvN7AFgus02ujzo8Hit1zExPg7m7fRrCS0oHaDbkFYZ2FF?= =?iso-8859-1?q?SmWYgXvIUySo/F2AXvg8a1RAEDRH03Al5RZohwkOTE5VPLQQcWfvNrlGL3RP?= =?iso-8859-1?q?9vWR1dOdminQXpRnKCSI0iSNACUBPF7qv71mu7a8ARGo0l0JIb9GFVVWbjQF?= =?iso-8859-1?q?kirQc+EhUMlMcCDkaSHwy7xcEXS3wbLE6g3V5C72v7XqDxLxxn3SVlESj4FT?= =?iso-8859-1?q?9rv1YSjY4R8Ro0c7zc=3D?= MIME-Version: 1.0 X-OriginatorOrg: hitachi-powergrids.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4029.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 4f7fa756-21d3-467c-0923-08d8b7df3788 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2021 16:21:00.8238 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7831e6d9-dc6c-4cd1-9ec6-1dc2b4133195 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: vDhuBxbzYVSYhqAgvlkMC7oogHMFM25ELvuBW+lp4d6UkOLJNaL3XF80TaL3Qxqe9G6Kk2CAb8ZX4KfpEnk0SBIy64yl8lNygPIJaJoGn9GZ6x1bJ6myZ3RYTPa8h0pFuYiXsN40mnfm4vCJrTSr7g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB6077 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean Take into account SDRAM_BASE address when calculating pnvramaddr and varaddr offsets. Up to now Keymile designs had SDRAM_BASE equal to zero and the offsets where calculated correctly, this fix is for the upcoming designs that have SDRAM_BASE different then zero. Signed-off-by: Aleksandar Gerasimovski --- board/keymile/common/common.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c index df507e2..e3e9c4a 100644 --- a/board/keymile/common/common.c +++ b/board/keymile/common/common.c @@ -49,8 +49,8 @@ int set_km_env(void) char *p; unsigned long rootfssize = 0; - pnvramaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - - CONFIG_KM_PNVRAM; + pnvramaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size - + CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM - CONFIG_KM_PNVRAM; sprintf((char *)buf, "0x%x", pnvramaddr); env_set("pnvramaddr", (char *)buf); @@ -63,7 +63,8 @@ int set_km_env(void) sprintf((char *)buf, "0x%x", pram); env_set("pram", (char *)buf); - varaddr = gd->ram_size - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM; + varaddr = CONFIG_SYS_SDRAM_BASE + gd->ram_size - + CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM; sprintf((char *)buf, "0x%x", varaddr); env_set("varaddr", (char *)buf); From patchwork Wed Jan 13 16:21:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aleksandar Gerasimovski X-Patchwork-Id: 1425854 X-Patchwork-Delegate: priyanka.jain@nxp.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.a=rsa-sha256 header.s=selector1 header.b=aAXAhtOh; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DGCPW1lP7z9sB4 for ; Thu, 14 Jan 2021 03:21:35 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id F2333826AB; Wed, 13 Jan 2021 17:21:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (1024-bit key; unprotected) header.d=hitachi-powergrids.com header.i=@hitachi-powergrids.com header.b="aAXAhtOh"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 7D029826AB; Wed, 13 Jan 2021 17:21:29 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FORGED_SPF_HELO,SPF_HELO_PASS autolearn=no autolearn_force=no version=3.4.2 Received: from EUR02-HE1-obe.outbound.protection.outlook.com (mail-he1eur02on0701.outbound.protection.outlook.com [IPv6:2a01:111:f400:fe05::701]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 029E7826AE for ; Wed, 13 Jan 2021 17:21:20 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=hitachi-powergrids.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=aleksandar.gerasimovski@hitachi-powergrids.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dnlvBmaYqozQLUapdJ8YghG05ncmTXM9F4yCy13JM4Cr+v/hQqjEbbuvoIxasB/XdbX7Z9CWW6yvJBn3B3zvujiZqqokYVoyy9rdf5uj9/MxHUufnj7yPeI3kdIhv3sGMJdhK/TpkdHEw55g5MxNXYVT8dEuGTVmmAEQdpaPPlT2yrfFapCuhWoSdxA067iYshkb2/0em96VmDJPhelAJFxNf1jyDBVtvCmURI40p0dFcdXwdlUhUQJpgc9A5Bi8zTW56UBGGK5eZUKl7Elyoi6VEn8gewiBg6SQSOCQNNP9CZMhWMqJsv3ZYTnP1LQEpgiaXrNQMpdBAc4Yb8AsAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=74z753Z1Pqot4Ru20tEAJCwU81IQ3NT5U489xAdgWvU=; b=PFQ084FVwgBvydHr2QthGw9VX7Gx9Z5Q60v7IrAnQdSezcvcHYVXvW9QPBel0wElQS5xsUOrfdRn3420gNr0mitin+WORlYvVsc4k8uAEldsJrwtnoTcy7303Qlx0RNTW58yuh+mzzcOF2loHMy6pqbskbhYBCQ7iRRuDv+wYW8LufBcERXVpsXrcQ/+4pop/9+HcI6U85E3ugcz1CUHh6jx8H7VlqSSk1E1Z5VvMr+J4QcnF+SXvNBaayAUa4ELc7UlqKslWOXsV37jyaDt9nLyEdrcFg00JwjF57iGEegkzfjUZzZS41z9gv0nWLUo6NOCzEnmoeugCNZMfFNdmQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hitachi-powergrids.com; dmarc=pass action=none header.from=hitachi-powergrids.com; dkim=pass header.d=hitachi-powergrids.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hitachi-powergrids.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=74z753Z1Pqot4Ru20tEAJCwU81IQ3NT5U489xAdgWvU=; b=aAXAhtOheNQvVB4LowBPmjlry0qPx3UVMQz95et1AMgPcbw1dMCDSBDKKznwt5muOU9HWO9ZaOJfsj7T8eEpYmnZzV2QJv0wa7YjaZQgVKwwjyj/LUhn0aDrNiSL2n1LHfioK0gAJRwx1beoL+Gh1ZBVRK1rxY/k74H5CUxOyM8= Received: from VI1PR06MB4029.eurprd06.prod.outlook.com (2603:10a6:802:5d::10) by VI1PR06MB6077.eurprd06.prod.outlook.com (2603:10a6:803:90::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3742.6; Wed, 13 Jan 2021 16:21:19 +0000 Received: from VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b]) by VI1PR06MB4029.eurprd06.prod.outlook.com ([fe80::30d8:9143:9984:a72b%6]) with mapi id 15.20.3742.012; Wed, 13 Jan 2021 16:21:19 +0000 From: Aleksandar Gerasimovski To: "u-boot@lists.denx.de" CC: Valentin Longchamp , Holger Brunck , Rainer Boschung , Matteo Ghidoni Subject: [PATCH 4/4] board: keymile: add support for seli8 design based on nxp ls102x soc Thread-Topic: [PATCH 4/4] board: keymile: add support for seli8 design based on nxp ls102x soc Thread-Index: Adbpx9qjXXNWprd9Q8qZV+/YIBSj5w== Date: Wed, 13 Jan 2021 16:21:19 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-processedbytemplafy: true authentication-results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=hitachi-powergrids.com; x-originating-ip: [80.75.192.109] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 08b7aeb6-c519-4d45-b4ce-08d8b7df4283 x-ms-traffictypediagnostic: VI1PR06MB6077: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-abb-o365-outbound: ABBOUTBOUND1 x-ms-oob-tlc-oobclassifiers: OLM:10000; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: ISzzKWtxYmE2QHMNinZY1KGOwyu4zlPnM0IB78G2s6+MM4PHzfH2BvpZHogAkuYssreOiLWsmkkPHhPlOrFz0RtlQ/2F7jPorCANx/pefWX/PWnjK7SJWWiyo84iq+Aoy4vWmxWzC3LqoOLdUUQdUucQcOwd/Z1YCCukrQFMWOwLOiGxPZTtOxaV5QO3tzMoUbYUpc+7EsHW6rTJpvT9H2K/tfaZRebcE9YrM+uP0yNVwZJUdqV/RsRSOp2u/PvCMnr4zo5eodbbFq5o3Hvo43TZqXUybfgkxULQPJKOdpVxsvNGPGcqjE6bywwoCSsMXu0WApOTsC305IVapGW3THpSeGmqGle+KkjFQwSsNDNci/tjdi8c+fV1SqyAWf/9 x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR06MB4029.eurprd06.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(376002)(346002)(366004)(396003)(136003)(39860400002)(4326008)(64756008)(26005)(66556008)(52536014)(316002)(44832011)(8676002)(33656002)(66476007)(7696005)(66446008)(478600001)(8936002)(6506007)(76116006)(6916009)(71200400001)(9686003)(186003)(83380400001)(30864003)(54906003)(86362001)(2906002)(66946007)(55016002)(5660300002)(107886003)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: LgGYRzaiCwz6YfzgJobbgndJT/9neOEErBkQOfoXhaAf4sS3Jl/RfBCjyFf7AojMyfdscZLPTbO/oi62rnWTEkntwM1JJwdEmiKUgBFzqhIJZ9raqbstKnT2u2m+WfQgEdhBP1BHAsNCGvJ2BIVwz3/r86xiRv/6Hg7QWvrTd6wszjZuupa8QYLCXYpQNISFpj3JArr1FeN6FeIMLP7dPo6kRiK+XGZwxx2L+p9e+fZ/dLUchXsMqxPuYd8wV15WeUPV+F4iYaI5200L2Mmvj+nhEv6jQ43buo9aeiluuWXAyx7DLWRQ0MxEjmt6Z79uzokksJfzcx/xjwzn6BeN63RyTYOQmavDsCsqWeekaB6KqEQPLTq4G6r5ku2MoIOfuW6xRtlh7ZABwuvY+L7MUfloptVtyE3g4gWrdseGhLKv0V15spDgb0bhZLq7OiIKaFXcXeKWYLVz+MaJJPLUJa5Gk5CrEGuWhl1NZElTYF192s0FD1UZD8RkuPw+N34ggxsNvGsgIril6uYXWhjeZjLJRsj89lrAyQrPfjGsa6JiX6zXwi6JFQ40Va78kjrse9dBZKLxReTYpzWqZVzcDafGmuEfIRUNsAwn5+sSw1GfD2kWiSKsClCxBZt3HRLvzOAxyawkNuUc+VRPbXW/Gu0vQlskTPrDnGe/8VO/LEnRmFXx30eeJxOR0r0PsF9z8OJ6EjtBGR8iMkuMvjTfd7WvcehFqntzuh2sQrNrC54BKTYMnhtB+SFRKwx0bFsF0BimuZq6GCo5xpfFw1UUXXhlgmyOzU9cAghsAXgGAhgEaX1YbJ3lALsKxzli6v1QZakxj5DVAfodpIx1RJwsbsl92iMKZO+x4GGFzOWa4qX0R8zMDkrvqAWwNuowwy7V6nbCpS3eTMZcebeRGsSsUPC0+piwSoJ2GpCtHpGI4YFLF8W75qKB9pjvHc6TP/S5vWhh+8V7YtlxLT086o8vzzGi8Ll4X6PXHJptTSpmEQU= MIME-Version: 1.0 X-OriginatorOrg: hitachi-powergrids.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR06MB4029.eurprd06.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 08b7aeb6-c519-4d45-b4ce-08d8b7df4283 X-MS-Exchange-CrossTenant-originalarrivaltime: 13 Jan 2021 16:21:19.3183 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 7831e6d9-dc6c-4cd1-9ec6-1dc2b4133195 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: K1v3EBjnBWx3aDo67lU+SRILZC2fxF3CqNA42gXDHqGO9ZvkhftWrdwiBz8yYLl9T5NofZWwS11Ii07bMk4jy/tvIBfrIfbrPjr1smDtXqFGVG2w0voCe+rmwEyfRJPkjRBrG5dICWbLvUsiNxRTdA== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR06MB6077 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 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" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean The SELI8 design is a new tdm service unit card for Hitachi-Powergrids XMC and FOX product lines. It is based on NXP LS1021 SoC and it provides following interfaces: - IFC interface for NOR, NAND and external FPGA's - 1 x RGMII ETH for debug purposes - 2 x SGMII ETH for management communication via back-plane - 1 x uQE HDLC for management communication via back-plane - 1 x I2C for peripheral devices - 1 x SPI for peripheral devices - 1 x UART for debug logging It is foreseen that the design will be later re-used for another XMC and FOX service cards with similar SoC requirements. Signed-off-by: Rainer Boschung Signed-off-by: Matteo Ghidoni Signed-off-by: Aleksandar Gerasimovski --- arch/arm/Kconfig | 19 ++ arch/arm/dts/Makefile | 2 + arch/arm/dts/ls1021a-pg-wcom-seli8.dts | 111 +++++++++ board/keymile/Kconfig | 23 +- board/keymile/common/ivm.c | 19 +- board/keymile/pg-wcom-ls102xa/Kconfig | 19 ++ board/keymile/pg-wcom-ls102xa/MAINTAINERS | 10 + board/keymile/pg-wcom-ls102xa/Makefile | 11 + board/keymile/pg-wcom-ls102xa/ddr.c | 90 +++++++ board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c | 160 ++++++++++++ configs/pg_wcom_seli8_defconfig | 63 +++++ include/configs/km/pg-wcom-ls102xa.h | 309 ++++++++++++++++++++++++ include/configs/pg-wcom-seli8.h | 45 ++++ 13 files changed, 870 insertions(+), 11 deletions(-) create mode 100644 arch/arm/dts/ls1021a-pg-wcom-seli8.dts create mode 100644 board/keymile/pg-wcom-ls102xa/Kconfig create mode 100644 board/keymile/pg-wcom-ls102xa/MAINTAINERS create mode 100644 board/keymile/pg-wcom-ls102xa/Makefile create mode 100644 board/keymile/pg-wcom-ls102xa/ddr.c create mode 100644 board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c create mode 100644 configs/pg_wcom_seli8_defconfig create mode 100644 include/configs/km/pg-wcom-ls102xa.h create mode 100644 include/configs/pg-wcom-seli8.h diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index fbe9087..13fdf3c 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1515,6 +1515,24 @@ config TARGET_LS1021ATWR select DM_SPI_FLASH if FSL_DSPI || FSL_QSPI imply SCSI +config TARGET_PG_WCOM_SELI8 + bool "Support Hitachi-Powergrids SELI8 service unit card" + select ARCH_LS1021A + select ARCH_SUPPORT_PSCI + select BOARD_EARLY_INIT_F + select BOARD_LATE_INIT + select CPU_V7A + select CPU_V7_HAS_NONSEC + select CPU_V7_HAS_VIRT + select SYS_FSL_DDR + select FSL_DDR_INTERACTIVE + select VENDOR_KM + imply SCSI + help + Support for Hitachi-Powergrids SELI8 service unit card. + SELI8 is a QorIQ LS1021a based service unit card used + in XMC20 and FOX615 product families. + config TARGET_LS1021ATSN bool "Support ls1021atsn" select ARCH_LS1021A @@ -2034,6 +2052,7 @@ source "board/variscite/dart_6ul/Kconfig" source "board/vscom/baltos/Kconfig" source "board/phytium/durian/Kconfig" source "board/xen/xenguest_arm64/Kconfig" +source "board/keymile/Kconfig" source "arch/arm/Kconfig.debug" diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index fd47e40..ec93f93 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -393,6 +393,8 @@ dtb-$(CONFIG_ARCH_LS1021A) += ls1021a-qds-duart.dtb \ ls1021a-qds-lpuart.dtb \ ls1021a-twr-duart.dtb ls1021a-twr-lpuart.dtb \ ls1021a-iot-duart.dtb ls1021a-tsn.dtb +dtb-$(CONFIG_TARGET_PG_WCOM_SELI8) += ls1021a-pg-wcom-seli8.dtb + dtb-$(CONFIG_FSL_LSCH3) += fsl-ls2080a-qds.dtb \ fsl-ls2080a-qds-42-x.dtb \ fsl-ls2080a-rdb.dtb \ diff --git a/arch/arm/dts/ls1021a-pg-wcom-seli8.dts b/arch/arm/dts/ls1021a-pg-wcom-seli8.dts new file mode 100644 index 0000000..e335188 --- /dev/null +++ b/arch/arm/dts/ls1021a-pg-wcom-seli8.dts @@ -0,0 +1,111 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2013-2015 Freescale Semiconductor, Inc. + * Copyright 2020 Hitachi Power Grids. All rights reserved. + */ + +/dts-v1/; +#include "ls1021a.dtsi" + +/ { + model = "Hitachi-Powergrids SELI8 Service Unit for XMC and FOX"; + + chosen { + stdout-path = &uart0; + }; +}; + +&enet0 { + status = "okay"; + tbi-handle = <&tbi0>; + phy-connection-type = "sgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&enet1 { + status = "okay"; + tbi-handle = <&tbi1>; + phy-connection-type = "sgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; +}; + +&enet2 { + phy-handle = <&debug_phy>; + phy-connection-type = "rgmii-id"; + status = "okay"; +}; + +&i2c0 { + status = "okay"; +}; + +&ifc { + #address-cells = <2>; + #size-cells = <1>; + /* NOR Flash on board */ + ranges = <0x0 0x0 0x60000000 0x04000000>; + status = "okay"; + + nor@0,0 { + #address-cells = <1>; + #size-cells = <1>; + compatible = "cfi-flash"; + reg = <0x0 0x0 0x4000000>; + bank-width = <2>; + device-width = <1>; + + partition@0 { + label = "rcw"; + reg = <0x0 0x20000>; + read-only; + }; + partition@20000 { + label = "qe"; + reg = <0x20000 0x20000>; + }; + partition@40000 { + label = "envred"; + reg = <0x40000 0x20000>; + }; + partition@60000 { + label = "env"; + reg = <0x60000 0x20000>; + }; + partition@100000 { + label = "u-boot"; + reg = <0x100000 0x100000>; + }; + partition@200000 { + label = "ubi0"; + reg = <0x200000 0x3E00000>; + }; + }; +}; + +&mdio0 { + debug_phy: ethernet-phy@11 { + reg = <0x11>; + }; + + tbi0: tbi-phy@0xb { + reg = <0xb>; + device_type = "tbi-phy"; + }; +}; + +&mdio1 { + tbi1: tbi-phy@0xd { + reg = <0xd>; + device_type = "tbi-phy"; + }; +}; + +&uart0 { + status = "okay"; +}; diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index e590690..965a537 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -20,8 +20,8 @@ config KM_PNVRAM config KM_PHRAM hex "Physical RAM" - default 0x17F000 if ARM - default 0x100000 if PPC + default 0x17F000 if ARM && !ARCH_LS1021A + default 0x100000 if PPC || ARCH_LS1021A depends on !ARCH_SOCFPGA help Start address of the physical RAM, which is the mounted /var folder. @@ -30,13 +30,14 @@ config KM_RESERVED_PRAM hex "Reserved RAM" default 0x801000 if ARCH_KIRKWOOD default 0x0 if MPC83xx - default 0x1000 if MPC85xx + default 0x1000 if MPC85xx || ARCH_LS1021A depends on !ARCH_SOCFPGA help Reserved physical RAM area at the end of memory for special purposes. config KM_CRAMFS_ADDR hex "CRAMFS Address" + default 0x83000000 if ARCH_LS1021A default 0x3000000 depends on !ARCH_SOCFPGA help @@ -44,16 +45,25 @@ config KM_CRAMFS_ADDR config KM_KERNEL_ADDR hex "Kernel Load Address" + default 0x82000000 if ARCH_LS1021A default 0x2000000 help Address where to load Linux kernel in RAM. config KM_FDT_ADDR hex "FDT Load Address" + default 0x82FC0000 if ARCH_LS1021A default 0x2FC0000 help Address where to load flattened device tree in RAM. +config SYS_PAX_BASE + hex "PAX IFC Base Address" + default 0x78000000 + depends on ARCH_LS1021A + help + IFC Base Address for PAXx FPGA. + config KM_CONSOLE_TTY string "KM Console" default "ttyS0" @@ -69,9 +79,9 @@ config KM_DEF_NETDEV config KM_COMMON_ETH_INIT bool "Common Ethernet Initialization" default y if ARCH_KIRKWOOD || MPC83xx - default n if MPC85xx || ARCH_SOCFPGA + default n if MPC85xx || ARCH_SOCFPGA || ARCH_LS1021A help - Use the Ethernet initialization implemented in common code, which + Use the Ethernet initialization implemented in common code that detects if a Piggy board is present. config PIGGY_MAC_ADDRESS_OFFSET @@ -90,7 +100,7 @@ config KM_MVEXTSW_ADDR config KM_IVM_BUS int "IVM I2C Bus" default 0 if ARCH_SOCFPGA - default 1 if ARCH_KIRKWOOD || MPC85xx + default 1 if ARCH_KIRKWOOD || MPC85xx || ARCH_LS1021A default 2 if MPC83xx help Identifier number of I2C bus, where the inventory EEPROM is connected to. @@ -116,6 +126,7 @@ config SYS_IVM_EEPROM_PAGE_LEN source "board/keymile/km83xx/Kconfig" source "board/keymile/kmp204x/Kconfig" source "board/keymile/km_arm/Kconfig" +source "board/keymile/pg-wcom-ls102xa/Kconfig" endmenu diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index e989bf6..48817cb 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -306,11 +306,7 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset) return 0; page2 = &buf[CONFIG_SYS_IVM_EEPROM_PAGE_LEN * 2]; - if (!IS_ENABLED(CONFIG_KMTEGR1)) { - /* if an offset is defined, add it */ - process_mac(valbuf, page2, mac_address_offset, true); - env_set((char *)"ethaddr", (char *)valbuf); - } else { + if (IS_ENABLED(CONFIG_KMTEGR1)) { /* KMTEGR1 has a special setup. eth0 has no connection to the * outside and gets an locally administred MAC address, eth1 is * the debug interface and gets the official MAC address from @@ -320,6 +316,19 @@ static int ivm_populate_env(unsigned char *buf, int len, int mac_address_offset) env_set((char *)"ethaddr", (char *)valbuf); process_mac(valbuf, page2, mac_address_offset, true); env_set((char *)"eth1addr", (char *)valbuf); + } else if (IS_ENABLED(CONFIG_ARCH_LS1021A)) { + /* LS102xA has 1xRGMII for debug connection and + * 2xSGMII for back-plane mgmt connection + */ + process_mac(valbuf, page2, 1, true); + env_set((char *)"ethaddr", (char *)valbuf); + process_mac(valbuf, page2, 2, true); + env_set((char *)"eth1addr", (char *)valbuf); + process_mac(valbuf, page2, mac_address_offset, true); + env_set((char *)"eth2addr", (char *)valbuf); + } else { + process_mac(valbuf, page2, mac_address_offset, true); + env_set((char *)"ethaddr", (char *)valbuf); } return 0; diff --git a/board/keymile/pg-wcom-ls102xa/Kconfig b/board/keymile/pg-wcom-ls102xa/Kconfig new file mode 100644 index 0000000..15c009d --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/Kconfig @@ -0,0 +1,19 @@ +if TARGET_PG_WCOM_SELI8 + +config SYS_BOARD + default "pg-wcom-ls102xa" + +config SYS_VENDOR + default "keymile" + +config SYS_SOC + default "ls102xa" + +config SYS_CONFIG_NAME + default "pg-wcom-seli8" + +config BOARD_SPECIFIC_OPTIONS + def_bool y + imply FS_CRAMFS + +endif diff --git a/board/keymile/pg-wcom-ls102xa/MAINTAINERS b/board/keymile/pg-wcom-ls102xa/MAINTAINERS new file mode 100644 index 0000000..e1bc90a --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/MAINTAINERS @@ -0,0 +1,10 @@ +Hitachi Power Grids LS102XA BOARD +M: Aleksandar Gerasimovski +M: Rainer Boschung +M: Matteo Ghidoni +S: Maintained +F: board/keymile/pg-wcom-ls102xa/ +F: include/configs/km/pg-wcom-ls102xa.h +F: include/configs/pg-wcom-seli8.h +F: configs/pg_wcom_seli8_defconfig +F: arch/arm/dts/ls1021a-pg-wcom-seli8.dts diff --git a/board/keymile/pg-wcom-ls102xa/Makefile b/board/keymile/pg-wcom-ls102xa/Makefile new file mode 100644 index 0000000..229b0c2 --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/Makefile @@ -0,0 +1,11 @@ +# +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright 2021 Hitachi Power Grids. All rights reserved. +# + +obj-y += pg-wcom-ls102xa.o ddr.o +obj-y += ../common/common.o ../common/ivm.o ../common/qrio.o +obj-$(CONFIG_LAYERSCAPE_NS_ACCESS) += ../../freescale/common/ns_access.o +obj-$(CONFIG_LS102XA_STREAM_ID) += ../../freescale/common/ls102xa_stream_id.o +obj-$(CONFIG_ID_EEPROM) += ../../freescale/common/sys_eeprom.o diff --git a/board/keymile/pg-wcom-ls102xa/ddr.c b/board/keymile/pg-wcom-ls102xa/ddr.c new file mode 100644 index 0000000..6023573 --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/ddr.c @@ -0,0 +1,90 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2014 Freescale Semiconductor, Inc. + * Copyright 2020 Hitachi Power Grids. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +void fsl_ddr_board_options(memctl_options_t *popts, + dimm_params_t *pdimm, + unsigned int ctrl_num) +{ + if (ctrl_num > 1) { + printf("Not supported controller number %d\n", ctrl_num); + return; + } + + // 1/2 DRAM cycle (should be increased in case of ADDR/CMD heavily loaded than the clock) + popts->clk_adjust = 0x4; + popts->write_data_delay = 0x4; + // wr leveling start value for lane 0 + popts->wrlvl_start = 0x5; + // wr leveling start values for lanes 1-3 (lane 4 not there) + popts->wrlvl_ctl_2 = 0x05050500; + // 32-bit DRAM, no need to set start values for lanes we do not have (5-8) + popts->wrlvl_ctl_3 = 0x0; + popts->cpo_override = 0x1f; + + /* force DDR bus width to 32 bits */ + popts->data_bus_width = 1; + popts->otf_burst_chop_en = 0; + popts->burst_length = DDR_BL8; + + /* + * Factors to consider for half-strength driver enable: + * - number of DIMMs installed + */ + popts->half_strength_driver_enable = 1; + /* + * Write leveling override + */ + popts->wrlvl_override = 1; + popts->wrlvl_sample = 0xf; + + /* + * Rtt and Rtt_WR override + */ + popts->rtt_override = 0; + + /* Enable ZQ calibration */ + popts->zq_en = 1; + + popts->cswl_override = DDR_CSWL_CS0; + + /* optimize cpo for erratum A-009942 */ + popts->cpo_sample = 0x58; + + /* DHC_EN =1, ODT = 75 Ohm */ + popts->ddr_cdr1 = DDR_CDR1_DHC_EN | DDR_CDR1_ODT(DDR_CDR_ODT_75ohm); + popts->ddr_cdr2 = DDR_CDR2_ODT(DDR_CDR_ODT_75ohm); +} + +int fsl_initdram(void) +{ + phys_size_t dram_size; + + puts("Initializing DDR....using SPD\n"); + dram_size = fsl_ddr_sdram(); + + erratum_a008850_post(); + + gd->ram_size = dram_size; + + return 0; +} + +int dram_init_banksize(void) +{ + gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; + gd->bd->bi_dram[0].size = gd->ram_size; + + return 0; +} diff --git a/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c new file mode 100644 index 0000000..6b0e963 --- /dev/null +++ b/board/keymile/pg-wcom-ls102xa/pg-wcom-ls102xa.c @@ -0,0 +1,160 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2020 Hitachi Power Grids. All rights reserved. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../common/common.h" +#include "../common/qrio.h" + +DECLARE_GLOBAL_DATA_PTR; + +static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; + +int checkboard(void) +{ + show_qrio(); + + return 0; +} + +int dram_init(void) +{ + return fsl_initdram(); +} + +int board_early_init_f(void) +{ + struct ccsr_scfg *scfg = (struct ccsr_scfg *)CONFIG_SYS_FSL_SCFG_ADDR; + struct ccsr_gur __iomem *gur = (void *)CONFIG_SYS_FSL_GUTS_ADDR; + struct fsl_ifc ifc = {(void *)CONFIG_SYS_IFC_ADDR, (void *)NULL}; + + /* Disable unused MCK1 */ + setbits_be32(&gur->ddrclkdr, 2); + + /* IFC Global Configuration */ + setbits_be32(&ifc.gregs->ifc_gcr, 12 << IFC_GCR_TBCTL_TRN_TIME_SHIFT); + setbits_be32(&ifc.gregs->ifc_ccr, IFC_CCR_CLK_DIV(3) | + IFC_CCR_INV_CLK_EN); + + /* clear BD & FR bits for BE BD's and frame data */ + clrbits_be32(&scfg->etsecdmamcr, SCFG_ETSECDMAMCR_LE_BD_FR); + out_be32(&scfg->etsecmcr, SCFG_ETSECCMCR_GE2_CLK125); + + init_early_memctl_regs(); + + /* QRIO Configuration */ + qrio_uprstreq(UPREQ_CORE_RST); + + if (IS_ENABLED(CONFIG_TARGET_PG_WCOM_SELI8)) { + qrio_prstcfg(KM_LIU_RST, PRSTCFG_POWUP_UNIT_RST); + qrio_wdmask(KM_LIU_RST, true); + + qrio_prstcfg(KM_PAXK_RST, PRSTCFG_POWUP_UNIT_RST); + qrio_wdmask(KM_PAXK_RST, true); + + qrio_prstcfg(KM_DBG_ETH_RST, PRSTCFG_POWUP_UNIT_CORE_RST); + qrio_prst(KM_DBG_ETH_RST, false, false); + } + + i2c_deblock_gpio_cfg(); + + arch_soc_init(); + + return 0; +} + +int board_init(void) +{ + if (IS_ENABLED(CONFIG_SYS_FSL_ERRATUM_A010315)) + erratum_a010315(); + + fsl_serdes_init(); + + ls102xa_smmu_stream_id_init(); + + u_qe_init(); + + return 0; +} + +int board_late_init(void) +{ + return 0; +} + +int misc_init_r(void) +{ + if (IS_ENABLED(CONFIG_FSL_DEVICE_DISABLE)) + device_disable(devdis_tbl, ARRAY_SIZE(devdis_tbl)); + + ivm_read_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN, + CONFIG_PIGGY_MAC_ADDRESS_OFFSET); + + return 0; +} + +int ft_board_setup(void *blob, struct bd_info *bd) +{ + ft_cpu_setup(blob, bd); + + if (IS_ENABLED(CONFIG_PCI)) + ft_pci_setup(blob, bd); + + return 0; +} + +u8 flash_read8(void *addr) +{ + return __raw_readb(addr + 1); +} + +void flash_write16(u16 val, void *addr) +{ + u16 shftval = (((val >> 8) & 0xff) | ((val << 8) & 0xff00)); + + __raw_writew(shftval, addr); +} + +u16 flash_read16(void *addr) +{ + u16 val = __raw_readw(addr); + + return (((val) >> 8) & 0x00ff) | (((val) << 8) & 0xff00); +} + +int hush_init_var(void) +{ + ivm_analyze_eeprom(ivm_content, CONFIG_SYS_IVM_EEPROM_MAX_LEN); + return 0; +} + +int last_stage_init(void) +{ + set_km_env(); + return 0; +} diff --git a/configs/pg_wcom_seli8_defconfig b/configs/pg_wcom_seli8_defconfig new file mode 100644 index 0000000..2d58fa0 --- /dev/null +++ b/configs/pg_wcom_seli8_defconfig @@ -0,0 +1,63 @@ +CONFIG_ARM=y +CONFIG_TARGET_PG_WCOM_SELI8=y +CONFIG_SYS_TEXT_BASE=0x60100000 +CONFIG_NR_DRAM_BANKS=1 +CONFIG_KM_DEF_NETDEV="eth2" +CONFIG_KM_COMMON_ETH_INIT=y +CONFIG_PIGGY_MAC_ADDRESS_OFFSET=3 +CONFIG_SYS_MEMTEST_START=0x80000000 +CONFIG_SYS_MEMTEST_END=0x9fffffff +CONFIG_ENV_SIZE=0x4000 +CONFIG_ENV_SECT_SIZE=0x20000 +CONFIG_BOOTCOUNT_BOOTLIMIT=3 +CONFIG_SYS_BOOTCOUNT_ADDR=0x70000020 +CONFIG_DEFAULT_DEVICE_TREE="ls1021a-pg-wcom-seli8" +CONFIG_AHCI=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_FIT=y +CONFIG_FIT_VERBOSE=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_OF_STDOUT_VIA_ALIAS=y +CONFIG_BOOTDELAY=3 +CONFIG_USE_BOOTARGS=y +CONFIG_BOOTARGS="console=ttyS0,115200 root=/dev/ram0" +CONFIG_SILENT_CONSOLE=y +CONFIG_MISC_INIT_R=y +CONFIG_LAST_STAGE_INIT=y +CONFIG_CMD_IMLS=y +CONFIG_CMD_GREPENV=y +CONFIG_CMD_MEMINFO=y +CONFIG_CMD_MEMTEST=y +CONFIG_CMD_GPT=y +CONFIG_CMD_I2C=y +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_CRAMFS=y +CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nor0=60000000.nor,nand0=68000000.flash" +CONFIG_MTDPARTS_DEFAULT="mtdparts=60000000.nor:128k(rcw),128k(qe),128k(envred),128k(env),512k(res),1m(u-boot),-(ubi0);68000000.flash:-(ubi1)" +CONFIG_CMD_UBI=y +CONFIG_OF_CONTROL=y +CONFIG_ENV_IS_IN_FLASH=y +CONFIG_ENV_ADDR=0x60060000 +CONFIG_DM=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_SYS_FSL_DDR3=y +# CONFIG_MMC is not set +CONFIG_MTD=y +CONFIG_MTD_NOR_FLASH=y +CONFIG_FLASH_CFI_DRIVER=y +CONFIG_SYS_FLASH_USE_BUFFER_WRITE=y +CONFIG_FLASH_CFI_MTD=y +CONFIG_SYS_FLASH_CFI=y +CONFIG_MTD_RAW_NAND=y +CONFIG_PHY_MARVELL=y +CONFIG_PHY_FIXED=y +CONFIG_DM_ETH=y +CONFIG_DM_MDIO=y +CONFIG_PHY_GIGE=y +CONFIG_MII=y +CONFIG_TSEC_ENET=y +CONFIG_SPECIFY_CONSOLE_INDEX=y +CONFIG_DM_SERIAL=y +CONFIG_SYS_NS16550=y diff --git a/include/configs/km/pg-wcom-ls102xa.h b/include/configs/km/pg-wcom-ls102xa.h new file mode 100644 index 0000000..55fb909 --- /dev/null +++ b/include/configs/km/pg-wcom-ls102xa.h @@ -0,0 +1,309 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2020 Hitachi Power Grids. All rights reserved. + */ + +#ifndef __CONFIG_PG_WCOM_LS102XA_H +#define __CONFIG_PG_WCOM_LS102XA_H + +#define CONFIG_SYS_FSL_CLK + +#define CONFIG_SKIP_LOWLEVEL_INIT + +/* include common defines/options for all Keymile boards */ +#include "keymile-common.h" + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 16 * 1024 * 1024) + +#define CONFIG_SYS_INIT_RAM_ADDR OCRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE OCRAM_SIZE + +#define CONFIG_SYS_CLK_FREQ 66666666 +/* + * Take into account default implementation where DDR_FDBK_MULTI is consider as + * configured for DDR_PLL = 2*MEM_PLL_RAT. + * In our case DDR_FDBK_MULTI is 2, means DDR_PLL = MEM_PLL_RAT. + */ +#define CONFIG_DDR_CLK_FREQ (100000000 >> 1) + +#define PHYS_SDRAM 0x80000000 +#define PHYS_SDRAM_SIZE (1u * 1024 * 1024 * 1024) + +#define CONFIG_SYS_DDR_SDRAM_BASE 0x80000000UL +#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_DDR_SDRAM_BASE + +#define CONFIG_DIMM_SLOTS_PER_CTLR 1 +#define CONFIG_CHIP_SELECTS_PER_CTRL 4 + +#define CONFIG_DDR_SPD + +#define CONFIG_SYS_SPD_BUS_NUM 0 +#define SPD_EEPROM_ADDRESS 0x54 + +/* + * IFC Definitions + */ +/* NOR Flash Definitions */ +#define CONFIG_FSL_IFC +#define CONFIG_SYS_FLASH_BASE 0x60000000 +#define CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE + +#define CONFIG_SYS_NOR0_CSPR_EXT (0x0) +#define CONFIG_SYS_NOR0_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_FLASH_BASE_PHYS) | \ + CSPR_PORT_SIZE_16 | \ + CSPR_TE | \ + CSPR_MSEL_NOR | \ + CSPR_V) +#define CONFIG_SYS_NOR_AMASK IFC_AMASK(64 * 1024 * 1024) + +#define CONFIG_SYS_NOR_CSOR (CSOR_NOR_AVD_TGL_PGM_EN | \ + CSOR_NOR_ADM_SHIFT(0x4) | \ + CSOR_NOR_NOR_MODE_AYSNC_NOR | \ + CSOR_NOR_TRHZ_20 | \ + CSOR_NOR_BCTLD) +#define CONFIG_SYS_NOR_FTIM0 (FTIM0_NOR_TACSE(0x1) | \ + FTIM0_NOR_TEADC(0x7) | \ + FTIM0_NOR_TAVDS(0x0) | \ + FTIM0_NOR_TEAHC(0x1)) +#define CONFIG_SYS_NOR_FTIM1 (FTIM1_NOR_TACO(0x1) | \ + FTIM1_NOR_TRAD_NOR(0x21) | \ + FTIM1_NOR_TSEQRAD_NOR(0x21)) +#define CONFIG_SYS_NOR_FTIM2 (FTIM2_NOR_TCS(0x1) | \ + FTIM2_NOR_TCH(0x1) | \ + FTIM2_NOR_TWPH(0x6) | \ + FTIM2_NOR_TWP(0xb)) +#define CONFIG_SYS_NOR_FTIM3 0 + +#define CONFIG_SYS_FLASH_QUIET_TEST +#define CONFIG_FLASH_SHOW_PROGRESS 45 /* count down from 45/5: 9..1 */ + +#define CONFIG_SYS_MAX_FLASH_BANKS 1 /* number of banks */ +#define CONFIG_SYS_MAX_FLASH_SECT 512 /* sectors per device */ +#define CONFIG_SYS_FLASH_ERASE_TOUT 60000 /* Flash Erase Timeout (ms) */ +#define CONFIG_SYS_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (ms) */ + +#define CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_SYS_FLASH_BANKS_LIST { CONFIG_SYS_FLASH_BASE_PHYS } + +#define CONFIG_CFI_FLASH_USE_WEAK_ACCESSORS +#define CONFIG_SYS_WRITE_SWAPPED_DATA + +#define CONFIG_SYS_CSPR0_EXT CONFIG_SYS_NOR0_CSPR_EXT +#define CONFIG_SYS_CSPR0 CONFIG_SYS_NOR0_CSPR +#define CONFIG_SYS_AMASK0 CONFIG_SYS_NOR_AMASK +#define CONFIG_SYS_CSOR0 CONFIG_SYS_NOR_CSOR +#define CONFIG_SYS_CS0_FTIM0 CONFIG_SYS_NOR_FTIM0 +#define CONFIG_SYS_CS0_FTIM1 CONFIG_SYS_NOR_FTIM1 +#define CONFIG_SYS_CS0_FTIM2 CONFIG_SYS_NOR_FTIM2 +#define CONFIG_SYS_CS0_FTIM3 CONFIG_SYS_NOR_FTIM3 + +/* NAND Flash Definitions */ +#define CONFIG_NAND_FSL_IFC +#define CONFIG_SYS_NAND_BASE 0x68000000 +#define CONFIG_SYS_NAND_BASE_PHYS CONFIG_SYS_NAND_BASE + +#define CONFIG_SYS_NAND_CSPR_EXT (0x0) +#define CONFIG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CONFIG_SYS_NAND_BASE) | \ + CSPR_PORT_SIZE_8 | \ + CSPR_TE | \ + CSPR_MSEL_NAND | \ + CSPR_V) +#define CONFIG_SYS_NAND_AMASK IFC_AMASK(64 * 1024) +#define CONFIG_SYS_NAND_CSOR (CSOR_NAND_ECC_ENC_EN \ + | CSOR_NAND_ECC_DEC_EN \ + | CSOR_NAND_ECC_MODE_4 \ + | CSOR_NAND_RAL_3 \ + | CSOR_NAND_PGS_2K \ + | CSOR_NAND_SPRZ_64 \ + | CSOR_NAND_PB(64) \ + | CSOR_NAND_TRHZ_40 \ + | CSOR_NAND_BCTLD) + +#define CONFIG_SYS_NAND_ONFI_DETECTION + +#define CONFIG_SYS_NAND_FTIM0 (FTIM0_NAND_TCCST(0x3) | \ + FTIM0_NAND_TWP(0x8) | \ + FTIM0_NAND_TWCHT(0x3) | \ + FTIM0_NAND_TWH(0x5)) +#define CONFIG_SYS_NAND_FTIM1 (FTIM1_NAND_TADLE(0x1e) | \ + FTIM1_NAND_TWBE(0x1e) | \ + FTIM1_NAND_TRR(0x6) | \ + FTIM1_NAND_TRP(0x8)) +#define CONFIG_SYS_NAND_FTIM2 (FTIM2_NAND_TRAD(0x9) | \ + FTIM2_NAND_TREH(0x5) | \ + FTIM2_NAND_TWHRE(0x3c)) +#define CONFIG_SYS_NAND_FTIM3 (FTIM3_NAND_TWW(0x1e)) + +#define CONFIG_SYS_CSPR1_EXT CONFIG_SYS_NAND_CSPR_EXT +#define CONFIG_SYS_CSPR1 CONFIG_SYS_NAND_CSPR +#define CONFIG_SYS_AMASK1 CONFIG_SYS_NAND_AMASK +#define CONFIG_SYS_CSOR1 CONFIG_SYS_NAND_CSOR +#define CONFIG_SYS_CS1_FTIM0 CONFIG_SYS_NAND_FTIM0 +#define CONFIG_SYS_CS1_FTIM1 CONFIG_SYS_NAND_FTIM1 +#define CONFIG_SYS_CS1_FTIM2 CONFIG_SYS_NAND_FTIM2 +#define CONFIG_SYS_CS1_FTIM3 CONFIG_SYS_NAND_FTIM3 + +#define CONFIG_SYS_MAX_NAND_DEVICE 1 +#define CONFIG_SYS_NAND_BASE_LIST { CONFIG_SYS_NAND_BASE } +#define CONFIG_SYS_NAND_BLOCK_SIZE (128 * 1024) + +/* QRIO FPGA Definitions */ +#define CONFIG_SYS_QRIO_BASE 0x70000000 +#define CONFIG_SYS_QRIO_BASE_PHYS CONFIG_SYS_QRIO_BASE + +#define CONFIG_SYS_CSPR2_EXT (0x00) +#define CONFIG_SYS_CSPR2 (CSPR_PHYS_ADDR(CONFIG_SYS_QRIO_BASE) | \ + CSPR_PORT_SIZE_8 | \ + CSPR_TE | \ + CSPR_MSEL_GPCM | \ + CSPR_V) +#define CONFIG_SYS_AMASK2 IFC_AMASK(64 * 1024) +#define CONFIG_SYS_CSOR2 (CSOR_GPCM_ADM_SHIFT(0x4) | \ + CSOR_GPCM_TRHZ_20 | \ + CSOR_GPCM_BCTLD) +#define CONFIG_SYS_CS2_FTIM0 (FTIM0_GPCM_TACSE(0x2) | \ + FTIM0_GPCM_TEADC(0x8) | \ + FTIM0_GPCM_TEAHC(0x2)) +#define CONFIG_SYS_CS2_FTIM1 (FTIM1_GPCM_TACO(0x2) | \ + FTIM1_GPCM_TRAD(0x6)) +#define CONFIG_SYS_CS2_FTIM2 (FTIM2_GPCM_TCS(0x1) | \ + FTIM2_GPCM_TCH(0x1) | \ + FTIM2_GPCM_TWP(0x7)) +#define CONFIG_SYS_CS2_FTIM3 0x04000000 + +/* + * Serial Port + */ +#define CONFIG_SYS_NS16550_SERIAL +#define CONFIG_SYS_NS16550_CLK get_serial_clock() + +/* + * I2C + */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_INIT_BOARD +#define CONFIG_SYS_I2C_SPEED 100000 +#define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ +#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ + +#define CONFIG_I2C_MULTI_BUS +#define CONFIG_SYS_I2C_MAX_HOPS 1 +#define CONFIG_SYS_NUM_I2C_BUSES 3 +#define I2C_MUX_PCA_ADDR 0x70 +#define I2C_MUX_CH_DEFAULT 0x0 +#define CONFIG_SYS_I2C_BUSES { {0, {I2C_NULL_HOP} }, \ + {0, {{I2C_MUX_PCA9547, 0x70, 1 } } }, \ + {1, {I2C_NULL_HOP} }, \ + } + +#ifndef __ASSEMBLY__ +void set_sda(int state); +void set_scl(int state); +int get_sda(void); +int get_scl(void); +#endif + +/* + * eTSEC + */ +#ifdef CONFIG_TSEC_ENET +#define CONFIG_ETHPRIME "ethernet@2d90000" +#endif + +#define CONFIG_CMDLINE_TAG + +#define CONFIG_LAYERSCAPE_NS_ACCESS +#define CONFIG_SMP_PEN_ADDR 0x01ee0200 +#define COUNTER_FREQUENCY 12500000 + +#define CONFIG_HWCONFIG +#define HWCONFIG_BUFFER_SIZE 256 +#define CONFIG_FSL_DEVICE_DISABLE + +/* + * Miscellaneous configurable options + */ + +#define CONFIG_SYS_LOAD_ADDR 0x82000000 + +#define CONFIG_LS102XA_STREAM_ID + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ +#define CONFIG_SYS_MONITOR_LEN 0x100000 /* 1Mbyte */ +#define CONFIG_SYS_QE_FW_ADDR 0x60020000 + +#define CONFIG_SYS_BOOTCOUNT_BE + +/* + * Environment + */ + +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR - CONFIG_ENV_SECT_SIZE) + +#define CONFIG_ENV_TOTAL_SIZE 0x40000 +#define ENV_DEL_ADDR 0x60040000 /* direct for newenv */ + +#define CONFIG_ENV_OVERWRITE +#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ +#define CONFIG_KM_DEF_ENV +#endif + +#ifndef CONFIG_KM_DEF_BOOT_ARGS_CPU +#define CONFIG_KM_DEF_BOOT_ARGS_CPU "" +#endif + +#define CONFIG_KM_DEF_ENV_CPU \ + "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ + "cramfsloadfdt=" \ + "cramfsload ${fdt_addr_r} " \ + "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ + "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ + "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize} && " \ + "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize} && " \ + "cp.b ${load_addr_r} " \ + __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \ + "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ + " +${filesize}\0" \ + "update-nor=protect off " __stringify(CONFIG_SYS_FLASH_BASE) \ + " +${filesize} && " \ + "erase " __stringify(CONFIG_SYS_FLASH_BASE) \ + " +${filesize} && " \ + "cp.b ${load_addr_r} " \ + __stringify(CONFIG_SYS_FLASH_BASE) " ${filesize} && " \ + "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ + " +" __stringify(CONFIG_SYS_MONITOR_LEN)"\0" \ + "set_fdthigh=true\0" \ + "checkfdt=true\0" \ + "" + +#define CONFIG_KM_NEW_ENV \ + "newenv=protect off " __stringify(ENV_DEL_ADDR) \ + " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + "erase " __stringify(ENV_DEL_ADDR) \ + " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ + "protect on " __stringify(ENV_DEL_ADDR) \ + " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + CONFIG_KM_NEW_ENV \ + CONFIG_KM_DEF_ENV \ + "EEprom_ivm=pca9547:70:9\0" \ + "" + +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* Increase max gunzip size */ +#define CONFIG_SYS_BOOTMAPSZ (256 << 20) /* Increase map for Linux */ + +#endif diff --git a/include/configs/pg-wcom-seli8.h b/include/configs/pg-wcom-seli8.h new file mode 100644 index 0000000..9a7669c --- /dev/null +++ b/include/configs/pg-wcom-seli8.h @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright 2020 Hitachi Power Grids. All rights reserved. + */ + +#ifndef __CONFIG_PG_WCOM_SELI8_H +#define __CONFIG_PG_WCOM_SELI8_H + +#define CONFIG_HOSTNAME "SELI8" + +#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" +#define CONFIG_KM_UBI_PARTITION_NAME_APP "ubi1" + +/* PAXK FPGA Definitions */ +#define CONFIG_SYS_CSPR3_EXT (0x00) +#define CONFIG_SYS_CSPR3 (CSPR_PHYS_ADDR(CONFIG_SYS_PAX_BASE) | \ + CSPR_PORT_SIZE_8 | \ + CSPR_MSEL_GPCM | \ + CSPR_V) +#define CONFIG_SYS_AMASK3 IFC_AMASK(64 * 1024) +#define CONFIG_SYS_CSOR3 (CSOR_GPCM_ADM_SHIFT(0x4) | \ + CSOR_GPCM_TRHZ_40) +#define CONFIG_SYS_CS3_FTIM0 (FTIM0_GPCM_TACSE(0x6) | \ + FTIM0_GPCM_TEADC(0x7) | \ + FTIM0_GPCM_TEAHC(0x2)) +#define CONFIG_SYS_CS3_FTIM1 (FTIM1_GPCM_TACO(0x2) | \ + FTIM1_GPCM_TRAD(0x12)) +#define CONFIG_SYS_CS3_FTIM2 (FTIM2_GPCM_TCS(0x3) | \ + FTIM2_GPCM_TCH(0x1) | \ + FTIM2_GPCM_TWP(0x12)) +#define CONFIG_SYS_CS3_FTIM3 0x04000000 + +/* PRST */ +#define KM_LIU_RST 0 +#define KM_PAXK_RST 1 +#define KM_DBG_ETH_RST 15 + +/* QRIO GPIOs used for deblocking */ +#define KM_I2C_DEBLOCK_PORT QRIO_GPIO_A +#define KM_I2C_DEBLOCK_SCL 20 +#define KM_I2C_DEBLOCK_SDA 21 + +#include "km/pg-wcom-ls102xa.h" + +#endif /* __CONFIG_PG_WCOM_SELI8_H */