From patchwork Fri Mar 20 00:57:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1258560 X-Patchwork-Delegate: trini@ti.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=85.214.62.61; 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=GtlNBVT3; dkim-atps=neutral Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (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 48k55B0zckz9sPF for ; Fri, 20 Mar 2020 11:59:10 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4C1FA8178D; Fri, 20 Mar 2020 01:58:16 +0100 (CET) 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="GtlNBVT3"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D7D5B8178D; Fri, 20 Mar 2020 01:57:52 +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=-0.9 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-hk2apc01on0620.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::620]) (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 B414D816BF for ; Fri, 20 Mar 2020 01:57:46 +0100 (CET) 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=TaDxQbeQRs+rcdKzXcd0Ez+w+UsAnJEVKNCHGH7HXJlPrIkx9gnjPEw0ZwdplhsJaqvrc+8SwboHKKGERlBJKGR7EOrxnP+4Ym+hoaSQON/cgpWihH6Ao3rvojnJayQgxEkCJL3QqCGTjT7sZebpoUFMWHJJDmwwVSAXn3AjCVMCanYMKGXD2HfP149V4ofq5kpup+v/Sav0TI0TJvY5uzafxZGT3tVy8ygL3Rvj/ZoHz+yVvslc+0obFp3GBixTmTlf2PvbbT+E2aOoOLxk4k+qyLXK+j5EKWP5mf/bbwvA3tG0HypGOYnJBKcLea6D1e0heB5F2Ho+UfM/nDefCw== 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=jFasHl7+XmSGcPeRbcVvaaLECeEFEDtsYmmYS9EVi/8=; b=VgIG0ccjxR0cmE2u/j8RUl0BKITtq2lZ05hhhpVD6nQgZlSjbLCOE85vRMxvgZpI68hHkKj1AlaRn1A7nLHjYdDeAJ4vAspzq+kSJIsR/qImflJD97lmiQ2XwmP8Y9l7Ejppfxb+WAG0Q8tiihIopUmqzKHzh3U33oFjE28se17EXoSyR7rAHM9A6dPVtu95jIjTV/PpdF7eu1GciPxw8zMgPvc/Cgc9dgVxYEJtJWC0lQdltPHDeJAjdzOD8zMZGcJa1wazI4VLf+BYavNQ2NDlEoTB2e6ntrZRc0RtS9JLIxhErvP3yPVuN9B/H+bWH6HMxBpDODQVJY6JyWa/6Q== 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=jFasHl7+XmSGcPeRbcVvaaLECeEFEDtsYmmYS9EVi/8=; b=GtlNBVT37tdI/VIyaMBHOI0Uj0BJfV2MEneWhhqkLO8Smf9vOlHpkYI07+PQq1Sh6dupJmpkeTReS0FJOaWyvtPXXrGiVTH5b1k/DCBTKj9UW92BZWFNZxQymktk9DseKO3NFUonuCMi76sFQflDmiEUy4tS950IKLUzrmWjRdY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alex.Nemirovsky@cortina-access.com; Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com (10.170.191.16) by PU1PR01MB1882.apcprd01.prod.exchangelabs.com (10.170.190.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2835.19; Fri, 20 Mar 2020 00:57:43 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::8505:cc66:dbab:cdf4]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::8505:cc66:dbab:cdf4%7]) with mapi id 15.20.2814.021; Fri, 20 Mar 2020 00:57:43 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Jagan Teki Subject: [PATCH v2 8/8] board: presidio-asic: Add SPI NAND and NOR support Date: Thu, 19 Mar 2020 17:57:09 -0700 Message-Id: <1584665829-4881-9-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1584665829-4881-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1584665829-4881-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR12CA0065.namprd12.prod.outlook.com (2603:10b6:300:103::27) 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 MWHPR12CA0065.namprd12.prod.outlook.com (2603:10b6:300:103::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2835.18 via Frontend Transport; Fri, 20 Mar 2020 00:57:42 +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: 0b86556c-e925-49d9-fb0a-08d7cc69b245 X-MS-TrafficTypeDiagnostic: PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882: 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:1148; X-Forefront-PRVS: 03484C0ABF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(346002)(366004)(199004)(6512007)(66476007)(66556008)(6916009)(66946007)(6666004)(6486002)(508600001)(2616005)(4326008)(956004)(186003)(8676002)(16526019)(81166006)(6506007)(2906002)(5660300002)(52116002)(54906003)(26005)(44832011)(86362001)(36756003)(81156014)(8936002); DIR:OUT; SFP:1101; SCL:1; SRVR:PU1PR01MB1882; H:PU1PR01MB1964.apcprd01.prod.exchangelabs.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:0; Received-SPF: None (protection.outlook.com: cortina-access.com does not designate permitted sender hosts) X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kRzWV4+iG/tDc1p4l9eV41OrnqC2Mzgu5ax/thGgPRAjavpPNFy3832iEPdaNvdXfZYFCrEyHlT0Lfaw/EeDSrn7SPVl7vPtp2oKWmJOyj/i21vP9JV/Pxxha8n+ZRA7nnigtfB+zon8Pj/WcPDhfFvKaJUsQcOrV+lT9HjFniW+DTtfI9VfOwAorMYi7Xp+X41JxI0+ekaGD5+MTQmUt2cG6Df/ebKVP7vC1m26kfZbEqi9cf7TlXjRpTEbTtJrK4Gpl4VtT3sSF4R7o9WFfWt/a7nWdIWQcZdiUUwOKIrpgxNStEjbgMGsG6WHGrRvSBFkS+Jt3qp2pfyW/hXNzF0R15a/aUrYqc5nRKaeOI71UZ4PAYQ9waTRns8wDejsLtgNnjsQNvgE5MeVPDBxXqabH/g0jBJzn7/pStD5QkGvQUI+2vlJdP46IioNynt9 X-MS-Exchange-AntiSpam-MessageData: twzoKNhvfJB+4w4czrRKKa0gOw/kM+DBD5klbxtzAkgXNFSW+k1jcPn3rAp73vpiH2nS1sT/gpR9HBJEwAUvRZ7sLI0UTd+vrsFZwK1vY0nqx+bKHFtvTD+oEEHE+4emH/8RgcOA6ysne3Q8YLDzxw== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 0b86556c-e925-49d9-fb0a-08d7cc69b245 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Mar 2020 00:57:43.4655 (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: bDXaYVuyra2ND9hwQ4ca4VwnputD6NufuaYqj+pWiPD0Oi4Me1UijkvqDpwVCUSQHaoIUUaqh9QT0rDLsgAgdd4rdOF8YCXm+T2Qq5Ab7HgALvqkWU7PvlX5FBIOJse/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1882 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 NAND and NOR support for Cortina Access Presidio Engineering Board Signed-off-by: Alex Nemirovsky CC: Jagan Teki --- Changes in v3: None Changes in v2: None arch/arm/dts/ca-presidio-engboard.dts | 8 ++-- 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, 125 insertions(+), 6 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 ae897e8..8c73eb6 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>; + compatible = "spi-nand", "jedec,spi-nor"; + 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 b4fa01f..d547b60 100644 --- a/board/cortina/presidio-asic/presidio.c +++ b/board/cortina/presidio-asic/presidio.c @@ -14,7 +14,7 @@ #include #include #include - +#include DECLARE_GLOBAL_DATA_PTR; #define CA_PERIPH_BASE 0xE0000000UL @@ -70,9 +70,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