From patchwork Mon Jun 1 20:26:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1301927 X-Patchwork-Delegate: jagannadh.teki@gmail.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=none (p=none dis=none) header.from=cortina-access.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=CortinaAccess.onmicrosoft.com header.i=@CortinaAccess.onmicrosoft.com header.a=rsa-sha256 header.s=selector2-CortinaAccess-onmicrosoft-com header.b=tU8tHHsp; 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 49bRXQ5R2Kz9sWm for ; Tue, 2 Jun 2020 06:26:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id D0A41813B3; Mon, 1 Jun 2020 22:26:22 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=cortina-access.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=CortinaAccess.onmicrosoft.com header.i=@CortinaAccess.onmicrosoft.com header.b="tU8tHHsp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 4FC42813C6; Mon, 1 Jun 2020 22:26:21 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,FORGED_SPF_HELO,MSGID_FROM_MTA_HEADER,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.2 Received: from APC01-HK2-obe.outbound.protection.outlook.com (mail-hk2apc01on0628.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::628]) (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 DD637813B3 for ; Mon, 1 Jun 2020 22:26:17 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=cortina-access.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=Alex.Nemirovsky@cortina-access.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=lW/47pBxspHh0GTHlXQ+1tIOXxYEl0JbRBpot0CWV1HD65HhGCiv6xtTx4rusqc4EamBBsSQZBIungmUjA/xMNHr9T/Gwx+hE8wSxftQ/UUNJv1D7MLWZjetNDw8z8PCxd3jTrSinzNWnQMV0aHEEopXl6J9Az/uLAbwfd5//adiN5e3shCRmnmoHdqSPeM32/p3sR+uYbDau21Zb15eYngaeqEM+fTzaR4kuBmG9xyQ3IxQR8gT9uBIgE0bp8ycOOJmGVcx1kBRUGxRhvqLYhblkPvntU+/DPYQwRdjgjvcpryno6MFdmX7qDvbvbmSZd2q3O/AOjWwaCCBf/gfSQ== 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=RzNlFfZnHeFzIhhM8QDIrt11kBNM1iGnAwp2fUho9yk=; b=XNCWiiQWkSpDdOgb+aEdX5AbrKqr8a04Q65fBnOsro41vUXJvC7ium0Vo0mWOJ5WHNlIW2ubQtiNQ2a3bbh84pKomewocPx8ag3fG4E1M4RprAYyMvJ/zZ276a0Wnwr0eYYe4ovxuXuPzs9bfPU63idHqMS8kO4a5ctlyc18z446tJpLUVEBEwgnso4iSbJwiVnOtfmJPHSuXaPibwuyn1qN7J3lF9rvQxxDBV8i8582mgBHbWAZMFVEwokFP4qvl7/MNQ4QVNIwMAV/AtJLRl4FZSjt2djFALlcwrMZk/ZtEFIIOb26O1V8DbLLCEChU8I3cN5bSTbAd1+2Bb6Y1Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cortina-access.com; dmarc=pass action=none header.from=cortina-access.com; dkim=pass header.d=cortina-access.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CortinaAccess.onmicrosoft.com; s=selector2-CortinaAccess-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=RzNlFfZnHeFzIhhM8QDIrt11kBNM1iGnAwp2fUho9yk=; b=tU8tHHspnCEEUL/qolClbe5CkWMBfNxvPbYLNfBeBY/Qz98T8xLad2GbcbuogZ9RtmEzAVIDDM786gbdZAjFgSe5LIWeyIepvICtaa4VrxXO+hpvZjjNN4PV0EV18HTIW4i+bQ4ui6HO87mt5vKIiXhTXfNH0yEy+ZMbKnuryIs= Authentication-Results: lists.denx.de; dkim=none (message not signed) header.d=none;lists.denx.de; dmarc=none action=none header.from=cortina-access.com; Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com (2603:1096:803:1e::16) by PU1PR01MB2089.apcprd01.prod.exchangelabs.com (2603:1096:803:23::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3045.17; Mon, 1 Jun 2020 20:26:16 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::c19b:2121:2956:35a5]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::c19b:2121:2956:35a5%4]) with mapi id 15.20.3045.024; Mon, 1 Jun 2020 20:26:16 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Jagan Teki , Vignesh R , Tom Rini Subject: [PATCH v9 2/2] board: presidio-asic: Add SPI NOR support Date: Mon, 1 Jun 2020 13:26:02 -0700 Message-Id: <1591043162-12930-2-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1591043162-12930-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1591043162-12930-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR17CA0052.namprd17.prod.outlook.com (2603:10b6:300:93::14) To PU1PR01MB1964.apcprd01.prod.exchangelabs.com (2603:1096:803:1e::16) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from smok.hrh.localdomain (70.58.207.205) by MWHPR17CA0052.namprd17.prod.outlook.com (2603:10b6:300:93::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.3045.17 via Frontend Transport; Mon, 1 Jun 2020 20:26:14 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [70.58.207.205] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2cc3b91a-70b0-4db2-33d9-08d8066a0907 X-MS-TrafficTypeDiagnostic: PU1PR01MB2089: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-LD-Processed: 0694623c-6669-497c-89c3-3a32a9934313,ExtAddr X-MS-Oob-TLC-OOBClassifiers: OLM:1360; X-Forefront-PRVS: 0421BF7135 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ER4AWf85Jc/HK5qdGAqifCT9r1dat4SHNqWWen8iQ4A76YZxGpE7qH8qSkdVYOHdMvCnEJohuoNloRovicm+hNN5Sp6Q/PRhzPqIt7j+L3U6/zI8eo+e4xJZqR6PA/1NWNPLn7+cZ53dp68PLKU0q9MIMxlP+8NdjJalXbizZ6HS6jn8RxduaI57uffq5OhrzxeBtt9Ez445Q1e1dcqJfeQR2N5YlOpc1qaR/Y1sibfy7g0w1PTM98vmKDK1MDU/IhDbX1fdxH1aLCJAmTRl/3zZHqLZMTg6pJ5iY43W7ZoXogUrMLUpNKJqWCse1lllT4lPTW2CC4r5mgdKIES3qQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PU1PR01MB1964.apcprd01.prod.exchangelabs.com; PTR:; CAT:NONE; SFTY:; SFS:(39850400004)(366004)(376002)(396003)(346002)(136003)(5660300002)(8676002)(6916009)(54906003)(83380400001)(6486002)(36756003)(316002)(6512007)(508600001)(8936002)(16526019)(2906002)(52116002)(956004)(44832011)(2616005)(186003)(66946007)(66476007)(26005)(6666004)(4326008)(86362001)(6506007)(66556008); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: fkdwKXT98qKr6TVt7kOBidPHdFUdAMfNwyTB+9Sb3tG85TX/mmbtJUJPRVWuZAhH9w8I1ZBw4gCJvLQgfnrSZhT/6q21U/4oVVIPYUj+FiDOg5qGAnGXDG/DJhFIW5fiB8Zj6+qjM/aO0clfvzSDr1orR2e6ncO//avWsbB+w0naCUKZ5KhNOF82Gs/hT4y+4K2jVNzH4fRU7kaHdEV/XEcwfjocRhKUla//nUcpVngq6IAZmaZpcMnMfAj6gKPvV+0hMKHD+0kjPt2JeWcEZRbm1UZiWR4PIP2pA2jJJD+Fu8QKKBj3sAzcm5UU1IEwebGBk/XoPEYyYbifDSGe40YqkYNE03rUR3R/a8TrVabFyX/MtMPSJnVE/nlRUjkucA4HPDn+Phgp/lVJjQYnrJ/F3ysmXnjBLN9SbD2xP9A4C0K08S54ODGdc4RE0ZkSjzeji8QieJjiUTHAbEJCSAjqXMUiOR3PjpCVusYSPOs= X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 2cc3b91a-70b0-4db2-33d9-08d8066a0907 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Jun 2020 20:26:16.4739 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0694623c-6669-497c-89c3-3a32a9934313 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: /xsAbyjL//FP3jL+M6FbMIhq6KyCq1gWKvk0ZAqTAoDAZa9pe1t3s+NRUKfz4vVdCZaLCrHNVhx4nbyytZKBVwgOiXgnb6P/DmybPvagKiiipAk3mTxOKgrmSHnT+wz3 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB2089 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 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.2 at phobos.denx.de X-Virus-Status: Clean Add SPI NOR support for Cortina Access Presidio Engineering Board Signed-off-by: Alex Nemirovsky CC: Jagan Teki CC: Vignesh R CC: Tom Rini --- Changes in v9: None Changes in v8: None Changes in v7: None Changes in v5: - NAND support removed from presidio-asic board DT. Changes in v3: None arch/arm/dts/ca-presidio-engboard.dts | 6 +-- board/cortina/presidio-asic/presidio.c | 16 ++++++- configs/cortina_presidio-asic-spi-nand_defconfig | 48 +++++++++++++++++++ configs/cortina_presidio-asic-spi-nor_defconfig | 59 ++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 5 deletions(-) create mode 100644 configs/cortina_presidio-asic-spi-nand_defconfig create mode 100644 configs/cortina_presidio-asic-spi-nor_defconfig diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts index c03dacc..34148b9 100644 --- a/arch/arm/dts/ca-presidio-engboard.dts +++ b/arch/arm/dts/ca-presidio-engboard.dts @@ -55,15 +55,13 @@ }; sflash: sflash-controller@f4324000 { - #address-cells = <2>; - #size-cells = <1>; compatible = "cortina,ca-sflash"; reg = <0x0 0xf4324000 0x50>; reg-names = "sflash-regs"; flash@0 { compatible = "jedec,spi-nor"; - spi-rx-bus-width = <1>; - spi-max-frequency = <108000000>; + spi-rx-bus-width = <4>; + spi-tx-bus-width = <4>; }; }; }; diff --git a/board/cortina/presidio-asic/presidio.c b/board/cortina/presidio-asic/presidio.c index 3c132f1..883bd2e 100644 --- a/board/cortina/presidio-asic/presidio.c +++ b/board/cortina/presidio-asic/presidio.c @@ -16,7 +16,7 @@ #include #include #include - +#include DECLARE_GLOBAL_DATA_PTR; #define CA_PERIPH_BASE 0xE0000000UL @@ -72,9 +72,23 @@ static noinline int invoke_psci_fn_smc(u64 function_id, u64 arg0, u64 arg1, return function_id; } +#ifdef CONFIG_CORTINA_SFLASH +static int init_sflash(void) +{ + struct udevice *dev; + + uclass_first_device(UCLASS_SPI, &dev); + + return 0; +} +#endif + int board_early_init_r(void) { dcache_disable(); +#ifdef CONFIG_CORTINA_SFLASH + init_sflash(); +#endif return 0; } diff --git a/configs/cortina_presidio-asic-spi-nand_defconfig b/configs/cortina_presidio-asic-spi-nand_defconfig new file mode 100644 index 0000000..515ad22 --- /dev/null +++ b/configs/cortina_presidio-asic-spi-nand_defconfig @@ -0,0 +1,48 @@ +CONFIG_ARM=y +# CONFIG_SYS_ARCH_TIMER is not set +CONFIG_TARGET_PRESIDIO_ASIC=y +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_ENV_SIZE=0x20000 +CONFIG_DM_GPIO=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_IDENT_STRING="Presidio-SoC" +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_BOOTDELAY=3 +CONFIG_LOGLEVEL=7 +CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="G3#" +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_SPI=y +CONFIG_CMD_WDT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_SMC=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_MTDPARTS=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" +# CONFIG_NET is not set +CONFIG_DM=y +CONFIG_CORTINA_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CA=y +CONFIG_DM_MMC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_CORTINA=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_MTD_SPI_NAND=y +CONFIG_DM_SPI_FLASH=y +CONFIG_DM_SERIAL=y +CONFIG_CORTINA_UART=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_CORTINA_SFLASH=y +CONFIG_WDT=y +CONFIG_WDT_CORTINA=y diff --git a/configs/cortina_presidio-asic-spi-nor_defconfig b/configs/cortina_presidio-asic-spi-nor_defconfig new file mode 100644 index 0000000..d7ecec3 --- /dev/null +++ b/configs/cortina_presidio-asic-spi-nor_defconfig @@ -0,0 +1,59 @@ +CONFIG_ARM=y +# CONFIG_SYS_ARCH_TIMER is not set +CONFIG_TARGET_PRESIDIO_ASIC=y +CONFIG_SYS_TEXT_BASE=0x04000000 +CONFIG_ENV_SIZE=0x20000 +CONFIG_DM_GPIO=y +CONFIG_NR_DRAM_BANKS=1 +CONFIG_IDENT_STRING="Presidio-SoC" +CONFIG_SHOW_BOOT_PROGRESS=y +CONFIG_BOOTDELAY=3 +CONFIG_BOARD_EARLY_INIT_R=y +CONFIG_SYS_PROMPT="G3#" +CONFIG_CMD_I2C=y +CONFIG_CMD_MMC=y +CONFIG_CMD_MTD=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF_TEST=y +CONFIG_CMD_SPI=y +CONFIG_CMD_WDT=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIMER=y +CONFIG_CMD_SMC=y +CONFIG_CMD_EXT2=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_MTDPARTS=y +CONFIG_OF_CONTROL=y +CONFIG_OF_LIVE=y +CONFIG_DEFAULT_DEVICE_TREE="ca-presidio-engboard" +# CONFIG_NET is not set +CONFIG_DM=y +CONFIG_CORTINA_GPIO=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_CA=y +CONFIG_LED=y +CONFIG_LED_CORTINA=y +CONFIG_DM_MMC=y +CONFIG_MMC_DW=y +CONFIG_MMC_DW_CORTINA=y +CONFIG_MTD=y +CONFIG_DM_MTD=y +CONFIG_DM_SPI_FLASH=y +CONFIG_SPI_FLASH_ATMEL=y +CONFIG_SPI_FLASH_EON=y +CONFIG_SPI_FLASH_GIGADEVICE=y +CONFIG_SPI_FLASH_ISSI=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_SPI_FLASH_SST=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_XMC=y +CONFIG_SPI_FLASH_MTD=y +CONFIG_DM_SERIAL=y +CONFIG_CORTINA_UART=y +CONFIG_SPI=y +CONFIG_DM_SPI=y +CONFIG_CORTINA_SFLASH=y +CONFIG_WDT=y +CONFIG_WDT_CORTINA=y