From patchwork Fri Apr 17 01:38: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: 1271965 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=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=bViTQ98H; 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 493JfL3tYfz9sSg for ; Fri, 17 Apr 2020 11:39:06 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 2B8C4819FA; Fri, 17 Apr 2020 03:38:43 +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="bViTQ98H"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6973D81205; Fri, 17 Apr 2020 03:38:36 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 C6A748006D for ; Fri, 17 Apr 2020 03:38:30 +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=nv0B5Y92mWKzrVDqeiZ6BJGYqyDWd/NVUVob8kiAO9552h1nZxnOJKm/CsNUACV/oWoFUNTCdKh+7XTCNcb0IxGKS2djNC7J1QBFL6PQU5nhatdTJi5bdUNL9bqFKVW9i5zsD3FIFcYTaXbtSbYPFbQ8M0FqxqLZh66n1ktVgRTAyhtMvPVRxUwpd6HBZNHpYHG9qNOjwju9kBVD9+zJ4RnwWxpWjoQK/lfhSHT5AJX5nmKbT8fWVnNJnEDdczLcsPciwVegumrWBGwozQqYNexfjlV7oYQb7HbmfPES4Sy/Tufrb5m8ryh6ry6LvDd7nt3IM/q744E61UT5l9r00A== 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=hFMD1Z2BCUx0FSI30pgvCRbSNDd63BFMTWuw0BO5T2M=; b=ImoN3TRJOcwrswLev9qWS35A+Z2lso2qGKdrJZQHBV3/XROzStP6F0j7EqhpyGpSpSs0TcDFuXjmWUaLVHy1VGyJ/wNxcextcxCApjncfHPF7aczG8FJ2fe0VLC40xdHuhwOWuBaLCOLtA6npchzgbPHC4jw7oueAOEz4jHxH+jF3N2Q2+HiX1x0CQfk17hp5PIgoNfopVUjzKRPvtdaKK8PdgI0+GdFrYSZiwRbdRl2JicFEzFRf9oIM1krOS5u5ztbhbTdJvV6ctJOvpc1d8lanl2lC6D6QBX69fw9PujYR7XoYXscLHOJGXHaLzVK/jvEgwl7Bp9jCzfMDRpU9Q== 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=hFMD1Z2BCUx0FSI30pgvCRbSNDd63BFMTWuw0BO5T2M=; b=bViTQ98HqZWD7fZH+L9dxjn0UomMA5yZ71+uWf+10uAvxlNTm7d3yQCiBEUo3jaT+nz6Yh6KGEVLvIAp+nFQC/SLEVfV6MnIMPytXizf4tf1fqRyAqvaq9bunD0kc6QB5K45/Li2JBgWwB1BhfxE3SmKsiWkYt245axWU8/pYwI= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:26 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:26 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Arthur Li , Alex Nemirovsky , Peng Fan Subject: [PATCH v5 1/8] mmc: ca_dw_mmc: Misc cleanup of driver Date: Thu, 16 Apr 2020 18:38:02 -0700 Message-Id: <1587087489-6561-2-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:24 +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: 9364ae11-e93c-45c9-bd6e-08d7e2700583 X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:2512; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: Hq/ocIgC73tJ0H77AmW0KCLAVR+qMOEHfHv1NZ+SJHQ+QTAX2GBseUecaWTCwteLJMu8ULqX7bnglQ/lQ3zOUBkkieU2sMuS8wYoO+de2Lz81rVzxwuvk7uH3gD5CN+DzTv1VgCzCxshD2eHkk+7H+JU9qVwkbPZ/eME780qkbtvZk9VmKjAL9yWKrZmauua5b+D/fWE0uurmPWRvNFCT4RQFSNCO6R1V3ZRUQrPi868fbQ7z419o7GsarEujhry1PGSr9d5KtJCE+SFH1EhlP5/978dH/8IcrK4z0SXXB1yIfKQCS/hNqWUDlcO1mBWT+QTjDDWjb/EqCpIYXb1I7QoQYplUsiFbHz02HY8P9nTFE9m4u/D1oR53NAInlpKu8eR1gC5tanRlGDR5aEQihOx4vDKdubtkTolL1xZ0V2ClqNRORUeMFQTimf4dBjG X-MS-Exchange-AntiSpam-MessageData: OOLqU4wKH14isWamBLnJKeBc2v0t5cewjsREDtvVjpSPUpBRw6YYP8K5MOGtGfbP4+ZyH/SV9ZTrCMUy4BPYa8U2Xpg8Gs9ACO3aC1/qTgOZfLqW3CotmTo7kR+3WayzI4CXCW9oD1quPgIqs0JGEA== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 9364ae11-e93c-45c9-bd6e-08d7e2700583 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:25.9025 (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: ogEwDY+dg57Bx3ksiE17euDyvoy9V3iGTvbj8elzecW0Zl/nc8blfhfpnrJHuW6YH5A39iGLVp+dvGIFcC68uDhSW1s0XvpK8rW78ll8RORxfXXezoV2XBPTgn7lrFdJ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 From: Arthur Li - Rename DT compatible name - Remove uneccessary if-statement to support 8-bit buswidth - Remove redundant error msg - Use symbolic constants in switch statement Signed-off-by: Arthur Li Signed-off-by: Alex Nemirovsky CC: Peng Fan --- Changes in v5: - Rebase code basis on v2020.04-rc5 which has already incorporated CAxxxx eMMC initial baseline Changes in v4: - Rename DT compatible name - Remove uneccessary if-statement to support 8-bit buswidth - Remove redundant error msg - Use symbolic constants in switch statement Changes in v3: None Changes in v2: - Add I2C controller - Add LED controller - Add SPI NAND and NOR controller drivers/mmc/ca_dw_mmc.c | 34 ++++++++++++---------------------- 1 file changed, 12 insertions(+), 22 deletions(-) diff --git a/drivers/mmc/ca_dw_mmc.c b/drivers/mmc/ca_dw_mmc.c index acbc850..198c41f 100644 --- a/drivers/mmc/ca_dw_mmc.c +++ b/drivers/mmc/ca_dw_mmc.c @@ -19,6 +19,7 @@ #define SD_CLK_SEL_200MHZ (0x2) #define SD_CLK_SEL_100MHZ (0x1) +#define SD_CLK_SEL_50MHZ (0x0) #define IO_DRV_SD_DS_OFFSET (16) #define IO_DRV_SD_DS_MASK (0xff << IO_DRV_SD_DS_OFFSET) @@ -44,15 +45,11 @@ static void ca_dwmci_clksel(struct dwmci_host *host) struct ca_dwmmc_priv_data *priv = host->priv; u32 val = readl(priv->sd_dll_reg); - if (host->bus_hz >= 200000000) { - val &= ~SD_CLK_SEL_MASK; + val &= ~SD_CLK_SEL_MASK; + if (host->bus_hz >= 200000000) val |= SD_CLK_SEL_200MHZ; - } else if (host->bus_hz >= 100000000) { - val &= ~SD_CLK_SEL_MASK; + else if (host->bus_hz >= 100000000) val |= SD_CLK_SEL_100MHZ; - } else { - val &= ~SD_CLK_SEL_MASK; - } writel(val, priv->sd_dll_reg); } @@ -77,14 +74,14 @@ unsigned int ca_dwmci_get_mmc_clock(struct dwmci_host *host, uint freq) u8 clk_div; switch (sd_clk_sel) { - case 2: - clk_div = 1; + case SD_CLK_SEL_50MHZ: + clk_div = 4; break; - case 1: + case SD_CLK_SEL_100MHZ: clk_div = 2; break; default: - clk_div = 4; + clk_div = 1; } return SD_SCLK_MAX / clk_div / (host->div + 1); @@ -100,9 +97,6 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev) host->dev_index = 0; host->buswidth = dev_read_u32_default(dev, "bus-width", 1); - if (host->buswidth != 1 && host->buswidth != 4) - return -EINVAL; - host->bus_hz = dev_read_u32_default(dev, "max-frequency", 50000000); priv->ds = dev_read_u32_default(dev, "io_ds", 0x33); host->fifo_mode = dev_read_bool(dev, "fifo-mode"); @@ -118,10 +112,8 @@ static int ca_dwmmc_ofdata_to_platdata(struct udevice *dev) return -EINVAL; host->ioaddr = dev_read_addr_ptr(dev); - if (host->ioaddr == (void *)FDT_ADDR_T_NONE) { - printf("DWMMC: base address is invalid\n"); + if (!host->ioaddr) return -EINVAL; - } host->priv = priv; @@ -140,10 +132,8 @@ static int ca_dwmmc_probe(struct udevice *dev) memcpy(&ca_dwmci_dm_ops, &dm_dwmci_ops, sizeof(struct dm_mmc_ops)); dwmci_setup_cfg(&plat->cfg, host, host->bus_hz, MIN_FREQ); - if (host->buswidth == 1) { - (&plat->cfg)->host_caps &= ~MMC_MODE_8BIT; - (&plat->cfg)->host_caps &= ~MMC_MODE_4BIT; - } + if (host->buswidth == 1) + (&plat->cfg)->host_caps &= ~(MMC_MODE_8BIT | MMC_MODE_4BIT); host->mmc = &plat->mmc; host->mmc->priv = &priv->host; @@ -164,7 +154,7 @@ static int ca_dwmmc_bind(struct udevice *dev) } static const struct udevice_id ca_dwmmc_ids[] = { - { .compatible = "snps,dw-cortina" }, + { .compatible = "cortina,ca-mmc" }, { } }; From patchwork Fri Apr 17 01:38:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271967 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=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=ESjYVbTV; 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 493Jfp4yNdz9sQx for ; Fri, 17 Apr 2020 11:39:30 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DD8E081A0D; Fri, 17 Apr 2020 03:39:04 +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="ESjYVbTV"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 182CF804D5; Fri, 17 Apr 2020 03:38:39 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 A2988804D5 for ; Fri, 17 Apr 2020 03:38:31 +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=adXdNr60Ij/nmnQhtNvbouPjTywR3XjIRLFSNvDle8+RvexjbUIfmOGok/K6nmarEzt7QOZB3E7ZGOrt67ZjoFC6Rnzk1UqvhBZX0TiND3HEI0OEfckGA7XIHnjH96IoAW4ACOzJW2UAy0CfLhgXIfAdUntU84XfF1o4ZL48gW3opsc6DP4O37A4+pTNOX83bfZPJ2UZkTdq/FdCgujVn5l15G/jh4X3EP0zLbOeej1oXTgAEN5M9yc1AJtx/ZxHN6271u4TP4hakO7v47h+39VQxrsHZT7XbUwec3dK+R/g0FpJQFzIshZ2x7MM0p/2vGQrXL+ujFAArCRfor86YA== 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=gKhAmoFB6V5aPS1dQapmQlkq7WvEuPYHdnYRvFVn1T8=; b=KFPjWCp7yU8zDOOxOae+rZpGIU3CRRxSP5g9hc63m40bihw+h1vgzNqQcfhHLtiLVfBE3ysViFzRqYjfv8Hp5H40gyiQqW5/TGTzPIZTyONnsSvd7B+KIyiCajl28xv/0fvjlzbNcm3RegvhHiqZ0GuGrqGz6o/fhd4fe6y7c+2Go3+v5Wz9PyKctKuBZc4rPtNADGyjSNqtmVVSHbTmODJLSd3PVUyU0NBnJnY1x3J/3OJgvswAz6PIHstZn+89IPDo7+0vA83dm77j0cBygmmxdNSc7EEzcD5bDORc9klF6NtcOvnroU31T9C84FE41fLJx9KPq5j0zgD/NqHgiA== 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=gKhAmoFB6V5aPS1dQapmQlkq7WvEuPYHdnYRvFVn1T8=; b=ESjYVbTVZjPnEgr3VXidwl3Li5auSjM/Si2BR3C9OanTTua+3nbuapfY0DnuAItD+5NZbj90+BN6SbYZaDZoCJbNjWn6d+sK01DzjtLJP3wZqTKomgSCQ+CyUbHSjOxzuKwhi0hNfYZyoXQZZ7tqsU63vEdD+Ds1F00HeyieYTc= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:27 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:27 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Peng Fan Subject: [PATCH v5 2/8] board: presidio-asic: update eMMC DT informatino Date: Thu, 16 Apr 2020 18:38:03 -0700 Message-Id: <1587087489-6561-3-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:26 +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: 2e44f184-7fee-4349-e687-08d7e2700699 X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:2657; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: 3PGLBH2TdLuEquZbqbASvC4xzjMzG1GuUr6EL5IQbs8gcO4gS9dHZkZ1wqfqBQng9rtosy9utcgyi/IC9rBAJOTZNKgs5z0+x7tgsHKRhp9UDhMl3vQ33T98uE+G+BNLGL0/KaJcloSj7yR0KreR0s6Q/FMuUsrMsFB5GWc34YkcWjcrZzB6mnanpz+mSpOdM0HDIJ0e4luZd80d9qcowtSXs/4DwYk2/tBGccQublk2w07mVrWr3APsIvH5CxyBbkFokKp5BRwYwGCaisfJPazs5SbwR1rHvCjSsIY4tFbd06k8rrlk0+N1ZTchZuwySKoHuvElQ3Ymbr0a75xMgHE9ouELeRYp19P9wV99byCSWRmACGkib+e70r/g+MToAvcYnjtU/CTEThfL6N3t7FHkIR0OEKGh0moxMjpbqFg9H+BsFVvvmokUsTG9MIXo X-MS-Exchange-AntiSpam-MessageData: xOmoYSE+F0zNqS26bzMwGbYWvf2eVXMGSKzNGsXYocMu0veY3UgguIs2nGQ6XuDM6tT3MRdgidGwGEYgGBEa15gp7vm7fLQCSROfmzNVR9L9Ubk4uFAzf0341uZWnrYhlWo6GY2h3a8ZqTPYcyhzRQ== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 2e44f184-7fee-4349-e687-08d7e2700699 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:27.5136 (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: zUZByjQ2bdNG+puHdKwov9VBQD9jmm6uJOTO5HP4nAYZiWCDMdK6GDqOTgGb3MawMrlcJDebB4CucgxT+iz3KOJaMCYPCIYXbq4oaYruYXj0toyssArtVV8QLEwN/tI/ X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 Change DT compatiblity name to match change in driver's name. Remove unused io_ds and fifo_mode fields from DT. Signed-off-by: Alex Nemirovsky CC: Peng Fan --- Changes in v5: - Rebase on codebase basis v2020.04-rc5 which already incorporated initial baseline of eMMC DT information Changes in v4: - Change DT compatiblity name to match change in driver's name - Remove unused io_ds and fifo_mode fields from DT Changes in v3: None Changes in v2: None arch/arm/dts/ca-presidio-engboard.dts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts index c03dacc..40c93d7 100644 --- a/arch/arm/dts/ca-presidio-engboard.dts +++ b/arch/arm/dts/ca-presidio-engboard.dts @@ -10,11 +10,9 @@ #size-cells = <1>; mmc0: mmc@f4400000 { - compatible = "snps,dw-cortina"; + compatible = "cortina,ca-mmc"; reg = <0x0 0xf4400000 0x1000>; bus-width = <4>; - io_ds = <0x77>; - fifo-mode; sd_dll_ctrl = <0xf43200e8>; io_drv_ctrl = <0xf432004c>; }; From patchwork Fri Apr 17 01:38:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271968 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=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=BcYoHJpi; 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 493Jg301MDz9sQx for ; Fri, 17 Apr 2020 11:39:42 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 4420781A30; Fri, 17 Apr 2020 03:39:12 +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="BcYoHJpi"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 605C4819FD; Fri, 17 Apr 2020 03:38:42 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 7D80C80574 for ; Fri, 17 Apr 2020 03:38:32 +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=gO93eAkGaKJzVtUf7mQ+PfoMpx+2tigvkYDDYOhP4WsnzXwXUC/qsa0vIz2/tYSH2ZtJXbXsctwzgl1azKSPNGKH5uFQzGywuqDxDYn/5L3FV5+YnV74G4HzzOmvrKtcyu5SN9o6J0ZsGj/6T6t9IJSjxcZRYQ57RilrPKbg890HPloAssi0g4RBUYH8EY8564RXVkFr58Tidthh6cMXdHDMrGgJEq5gFUhvyRgiE/gPoFwfJgonJxQJ25AzAKd2SWog+vZ3XKkjb+ztnYmJOaZ75hyDWyD82hG/u2pPEAnxVe1f/hQc5nzn+07IEmgyVC+U1qxEJEsbtp8wGW4PTA== 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=Be32QQS0xjvsYfzKGeY4n8m/Cqh89bKSh54bsF994js=; b=Hjs0r+/jCqBrB7o0n6jOc/xXiMhPnP9HczoLRTMKrrj84CZU4XW2RSFw7k4y6oiYpVfI6bTvvMT1nyT9gQY7xbSSA/jJOtusogEAq8pbqtJK26IN/7zYcy71pT5o/zfZZl4DV1P00KxC+1HNhIWq/9adNehdGaU6TLmAWHCfh0eExZBoGBdviuYhjQWbnvaBKbQxedSE1yncoipbPKCQN4jhC67ioPNoYlVLb9V21wKxN8sAZSmFNB786XF1imXAWArrhl+cuHp4I8AppkPKbAaGuX102LI7H2HjPCTZOmLQUj1mNI0G0pxgbpUw2j3iv8jcZlUqcAlE31KsQKUA7Q== 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=Be32QQS0xjvsYfzKGeY4n8m/Cqh89bKSh54bsF994js=; b=BcYoHJpizhQAYRMavh/OzLfZ3weTT7j0kzIXJgAd/StGqruae10qcCEGQ6meYMbKux5hHwEO7umM2C9uQJV/Ynuj4PjePbBXGm5pdFeRRtPX2tgqHZ66Ovtvfywv5f1GYZrgnoWUiYlmM4+CPkM9OjGQ8fjbYhnnryKsBL412W8= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:29 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:29 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Arthur Li , Alex Nemirovsky , Heiko Schocher Subject: [PATCH v5 3/8] i2c: i2c-cortina: added CAxxxx I2C support Date: Thu, 16 Apr 2020 18:38:04 -0700 Message-Id: <1587087489-6561-4-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:27 +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: e3895f23-0956-40cd-036f-08d7e27007a4 X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:1051; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(30864003)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: DOu0UccdC4quYD+b1/0lwtD0pXFkSxtWcLiudjYoPO9nOcOxGy7JTPejNnfUHT19gLH+FF9pj61QsGboe9VUOebXjR9mRaiAqQw1ILpkOZct1dDcSkGW77BWqn2X8z+0HKTmkP6BrZAM78I+ZJVHYmBeU1RDnE2bmD7OGbebLJOG9bnA8Or9iGUC8llI5gx2ZfJc7DC1xK2dKI7VS940Fiezc7z3May4bsdtTrbE/bJ9F2hkngnLY9KXyySERvd1WlVXFRsgp6zQ1DKs6SwMTsvlCTZdj3Ysmxf57YX7qWzW6df+CWC4NeoNK3n0ZeHTzM9cjD98ESMMd1zWx/ySb6P52ALXps7axxkfyOD0OaTyCKLFzlZK1RrLZAoF5fIQJCgMo0O6C0H32QYsnKOVX3Ch2QvQbNZMgFucsTzRJBZ6e35Y61lt6kcpKZSm3wR9UCm5RgxYVVNXFyZO40xanU0xSuKmXNl+pDCoyGq+hPQjigRXnWFLK2iiuWIpZonpAZNHDcwd3rSpw0eA5Vpp8A== X-MS-Exchange-AntiSpam-MessageData: qycjgyIwXlCTNII2IEO3Krt0ESKheOE1dMukr1qPdeyvLcfLbYYordcZw7oNMV+Zwfy1pm5KpFK2eo8SoMjnERarexoHrofflidpQHzpx+PYj9xYpVdYzKnkLU4fFBnJx8xmrlfPVeoomWQ2lsEeOQ== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: e3895f23-0956-40cd-036f-08d7e27007a4 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:29.3345 (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: Tp6X1mBnjPEVc5Y3mvVVqqLSuYZhcbUdlZLsbETm/w7Q+Fddg/d0fzzEBqt37XhZnr/9bMsxUz8NDHzqyvSujhzBVr7lBscMnSbtykbEiuthMffsjDjVF6PvDgNq2Me6 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 From: Arthur Li Add I2C controller support for Cortina Access CAxxxx SoCs Signed-off-by: Arthur Li Signed-off-by: Alex Nemirovsky CC: Heiko Schocher Reviewed-by: Heiko Schocher --- Changes in v5: None Changes in v4: - Utilize standard I2C macros from - Return ETIMEDOUT in funcs that can timeout - Return i2c_xfer_init() result to caller of i2c_read() if it fails within i2c_read() execution - Fix misc. style guide conformance issues - Use printf() to report i2c_xfer() runtime errors instead of debug() Changes in v3: None Changes in v2: None MAINTAINERS | 4 + drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/i2c-cortina.c | 346 ++++++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/i2c-cortina.h | 84 +++++++++++ 5 files changed, 442 insertions(+) create mode 100644 drivers/i2c/i2c-cortina.c create mode 100644 drivers/i2c/i2c-cortina.h diff --git a/MAINTAINERS b/MAINTAINERS index b50652b..cc56ade 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -181,6 +181,8 @@ F: drivers/gpio/cortina_gpio.c F: drivers/watchdog/cortina_wdt.c F: drivers/serial/serial_cortina.c F: drivers/mmc/ca_dw_mmc.c +F: drivers/i2c/i2c-cortina.c +F: drivers/i2c/i2c-cortina.h ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun @@ -694,6 +696,8 @@ F: drivers/gpio/cortina_gpio.c F: drivers/watchdog/cortina_wdt.c F: drivers/serial/serial_cortina.c F: drivers/mmc/ca_dw_mmc.c +F: drivers/i2c/i2c-cortina.c +F: drivers/i2c/i2c-cortina.h MIPS MSCC M: Gregory CLEMENT diff --git a/drivers/i2c/Kconfig b/drivers/i2c/Kconfig index 03d2fed..b98a4aa 100644 --- a/drivers/i2c/Kconfig +++ b/drivers/i2c/Kconfig @@ -85,6 +85,13 @@ config SYS_I2C_CADENCE Say yes here to select Cadence I2C Host Controller. This controller is e.g. used by Xilinx Zynq. +config SYS_I2C_CA + tristate "Cortina-Access I2C Controller" + depends on DM_I2C && CORTINA_PLATFORM + default n + help + Say yes here to select Cortina-Access I2C Host Controller. + config SYS_I2C_DAVINCI bool "Davinci I2C Controller" depends on (ARCH_KEYSTONE || ARCH_DAVINCI) diff --git a/drivers/i2c/Makefile b/drivers/i2c/Makefile index f5a471f..5d18cf7 100644 --- a/drivers/i2c/Makefile +++ b/drivers/i2c/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_SYS_I2C) += i2c_core.o obj-$(CONFIG_SYS_I2C_ASPEED) += ast_i2c.o obj-$(CONFIG_SYS_I2C_AT91) += at91_i2c.o obj-$(CONFIG_SYS_I2C_CADENCE) += i2c-cdns.o +obj-$(CONFIG_SYS_I2C_CA) += i2c-cortina.o obj-$(CONFIG_SYS_I2C_DAVINCI) += davinci_i2c.o obj-$(CONFIG_SYS_I2C_DW) += designware_i2c.o ifdef CONFIG_DM_PCI diff --git a/drivers/i2c/i2c-cortina.c b/drivers/i2c/i2c-cortina.c new file mode 100644 index 0000000..08b812a --- /dev/null +++ b/drivers/i2c/i2c-cortina.c @@ -0,0 +1,346 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2020 + * Arthur Li, Cortina Access, arthur.li@cortina-access.com. + */ + +#include +#include +#include +#include +#include +#include "i2c-cortina.h" + +static void set_speed(struct i2c_regs *regs, int i2c_spd) +{ + union ca_biw_cfg i2c_cfg; + + i2c_cfg.wrd = readl(®s->i2c_cfg); + i2c_cfg.bf.core_en = 0; + writel(i2c_cfg.wrd, ®s->i2c_cfg); + + switch (i2c_spd) { + case IC_SPEED_MODE_FAST_PLUS: + i2c_cfg.bf.prer = CORTINA_PER_IO_FREQ / + (5 * I2C_SPEED_FAST_PLUS_RATE) - 1; + break; + + case IC_SPEED_MODE_STANDARD: + i2c_cfg.bf.prer = CORTINA_PER_IO_FREQ / + (5 * I2C_SPEED_STANDARD_RATE) - 1; + break; + + case IC_SPEED_MODE_FAST: + default: + i2c_cfg.bf.prer = CORTINA_PER_IO_FREQ / + (5 * I2C_SPEED_FAST_RATE) - 1; + break; + } + + i2c_cfg.bf.core_en = 1; + writel(i2c_cfg.wrd, ®s->i2c_cfg); +} + +static int ca_i2c_set_bus_speed(struct udevice *bus, unsigned int speed) +{ + struct ca_i2c *priv = dev_get_priv(bus); + int i2c_spd; + + if (speed >= I2C_SPEED_FAST_PLUS_RATE) { + i2c_spd = IC_SPEED_MODE_FAST_PLUS; + priv->speed = I2C_SPEED_FAST_PLUS_RATE; + } else if (speed >= I2C_SPEED_FAST_RATE) { + i2c_spd = IC_SPEED_MODE_FAST; + priv->speed = I2C_SPEED_FAST_RATE; + } else { + i2c_spd = IC_SPEED_MODE_STANDARD; + priv->speed = I2C_SPEED_STANDARD_RATE; + } + + set_speed(priv->regs, i2c_spd); + + return 0; +} + +static int ca_i2c_get_bus_speed(struct udevice *bus) +{ + struct ca_i2c *priv = dev_get_priv(bus); + + return priv->speed; +} + +static void ca_i2c_init(struct i2c_regs *regs) +{ + union ca_biw_cfg i2c_cfg; + + i2c_cfg.wrd = readl(®s->i2c_cfg); + i2c_cfg.bf.core_en = 0; + i2c_cfg.bf.biw_soft_reset = 1; + writel(i2c_cfg.wrd, ®s->i2c_cfg); + mdelay(10); + i2c_cfg.bf.biw_soft_reset = 0; + writel(i2c_cfg.wrd, ®s->i2c_cfg); + + set_speed(regs, IC_SPEED_MODE_STANDARD); + + i2c_cfg.wrd = readl(®s->i2c_cfg); + i2c_cfg.bf.core_en = 1; + writel(i2c_cfg.wrd, ®s->i2c_cfg); +} + +static int i2c_wait_complete(struct i2c_regs *regs) +{ + union ca_biw_ctrl i2c_ctrl; + unsigned long start_time_bb = get_timer(0); + + i2c_ctrl.wrd = readl(®s->i2c_ctrl); + + while (i2c_ctrl.bf.biwdone == 0) { + i2c_ctrl.wrd = readl(®s->i2c_ctrl); + + if (get_timer(start_time_bb) > + (unsigned long)(I2C_BYTE_TO_BB)) { + printf("%s not done!!!\n", __func__); + return -ETIMEDOUT; + } + } + + /* Clear done bit */ + writel(i2c_ctrl.wrd, ®s->i2c_ctrl); + + return 0; +} + +static void i2c_setaddress(struct i2c_regs *regs, unsigned int i2c_addr, + int write_read) +{ + writel(i2c_addr | write_read, ®s->i2c_txr); + + writel(BIW_CTRL_START | BIW_CTRL_WRITE, + ®s->i2c_ctrl); + + i2c_wait_complete(regs); +} + +static int i2c_wait_for_bus_busy(struct i2c_regs *regs) +{ + union ca_biw_ack i2c_ack; + unsigned long start_time_bb = get_timer(0); + + i2c_ack.wrd = readl(®s->i2c_ack); + + while (i2c_ack.bf.biw_busy) { + i2c_ack.wrd = readl(®s->i2c_ack); + + if (get_timer(start_time_bb) > + (unsigned long)(I2C_BYTE_TO_BB)) { + printf("%s: timeout!\n", __func__); + return -ETIMEDOUT; + } + } + + return 0; +} + +static int i2c_xfer_init(struct i2c_regs *regs, uint8_t chip, uint addr, + int alen, int write_read) +{ + int addr_len = alen; + + if (i2c_wait_for_bus_busy(regs)) + return 1; + + /* First cycle must write addr + offset */ + chip = ((chip & 0x7F) << 1); + if (alen == 0 && write_read == I2C_CMD_RD) + i2c_setaddress(regs, chip, I2C_CMD_RD); + else + i2c_setaddress(regs, chip, I2C_CMD_WT); + + while (alen) { + alen--; + writel(addr, ®s->i2c_txr); + if (write_read == I2C_CMD_RD) + writel(BIW_CTRL_WRITE | BIW_CTRL_STOP, + ®s->i2c_ctrl); + else + writel(BIW_CTRL_WRITE, ®s->i2c_ctrl); + i2c_wait_complete(regs); + } + + /* Send address again with Read flag if it's read command */ + if (write_read == I2C_CMD_RD && addr_len > 0) + i2c_setaddress(regs, chip, I2C_CMD_RD); + + return 0; +} + +static int i2c_xfer_finish(struct i2c_regs *regs) +{ + /* Dummy read makes bus free */ + writel(BIW_CTRL_READ | BIW_CTRL_STOP, ®s->i2c_ctrl); + i2c_wait_complete(regs); + + if (i2c_wait_for_bus_busy(regs)) { + printf("Timed out waiting for bus\n"); + return -ETIMEDOUT; + } + + return 0; +} + +static int ca_i2c_read(struct i2c_regs *regs, uint8_t chip, uint addr, + int alen, uint8_t *buffer, int len) +{ + unsigned long start_time_rx; + int rc = 0; + + rc = i2c_xfer_init(regs, chip, addr, alen, I2C_CMD_RD); + if (rc) + return rc; + + start_time_rx = get_timer(0); + while (len) { + /* ACK_IN is ack value to send during read. + * ack high only on the very last byte! + */ + if (len == 1) + writel(BIW_CTRL_READ | BIW_CTRL_ACK_IN | BIW_CTRL_STOP, + ®s->i2c_ctrl); + else + writel(BIW_CTRL_READ, ®s->i2c_ctrl); + + rc = i2c_wait_complete(regs); + udelay(1); + + if (rc == 0) { + *buffer++ = + (uchar) readl(®s->i2c_rxr); + len--; + start_time_rx = get_timer(0); + + } else if (get_timer(start_time_rx) > I2C_BYTE_TO) { + return -ETIMEDOUT; + } + } + i2c_xfer_finish(regs); + return rc; +} + +static int ca_i2c_write(struct i2c_regs *regs, uint8_t chip, uint addr, + int alen, uint8_t *buffer, int len) +{ + int rc, nb = len; + unsigned long start_time_tx; + + rc = i2c_xfer_init(regs, chip, addr, alen, I2C_CMD_WT); + if (rc) + return rc; + + start_time_tx = get_timer(0); + while (len) { + writel(*buffer, ®s->i2c_txr); + if (len == 1) + writel(BIW_CTRL_WRITE | BIW_CTRL_STOP, + ®s->i2c_ctrl); + else + writel(BIW_CTRL_WRITE, ®s->i2c_ctrl); + + rc = i2c_wait_complete(regs); + + if (rc == 0) { + len--; + buffer++; + start_time_tx = get_timer(0); + } else if (get_timer(start_time_tx) > (nb * I2C_BYTE_TO)) { + return -ETIMEDOUT; + } + } + + return 0; +} + +static int ca_i2c_probe_chip(struct udevice *bus, uint chip_addr, + uint chip_flags) +{ + struct ca_i2c *priv = dev_get_priv(bus); + int ret; + u32 tmp; + + /* Try to read the first location of the chip */ + ret = ca_i2c_read(priv->regs, chip_addr, 0, 1, (uchar *)&tmp, 1); + if (ret) + ca_i2c_init(priv->regs); + + return ret; +} + +static int ca_i2c_xfer(struct udevice *bus, struct i2c_msg *msg, int nmsgs) +{ + struct ca_i2c *priv = dev_get_priv(bus); + int ret; + + debug("i2c_xfer: %d messages\n", nmsgs); + for (; nmsgs > 0; nmsgs--, msg++) { + debug("i2c_xfer: chip=0x%x, len=0x%x\n", msg->addr, msg->len); + if (msg->flags & I2C_M_RD) + ret = ca_i2c_read(priv->regs, msg->addr, 0, 0, + msg->buf, msg->len); + else + ret = ca_i2c_write(priv->regs, msg->addr, 0, 0, + msg->buf, msg->len); + + if (ret) { + printf("i2c_xfer: %s error\n", + msg->flags & I2C_M_RD ? "read" : "write"); + return ret; + } + } + + return 0; +} + +static const struct dm_i2c_ops ca_i2c_ops = { + .xfer = ca_i2c_xfer, + .probe_chip = ca_i2c_probe_chip, + .set_bus_speed = ca_i2c_set_bus_speed, + .get_bus_speed = ca_i2c_get_bus_speed, +}; + +static const struct udevice_id ca_i2c_ids[] = { + { .compatible = "cortina,ca-i2c", }, + { } +}; + +static int ca_i2c_probe(struct udevice *bus) +{ + struct ca_i2c *priv = dev_get_priv(bus); + + ca_i2c_init(priv->regs); + + return 0; +} + +static int ca_i2c_ofdata_to_platdata(struct udevice *bus) +{ + struct ca_i2c *priv = dev_get_priv(bus); + + priv->regs = map_sysmem(dev_read_addr(bus), sizeof(struct i2c_regs)); + if (!priv->regs) { + printf("I2C: base address is invalid\n"); + return -EINVAL; + } + + return 0; +} + +U_BOOT_DRIVER(i2c_cortina) = { + .name = "i2c_cortina", + .id = UCLASS_I2C, + .of_match = ca_i2c_ids, + .ofdata_to_platdata = ca_i2c_ofdata_to_platdata, + .probe = ca_i2c_probe, + .priv_auto_alloc_size = sizeof(struct ca_i2c), + .ops = &ca_i2c_ops, + .flags = DM_FLAG_PRE_RELOC, +}; diff --git a/drivers/i2c/i2c-cortina.h b/drivers/i2c/i2c-cortina.h new file mode 100644 index 0000000..2d46c4f --- /dev/null +++ b/drivers/i2c/i2c-cortina.h @@ -0,0 +1,84 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2019 + * Cortina Access, + */ + +#ifndef __CA_I2C_H_ +#define __CA_I2C_H_ + +#if !defined(__ASSEMBLER__) && !defined(__ASSEMBLY__) +struct i2c_regs { + u32 i2c_cfg; + u32 i2c_ctrl; + u32 i2c_txr; + u32 i2c_rxr; + u32 i2c_ack; + u32 i2c_ie0; + u32 i2c_int0; + u32 i2c_ie1; + u32 i2c_int1; + u32 i2c_stat; +}; + +union ca_biw_cfg { + struct biw_cfg { + u32 core_en : 1; + u32 biw_soft_reset : 1; + u32 busywait_en : 1; + u32 stretch_en : 1; + u32 arb_en : 1; + u32 clksync_en : 1; + u32 rsrvd1 : 2; + u32 spike_cnt : 4; + u32 rsrvd2 : 4; + u32 prer : 16; + } bf; + unsigned int wrd; +}; + +union ca_biw_ctrl { + struct biw_ctrl { + u32 biwdone : 1; + u32 rsrvd1 : 2; + u32 ack_in : 1; + u32 write : 1; + u32 read : 1; + u32 stop : 1; + u32 start : 1; + u32 rsrvd2 : 24; + } bf; + unsigned int wrd; +}; + +union ca_biw_ack { + struct biw_ack { + u32 al :1; + u32 biw_busy :1; + u32 ack_out :1; + u32 rsrvd1 :29; + } bf; + unsigned int wrd; +}; +#endif /* !__ASSEMBLER__*/ + +struct ca_i2c { + struct i2c_regs *regs; + unsigned int speed; +}; + +#define I2C_CMD_WT 0 +#define I2C_CMD_RD 1 + +#define BIW_CTRL_DONE BIT(0) +#define BIW_CTRL_ACK_IN BIT(3) +#define BIW_CTRL_WRITE BIT(4) +#define BIW_CTRL_READ BIT(5) +#define BIW_CTRL_STOP BIT(6) +#define BIW_CTRL_START BIT(7) + +#define I2C_BYTE_TO (CONFIG_SYS_HZ / 500) +#define I2C_STOPDET_TO (CONFIG_SYS_HZ / 500) +#define I2C_BYTE_TO_BB (10) + +#endif /* __CA_I2C_H_ */ From patchwork Fri Apr 17 01:38:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271966 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=q/W4o8sJ; 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 493Jfb52D0z9sQx for ; Fri, 17 Apr 2020 11:39:19 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 5F01581A08; Fri, 17 Apr 2020 03:38:57 +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="q/W4o8sJ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C302F819FA; Fri, 17 Apr 2020 03:38:39 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 5D41280652 for ; Fri, 17 Apr 2020 03:38:33 +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=O/JyYbKlXpjkzR5D7NgqwGVOXEswnjiwdS2R10JXPNa7VUub5+p9rABu6ZBh2KSsRiYZF3NDlZHHsW7jFX0ugcgQ48BwN0mF/tNUb4X86Pwm6lWbdCRU0PApec/x0Q/YID9iehS4AxbgLAzCMv3cigx1p+z4dZ+SlhSvGWtjgm0AiLu4sW0SMfkiUxCIWkchI+mBEeySLxYFM+YLlbHlq+kg9LFihWSl66oWBZ9FOo9PyOqiKk6E3VM/Lwl9lfAO2dZTCK5jJZhTAadKHAv+q8pngiTQTNqxPH+q1xsvV/POkSl72KouV2lzKFi8U9mSpKK9RNIzRYLNa5FI6DduWA== 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=37Ljowls689VkFbKIc+1n+w4ePEzX0Bl55vf8q1dJro=; b=JpQZKW8o2mmqDJ9xFA/P6fvz3M7e+Id2qCxUTljCTLjd/CN12PTXaJtk3nZbvyifEYiX5gNGDgi5ZWwkjb+43zlUx1bKS2AIOGi8bgdd160CNreCoMWgDkfTJytz6JALt1ZprcIjRPkqrldW6KwSNdj1twVq80JnaqXbsH65ksy9BgXuwOJJBC+iubFz3fK4EsZQiGfKvyGhoqBBrHodPuJFNr9QnhJxWSuHoX+x3/FmZruqd4ShakCHrXzsc966tCSKy3qIz3B5/ViK26aDh6ogbqlmw7M0gmERLLn20f6yJt9bmGq46E5QnkrosyZ6JPwsjoE5FlwG1s38wJRJ+A== 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=37Ljowls689VkFbKIc+1n+w4ePEzX0Bl55vf8q1dJro=; b=q/W4o8sJ4Mm8y3r9bNRElZIcvTo/CvvwiSPihuz3aS+QPe7H/TETtvk9AAPnJS+fRcPAbxEjs6FLnBu1WzqH+0cygNf/BlLLE/wfxdGtucvv8HvHM/5isIOD35BsrbRfEB5sRasCw3K2W8Y+RqUNSgwdsc5NDFsnZc26hoeliHk= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:31 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:31 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Heiko Schocher Subject: [PATCH v5 4/8] board: presidio-asic: Add I2C support Date: Thu, 16 Apr 2020 18:38:05 -0700 Message-Id: <1587087489-6561-5-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:29 +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: e45af4da-1116-42c3-f57c-08d7e27008a6 X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:2958; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002)(4744005); DIR:OUT; SFP:1101; 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: 0RYNIJwTzTUYpwUhshtH98GAngIdY+lQkV/Ea1eZ+l5eImusxx9R3N6yylNDnmm4Rb8/GCFkZkAUjJ8Aw/yNKhGhS5+u+iGXpwOaimAHBNh5vnEZbdqZ9gG51MFdFDS+WW0XF6vZoE2uigUHPmvZHOol4scFXR/CejJeshsBcsqm3fEOegTvu1oIEVxQku46jzwDsrSN8fW6qZqdL/aQfA58sqQx7yjhZ8fKpfdvFcmJIM6dnPlWtoIOZK2Fd+OIoTsHTnF668V1niyG/sVppGXCDf3mV68G0JvrI6l2XdK1+qC1A37Ob0nsnQz6B8Cwjf1jLq2NMWsfCgTbuBPvtdsDjzrQvvZee4aXTcuydnbVUTRzoQmYsEUEnsd7QEfWOLEO/h+d/mpIi4FZJ413EB2ewU1botylKw/5SA1bvxjrJkmFjziUalu7tw5uvjo5 X-MS-Exchange-AntiSpam-MessageData: PCtbr3K/0O3IhEyDNcRBHEkiT7rVpxw1qH6N2JXqBc8z5JhUWwuiez4NGiGDT1/HjXNOiVOAqqx0t0Go5oqAV2vzc/REjpP28nzy04g/kvCGVpozBtLYIbrNKQYoyuWP4Rou3I5ru44/yknKcKw2jQ== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: e45af4da-1116-42c3-f57c-08d7e27008a6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:31.0165 (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: SzHCD3/C0WKaTTWn2SX6dggP3QJnCa1SDD69XmaEkg2N5edRPBNBWMFJnZHSmHDqPrivXbrMQSpX1rR3iFBwAZO+jvQxzOhI97RT3A9Qxck40RQrltjmntnHjH7xxkFm X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 I2C board support for Cortina Access Presidio Engineering Board Signed-off-by: Alex Nemirovsky CC: Heiko Schocher Reviewed-by: Heiko Schocher --- Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None configs/cortina_presidio-asic-emmc_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig index e10008a..e45e23c 100644 --- a/configs/cortina_presidio-asic-emmc_defconfig +++ b/configs/cortina_presidio-asic-emmc_defconfig @@ -10,6 +10,7 @@ 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_PART=y CONFIG_CMD_WDT=y @@ -24,6 +25,8 @@ 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 From patchwork Fri Apr 17 01:38:06 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271969 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=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=Og6eVMAp; 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 493JgF5f45z9sQx for ; Fri, 17 Apr 2020 11:39:53 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 87DFB81A07; Fri, 17 Apr 2020 03:39: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=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="Og6eVMAp"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9C22F81A08; Fri, 17 Apr 2020 03:38:41 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 5E4BB805A0 for ; Fri, 17 Apr 2020 03:38:34 +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=gpqQXrz42oJFleP6pFzcErbd+ka2+hWSHld5We946yUBdiiIsoEEKe41u2k4R9taoSNR5R0CVwyPRkymN58Qb/vzPiDpAu8gEC9/DAKTtwmEzY3vicakH+mubA8hoKNerPk4EmMSCrgQp7/4ajlqnuhD6SEDrppuFxxOKI7kjbQIzo/pdZLUzoe36t1SUYi+Q8gUmr9j5myNAbhd0cbJ9qdoaRMDshf4VnIRXVKDjPaLdXNSawkZfpgpr1qWbb1rur2w4zW/2I3V56A0AGJUteQ6Xmmy1M9orwDHTTyw9b9ZGfZFATmatiLUpUJROyq7YlpnKkFwwnGX/FzOu3dcGA== 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=OQVacIfUySAN/K/RsrurReftVOV1dV3IqDnZOYlG7ZM=; b=CBxaTs+fAOuHTDx7Zude7Q829GKH8efAuP77Rldm74Zb7b1WA4c/4QUUh25QIg2gyhcxTwhB9RV/XXW3xHbR9j2TioXjLuSjns1+dr0sDUOPpi7Wuyi/1EN168q7dMGyq+pGand1/MkRGAfKuyQvxUwstujM9iftDWkE4zhGRLbuTiTaNaH8neqDXNA3GIRzSulk00zFwX8Hcwo4ANnndnoc+GqzhWDRHTCwCyNoKfqfuOAjkzosFP0x5kdMvy5VZu+CKaEVh/ivtPNH9fUndTyOOm6snQEQSpXH4bZIJ1gfLRtluY8VMixBa6mqufOUaEn6X1RQ9oHOVpUJ46KoQA== 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=OQVacIfUySAN/K/RsrurReftVOV1dV3IqDnZOYlG7ZM=; b=Og6eVMApqxB38j0nqHcgnG/qgPm8F+RxOqM5+Hk7fR9EqCUrg3uOWNdz/59Wyy5b1BC2SnQUBCQFNOezYLjOMaQW9N14XQVpl7nUgSGMLNUQt5WfYxRreAc1bzC1Y5AHUaAFA4KwLuofnMaabbdgL+Zt4awjW+SrhNwTkeO+Zgs= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:32 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:32 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Jway Lin , Alex Nemirovsky , Simon Glass Subject: [PATCH v5 5/8] led: led_cortina: Add CAxxx LED support Date: Thu, 16 Apr 2020 18:38:06 -0700 Message-Id: <1587087489-6561-6-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:31 +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: 82f387c4-5818-4eeb-0083-08d7e27009b9 X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:192; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: SxYBYIuk9CZ9l/GfmlTLq2ojly+FOq/z+AUrFU8MnOcqgHrrBsj0Y5F6y5mt5hX9e3GPrDJSSHvI95h39ukbrE4xSuI8haO/T55rFpLxuwrms3lsypupfucTo5XDWmrrB4OA8ERexvKdvnLVqAVeCOnlMGxZsJPZKJY3sJjNzgQb+YxVPLY7xIB+RX9EMslS0ZWKBWIEslBwaxGliVhU6n0MEB6VwjPdQsL6JJblZnBzV1D96urTVGb+1iPM1KS7tPrWSTn1zmDOnQadZy/1dEmdDjKTwe9EaAwhjvGoZwhd2OnjWQJ2UqEtRohQLNBOL9zRUrENpF6H7pK5qUhGDFm3Od2PcZ1iKO/KriNd4a0803XbXBNz/5hDfnt//xLNXVe6q6QaGGP8Y+2UbafPpRs+StA28qS2pemRBpd7q2VKUFRE3v7z/fGW5LgigqS5 X-MS-Exchange-AntiSpam-MessageData: Xlbh0E4zHFjfOW8RoOcTLQz6m4MSh9U5PPZJ+ap5u4/aa7OzXw++6Zp4ixA4wXCNICS7YW3XN3JrewIgxfL4VyFi3fAeUxjaubaLRxjaprbo2pZd9unANS5FIWKGirlh3YKiusM1dI9bk166aSs5Dg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 82f387c4-5818-4eeb-0083-08d7e27009b9 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:32.7635 (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: 9dJmv/1MI5H2cEwrpXufMbednyGUu+Ln0ReX85frQBuswTkSDW1lpGwn968+VlwgtnOTeAAR/nJAX0SiI4sqAMkpTE8MPoAW+DRJ8pgBApzZ1Zu8cpOY5mN1YdVq3Q0Z X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 From: Jway Lin Add Cortina Access LED controller support for CAxxxx SOCs Signed-off-by: Jway Lin Signed-off-by: Alex Nemirovsky CC: Simon Glass --- Changes in v5: None Changes in v4: - remove unused macros - remove cortina prefix from macros - remove use BSS variable - further cleanup to meet code style guidelines - add additinal struct comments - rename DT blink rate symbol Changes in v3: None Changes in v2: None MAINTAINERS | 2 + drivers/led/Kconfig | 8 ++ drivers/led/Makefile | 1 + drivers/led/led_cortina.c | 268 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 279 insertions(+) create mode 100644 drivers/led/led_cortina.c diff --git a/MAINTAINERS b/MAINTAINERS index cc56ade..d812ce7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -183,6 +183,7 @@ F: drivers/serial/serial_cortina.c F: drivers/mmc/ca_dw_mmc.c F: drivers/i2c/i2c-cortina.c F: drivers/i2c/i2c-cortina.h +F: drivers/led/led_cortina.c ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun @@ -698,6 +699,7 @@ F: drivers/serial/serial_cortina.c F: drivers/mmc/ca_dw_mmc.c F: drivers/i2c/i2c-cortina.c F: drivers/i2c/i2c-cortina.h +F: drivers/led/led_cortina.c MIPS MSCC M: Gregory CLEMENT diff --git a/drivers/led/Kconfig b/drivers/led/Kconfig index 6675934..cc87fbf 100644 --- a/drivers/led/Kconfig +++ b/drivers/led/Kconfig @@ -35,6 +35,14 @@ config LED_BCM6858 This option enables support for LEDs connected to the BCM6858 HW has blinking capabilities and up to 32 LEDs can be controlled. +config LED_CORTINA + bool "LED Support for Cortina Access CAxxxx SoCs" + depends on LED && (CORTINA_PLATFORM) + help + This option enables support for LEDs connected to the Cortina + Access CAxxxx SOCs. + + config LED_BLINK bool "Support LED blinking" depends on LED diff --git a/drivers/led/Makefile b/drivers/led/Makefile index 3654dd3..8e3ae7f 100644 --- a/drivers/led/Makefile +++ b/drivers/led/Makefile @@ -8,3 +8,4 @@ obj-$(CONFIG_LED_BCM6328) += led_bcm6328.o obj-$(CONFIG_LED_BCM6358) += led_bcm6358.o obj-$(CONFIG_LED_BCM6858) += led_bcm6858.o obj-$(CONFIG_$(SPL_)LED_GPIO) += led_gpio.o +obj-$(CONFIG_LED_CORTINA) += led_cortina.o diff --git a/drivers/led/led_cortina.c b/drivers/led/led_cortina.c new file mode 100644 index 0000000..f873d30 --- /dev/null +++ b/drivers/led/led_cortina.c @@ -0,0 +1,268 @@ +// SPDX-License-Identifier: GPL-2.0+ + +/* + * Copyright (C) 2020 Cortina-Access + * Author: Jway Lin + * + */ + +#include +#include +#include +#include +#include +#include + +#define LED_MAX_HW_BLINK 127 +#define LED_MAX_COUNT 16 + +/* LED_CONTROL fields */ +#define LED_BLINK_RATE1_OFFSET 0 +#define LED_BLINK_RATE1_MASK 0xff +#define LED_BLINK_RATE2_OFFSET 8 +#define LED_BLINK_RATE2_MASK 0xff +#define LED_CLK_TEST BIT(16) +#define LED_CLK_POLARITY BIT(17) +#define LED_CLK_TEST_MODE BIT(16) +#define LED_CLK_TEST_RX_TEST BIT(30) +#define LED_CLK_TEST_TX_TEST BIT(31) + +/* LED_CONFIG fields */ +#define LED_EVENT_ON_OFFSET 0 +#define LED_EVENT_ON_MASK 0x7 +#define LED_EVENT_BLINK_OFFSET 3 +#define LED_EVENT_BLINK_MASK 0x7 +#define LED_EVENT_OFF_OFFSET 6 +#define LED_EVENT_OFF_MASK 0x7 +#define LED_OFF_ON_OFFSET 9 +#define LED_OFF_ON_MASK 0x3 +#define LED_PORT_OFFSET 11 +#define LED_PORT_MASK 0x7 +#define LED_OFF_VAL BIT(14) +#define LED_SW_EVENT BIT(15) +#define LED_BLINK_SEL BIT(16) + +/* LED_CONFIG structures */ +struct cortina_led_cfg { + void __iomem *regs; + int idx; + bool active_low; + int off_event; /* set led off event */ + int blink_event; /* set led blink event */ + int on_event; /* set led on event */ + int port; /* corresponding ethernet port */ + int blink; /* blink rate sel */ +}; + +static void cortina_led_write(void __iomem *reg, unsigned long data) +{ + writel(data, reg); +} + +static unsigned long cortina_led_read(void __iomem *reg) +{ + return readl(reg); +} + +static enum led_state_t cortina_led_get_state(struct udevice *dev) +{ + struct cortina_led_cfg *priv = dev_get_priv(dev); + enum led_state_t state = LEDST_OFF; + u32 val; + + val = readl(priv->regs); + + if (val & LED_SW_EVENT) + state = LEDST_ON; + + return state; +} + +static int cortina_led_set_state(struct udevice *dev, enum led_state_t state) +{ + u32 val; + struct cortina_led_cfg *priv = dev_get_priv(dev); + + val = readl(priv->regs); + + switch (state) { + case LEDST_OFF: + val &= ~LED_SW_EVENT; + val &= ~(LED_OFF_ON_MASK << LED_OFF_ON_OFFSET); + val |= 0x3 << LED_OFF_ON_OFFSET; + cortina_led_write(priv->regs, val); + break; + case LEDST_ON: + val |= LED_SW_EVENT; + val &= ~(LED_OFF_ON_MASK << LED_OFF_ON_OFFSET); + val |= 0x1 << LED_OFF_ON_OFFSET; + cortina_led_write(priv->regs, val); + break; + case LEDST_TOGGLE: + if (cortina_led_get_state(dev) == LEDST_OFF) + return cortina_led_set_state(dev, LEDST_ON); + else + return cortina_led_set_state(dev, LEDST_OFF); + break; + + default: + return -EINVAL; + } + + return 0; +} + +static const struct led_ops cortina_led_ops = { + .get_state = cortina_led_get_state, + .set_state = cortina_led_set_state, +}; + +static int cortina_led_probe(struct udevice *dev) +{ + struct led_uc_plat *uc_plat = dev_get_uclass_platdata(dev); + + /* Top-level LED node */ + if (!uc_plat->label) { + void __iomem *regs; + u32 reg_value, val; + u16 rate1, rate2; + + regs = dev_remap_addr(dev); + if (!regs) + return -EINVAL; + + reg_value = 0; + reg_value |= LED_CLK_POLARITY; + + rate1 = dev_read_u32_default(dev, "cortina,blink-rate1", 256); + rate2 = dev_read_u32_default(dev, "cortina,blink-rate2", 512); + + val = rate1 / 16 - 1; + rate1 = val > LED_MAX_HW_BLINK ? + LED_MAX_HW_BLINK : val; + reg_value |= (rate1 & LED_BLINK_RATE1_MASK) << + LED_BLINK_RATE1_OFFSET; + + val = rate2 / 16 - 1; + rate2 = val > LED_MAX_HW_BLINK ? + LED_MAX_HW_BLINK : val; + reg_value |= (rate2 & LED_BLINK_RATE2_MASK) << + LED_BLINK_RATE2_OFFSET; + + cortina_led_write(regs, reg_value); + + } else { + struct cortina_led_cfg *priv = dev_get_priv(dev); + void __iomem *regs; + u32 pin, val, blink, port, off_event, blink_event, on_event; + + regs = dev_remap_addr(dev_get_parent(dev)); + if (!regs) + return -EINVAL; + + pin = dev_read_u32_default(dev, "pin", LED_MAX_COUNT); + + if (pin >= LED_MAX_COUNT) + return -EINVAL; + + priv->regs = regs + 4 + pin * 4; + + val = cortina_led_read(priv->regs); + + if (dev_read_bool(dev, "active-low")) { + priv->active_low = true; + val |= LED_OFF_VAL; + } else { + priv->active_low = false; + val &= ~LED_OFF_VAL; + } + + blink = dev_read_u32_default(dev, "blink-sel", 0); + + if (blink == 0) { + priv->blink = 0; + val &= ~LED_BLINK_SEL; + } else if (blink == 1) { + priv->blink = 1; + val |= LED_BLINK_SEL; + } + + off_event = dev_read_u32_default(dev, "off-event", 3); + val &= ~(LED_EVENT_OFF_MASK << LED_EVENT_OFF_OFFSET); + if (off_event != 3) { + priv->off_event = off_event; + val |= BIT(off_event) << LED_EVENT_OFF_OFFSET; + } + + blink_event = dev_read_u32_default(dev, "blink-event", 3); + val &= ~(LED_EVENT_BLINK_MASK << LED_EVENT_BLINK_OFFSET); + if (blink_event != 3) { + priv->blink_event = blink_event; + val |= BIT(blink_event) << LED_EVENT_BLINK_OFFSET; + } + + on_event = dev_read_u32_default(dev, "on-event", 3); + val &= ~(LED_EVENT_ON_MASK << LED_EVENT_ON_OFFSET); + if (on_event != 3) { + priv->on_event = on_event; + val |= BIT(on_event) << LED_EVENT_ON_OFFSET; + } + + port = dev_read_u32_default(dev, "port", 0); + priv->port = port; + val &= ~(LED_PORT_MASK << LED_PORT_OFFSET); + val |= port << LED_PORT_OFFSET; + + /* force off */ + val &= ~(LED_OFF_ON_MASK << LED_OFF_ON_OFFSET); + val |= 0x3 << LED_OFF_ON_OFFSET; + + cortina_led_write(priv->regs, val); + } + + return 0; +} + +static int cortina_led_bind(struct udevice *parent) +{ + ofnode node; + + dev_for_each_subnode(node, parent) { + struct led_uc_plat *uc_plat; + struct udevice *dev; + const char *label; + int ret; + + label = ofnode_read_string(node, "label"); + if (!label) { + debug("%s: node %s has no label\n", __func__, + ofnode_get_name(node)); + return -EINVAL; + } + + ret = device_bind_driver_to_node(parent, "ca-leds", + ofnode_get_name(node), + node, &dev); + if (ret) + return ret; + uc_plat = dev_get_uclass_platdata(dev); + uc_plat->label = label; + } + + return 0; +} + +static const struct udevice_id ca_led_ids[] = { + { .compatible = "cortina,ca-leds" }, + { /* sentinel */ } +}; + +U_BOOT_DRIVER(cortina_led) = { + .name = "ca-leds", + .id = UCLASS_LED, + .of_match = ca_led_ids, + .bind = cortina_led_bind, + .probe = cortina_led_probe, + .priv_auto_alloc_size = sizeof(struct cortina_led_cfg), + .ops = &cortina_led_ops, +}; From patchwork Fri Apr 17 01:38:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271970 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=ZJBz3r8r; 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 493JgS5p6xz9sQx for ; Fri, 17 Apr 2020 11:40:04 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6175281C41; Fri, 17 Apr 2020 03:39: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="ZJBz3r8r"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5372480653; Fri, 17 Apr 2020 03:38:40 +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.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-hk2apc01on0623.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::623]) (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 565AE80721 for ; Fri, 17 Apr 2020 03:38:35 +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=XbJtMPyW7+83POMW/UQ3nsMha/L4cwVTITW9rFc2774R92Y4HC6/UmO6LabiQu3DDQvERrDwggCLyi8fSUUswbPhN+zrQwpg8QdD97ARTMBhc8IHuySqHoR3k4Szc3WYeEM062cV3EakttLKcY2NU44Neiuup9uwS1VOf/z9FdRGkzhAYCQ/3MDJnl2Wg0UhNQiBySeMt5EDVE/euCHjvX3KnQT1FqVSQpiufrpxVVo4jpwDNSK8qWdpLsvBteOlNHfxRZsd/8Q75ujjHPOzYXg/8ODMg0rzrQ3lcs2XjrfelyUP6bWY4iuesUmo5DlfB6R60GMtgRYtQjBE/n/0YQ== 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=UY3cBq5UMEjH2N9NKQAjEbL9q1rNP+wnM3Yz/gT2c1E=; b=kxpcfH33TvI/M0ShRQQj/UPVVAIKYClpEYJGxFSTUCZTXYU+/e8SIKbxnOn3djRrf0YbxUv/E2l0J2jBuc8QDDQYcW60VqQxyMhuVZoyHjgglNNzIwqV7NKnLMrcS4HOIbqr7BXs0QmI/Nze3DUeyKgI4DNMfRPwWLJn2EgW38VE4yau2cv1sHrY6GVQ3m/YZUU3OrNtxO7W4sl0Xu/WDhEC6PLn56PO3ANk8pjAF4ZwE6M4H5RMvBJHMrygZtEtQyi8Bnr0c6SJuiw2mPTl2UUXfa76a5m2iPWjPe0z9AmY36pjTPwl1UpHg5dO6oVH+AV3kunam1NQHcH/V7pCJw== 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=UY3cBq5UMEjH2N9NKQAjEbL9q1rNP+wnM3Yz/gT2c1E=; b=ZJBz3r8rruSN+x0Yza/rzEVLauW46kMENzF0MM44LDnowVtjTG1sxHVRqlOTLZPiKy0xmUyw0Vumrr4inkGIS9MZqy5yhjF/dW2oGSgBgpa4q/bvci9jJLv+PbGw5lIumZuSlRKvEXWnSVriJqluDw0XuQvOAopcN2A9PxlXXJQ= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:34 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:34 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Jway Lin , Alex Nemirovsky , Simon Glass Subject: [PATCH v5 6/8] board: presidio: add LED support Date: Thu, 16 Apr 2020 18:38:07 -0700 Message-Id: <1587087489-6561-7-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:33 +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: 6be86821-f9c1-4c1a-80a3-08d7e2700acb X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:1284; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: 58F4ilYuHWde5t2bX527nVrxOKKaywy1icbqlL+lXkHqWknwok4z5ZF+8xtsCVdfWvFA3j20GTSMQzfvhM0E121akNrnvMcdPXsoa53LX7fIAFIGQvvw39vHW1WbVu3StYJtEOBccvJXH2zP32SbRxJ0iXluV0nIKPJ7H73S/+XYmsoSRgConspzurE7fUlAO0hP/pTcPqrtO8IbtQEb7WhHxDz8hZMHUOR/10m4WTcPs65CrL3c1driM1c39zSRmdRs8HijWx9swG6hZ9u8Jwld7BLyHOwqGEI2nnPiv8ZcS2SleiqoBUyUxynDT5+w0OOtVjLrXccYheFKI7YKQk0DD7W0S88D4s/rCkF1S1ZKdYpS3NlfWUKmsBaSG1dHGrtC5IMA71WaMpv1lM2kzyChAycyzqLt0+NRnz3ESUVISBx/Rvu/1kFScEWhlaGF X-MS-Exchange-AntiSpam-MessageData: Oj9y63q4X6/4Im+tdWJUvIVDP1j4z2ZMIgnos65qAH02ozvp8K+LZxJO+NPsTnya2v/tKLBTm8J8+owYHnlK6KLLfExqT2qEagY6UOKIEiJaCB5uQCxvZZpF2NxLhsxVO1cSMU3Xjib3I8YlNTq/8g== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6be86821-f9c1-4c1a-80a3-08d7e2700acb X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:34.4436 (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: xL2IWDyBb6cv2e3pMXfQuq2/wQnoXljZEv1rqiZP50nZ+R3IOp5lkdkmw4zDztpFnxLjYAmsw1AjttDO63ZH9WPY4ANKxDZn+xCfDSByqltMzvJONLYQz/EeBfYV6YKb X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 From: Jway Lin Add LED support for Cortina Access Presidio Engineering Board Signed-off-by: Jway Lin Signed-off-by: Alex Nemirovsky Reviewed-by: Simon Glass CC: Simon Glass --- Changes in v5: None Changes in v4: - rename DT blink rate symbol Changes in v3: None Changes in v2: None arch/arm/dts/ca-presidio-engboard.dts | 31 ++++++++++++++++++++++++++++ configs/cortina_presidio-asic-emmc_defconfig | 2 ++ 2 files changed, 33 insertions(+) diff --git a/arch/arm/dts/ca-presidio-engboard.dts b/arch/arm/dts/ca-presidio-engboard.dts index 40c93d7..eef433e 100644 --- a/arch/arm/dts/ca-presidio-engboard.dts +++ b/arch/arm/dts/ca-presidio-engboard.dts @@ -64,4 +64,35 @@ spi-max-frequency = <108000000>; }; }; + + leds: led-controller@f43200f0 { + compatible = "cortina,ca-leds"; + reg = <0x0 0xf43200f0 0x40>; + + cortina,blink-rate1 = <256>; + cortina,blink-rate2 = <512>; + + led@0 { + pin = <0>; + active-low; + blink-sel =<0>; + port = <0>; + off-event = <0>; + label = "led0"; + }; + + led@1 { + pin = <1>; + active-low; + blink-sel =<1>; + label = "led1"; + }; + + led@2 { + pin = <2>; + active-low; + label = "led2"; + }; + + }; }; diff --git a/configs/cortina_presidio-asic-emmc_defconfig b/configs/cortina_presidio-asic-emmc_defconfig index e45e23c..3c6bd6b 100644 --- a/configs/cortina_presidio-asic-emmc_defconfig +++ b/configs/cortina_presidio-asic-emmc_defconfig @@ -27,6 +27,8 @@ 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 From patchwork Fri Apr 17 01:38:08 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271972 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=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=LQynj04x; 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 493Jgw2blJz9sQx for ; Fri, 17 Apr 2020 11:40:28 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id DDEF281C47; Fri, 17 Apr 2020 03:39:31 +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="LQynj04x"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5D9581A16; Fri, 17 Apr 2020 03:38:52 +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.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-hk2apc01on060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::60a]) (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 F146E80721 for ; Fri, 17 Apr 2020 03:38:40 +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=T2MzT4BGrbUBUXle4dlg99WGsBdteOEwpF1QOeESJR2JBbEY2qLpWeEEfvRcr/pj9JX2jNbxQYzSOuRwoAIdXKFOUSRppiUuL3jAzfOMBStTJjf0is9FAU01N9Xu93xoh5J0OLcivOIr3zWfRPtlD6+SQTFVjvs/CKfDGefeURUUyCJHSGtRQFeR92dUKp1jlWI1nm7eMkdiYUs9sZFVuK8veK2nW2p4+MI6lgCrp/mE5h4eHAOfnJjy5r0bC7zGprjqzPqxUpzwt+E3UMEJqZSBOHICMisvPZtbdFKH1VVrWaODpvUmeOAA1RPUbXHa3sgsx6a8bjyzSArKKSTjdQ== 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=qKyy/K+9jT3CjSgt9VEQFaEy0pXSATIyZdEk3nLxkVI=; b=bqCEbmcJfy9uQSauhFIyo9NV4mBcsFhNtzNvrQ7Et3UHzyJ5AHRpQaY91j3AXjkmt8BNZC8zWqN2EtdIG2ofMg0R91dGsJqMieA7Ydl3FL5mXyVtTceN5tAwfB7bgdHnWRcxzW4fDvjsdbljjwvxN0/YD2f2SXeFCxoPHQr7UjzirtAi6oOcLOnlIdcxos+52iHKPLL+kxawtNb1BNPEo/ciscdDeRFq8yfpkdE9W4kGiYmNparOwCZ6JDXL8Vz9u68E7239uYGhtKjFZ8faK0Z24AQofpUY2jRpuf3oqJopnAunaMyonRbYKM90uWF4N2XselPtdc7tdNj+jgNZuQ== 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=qKyy/K+9jT3CjSgt9VEQFaEy0pXSATIyZdEk3nLxkVI=; b=LQynj04xlbbaQfDWgoyEcFTQjvvfBYp6zxzNyXVadMXTamn1291n0PQ3gndG7Kmp0ogbolkgyYqbTgInpPCxgQ9OoNRKuqzoP2OV3oI8wx3XcswZyPNgYFQ3MQ/O+PA0m9ngnXMNpsjlhbr+snYqSkbzXHfrPWyDZEsNapWsjzA= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:36 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:36 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Pengpeng Chen , Alex Nemirovsky , Jagan Teki , Vignesh R Subject: [PATCH v5 7/8] spi: ca_sflash: Add CAxxxx SPI Flash Controller Date: Thu, 16 Apr 2020 18:38:08 -0700 Message-Id: <1587087489-6561-8-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:34 +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: 85936b30-b402-4baf-d01c-08d7e2700bea X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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:499; X-Forefront-PRVS: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(30864003)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: sKMFoEahQpaZBAynegq0Y01tPb6ade095soFarfb+Qx0WMcGWv3SBO4XuauPgk56fbUJLjbo11zZrS5HH6a+trniZRksAXyAaxUMVRjgTwFmSY4oIyv+Kir0T7CrwO9YRaUTMaXT0N8UsrH8a5XRRM0LCShUidxLxUYm35c7MAxQMB2OUSl3BlZMu7t/3Z+WpcpkcFAzLA8xETAEyrpoJwrXZrahbMd6QCdS5iVnaLTLw9WVuWyupDsopMcjgejBQt0MaLEGDyXUTAPaN5Gtg6Z2JCo9LhBebrks0Js76TxbtD0r7B7h3IowAlATeqnkmugnkGg5dcU0OPZ8wQ7Mn6Pl4xXhIJkn3jWLuA2Piub34/VHVSZvn341QIqqcvo+smhE3js6P3328H5zU9c9JBmh4dNUwG+xMHfYWWJy6ADBc0szGJk1GKFlAiWdHRQy X-MS-Exchange-AntiSpam-MessageData: mQJQbxxhdWIAbRCQN9tCJjfC15dqImJ7g6dVuTmmgljyTI/Ri7TvnX+NTqYbnr2GqvYa4LGNy98j3oCAW1+PDe8eO9WnSqf4z7daOEET5c9z3kmzq+XO5V2SCaJWS/Q0yo2kU4S5YoqR9mqXpvihQw== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 85936b30-b402-4baf-d01c-08d7e2700bea X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:36.5843 (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: jFPMiLJGLTU+CYFncTGOmROkq8UEgCBom3NgwJZSruidVgj4ZkxDKCoXaOIdAuIpRZgg1PX+AQT8ap4hz+mYKw9ydE5/4/ZOARRVixly7MuSexNOC5NTKeT7i6R74OZi X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 From: Pengpeng Chen Add SPI Flash controller driver for Cortina Access CAxxxx SoCs Signed-off-by: Pengpeng Chen Signed-off-by: Alex Nemirovsky CC: Jagan Teki CC: Vignesh R --- Changes in v5: None Changes in v4: None Changes in v3: - Fixup syntax issues related to checkpatch.pl cleanup Changes in v2: None MAINTAINERS | 2 + drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/ca_sflash.c | 576 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 587 insertions(+) create mode 100644 drivers/spi/ca_sflash.c diff --git a/MAINTAINERS b/MAINTAINERS index d812ce7..0087559 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -184,6 +184,7 @@ F: drivers/mmc/ca_dw_mmc.c F: drivers/i2c/i2c-cortina.c F: drivers/i2c/i2c-cortina.h F: drivers/led/led_cortina.c +F: drivers/spi/ca_sflash.c ARM/CZ.NIC TURRIS MOX SUPPORT M: Marek Behun @@ -700,6 +701,7 @@ F: drivers/mmc/ca_dw_mmc.c F: drivers/i2c/i2c-cortina.c F: drivers/i2c/i2c-cortina.h F: drivers/led/led_cortina.c +F: drivers/spi/ca_sflash.c MIPS MSCC M: Gregory CLEMENT diff --git a/drivers/spi/Kconfig b/drivers/spi/Kconfig index 4166c61..8a244f1 100644 --- a/drivers/spi/Kconfig +++ b/drivers/spi/Kconfig @@ -106,6 +106,14 @@ config BCMSTB_SPI be used to access the SPI flash on platforms embedding this Broadcom SPI core. +config CORTINA_SFLASH + bool "Cortina-Access Serial Flash controller driver" + depends on DM_SPI && SPI_MEM + help + Enable the Cortina-Access Serial Flash controller driver. This driver + can be used to access the SPI NOR/NAND flash on platforms embedding this + Cortina-Access IP core. + config CADENCE_QSPI bool "Cadence QSPI driver" help diff --git a/drivers/spi/Makefile b/drivers/spi/Makefile index 52462e1..32b98b4 100644 --- a/drivers/spi/Makefile +++ b/drivers/spi/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_BCM63XX_SPI) += bcm63xx_spi.o obj-$(CONFIG_BCMSTB_SPI) += bcmstb_spi.o obj-$(CONFIG_CADENCE_QSPI) += cadence_qspi.o cadence_qspi_apb.o obj-$(CONFIG_CF_SPI) += cf_spi.o +obj-$(CONFIG_CORTINA_SFLASH) += ca_sflash.o obj-$(CONFIG_DAVINCI_SPI) += davinci_spi.o obj-$(CONFIG_DESIGNWARE_SPI) += designware_spi.o obj-$(CONFIG_EXYNOS_SPI) += exynos_spi.o diff --git a/drivers/spi/ca_sflash.c b/drivers/spi/ca_sflash.c new file mode 100644 index 0000000..0709650 --- /dev/null +++ b/drivers/spi/ca_sflash.c @@ -0,0 +1,576 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Driver for Cortina SPI-FLASH Controller + * + * Copyright (C) 2020 Cortina Access Inc. All Rights Reserved. + * + * Author: PengPeng Chen + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +DECLARE_GLOBAL_DATA_PTR; + +struct ca_sflash_regs { + u32 idr; /* 0x00:Flash word ID Register */ + u32 tc; /* 0x04:Flash Timeout Counter Register */ + u32 sr; /* 0x08:Flash Status Register */ + u32 tr; /* 0x0C:Flash Type Register */ + u32 asr; /* 0x10:Flash ACCESS START/BUSY Register */ + u32 isr; /* 0x14:Flash Interrupt Status Register */ + u32 imr; /* 0x18:Flash Interrupt Mask Register */ + u32 fcr; /* 0x1C:NAND Flash FIFO Control Register */ + u32 ffsr; /* 0x20:Flash FIFO Status Register */ + u32 ffar; /* 0x24:Flash FIFO ADDRESS Register */ + u32 ffmar; /* 0x28:Flash FIFO MATCHING ADDRESS Register */ + u32 ffdr; /* 0x2C:Flash FIFO Data Register */ + u32 ar; /* 0x30:Serial Flash Access Register */ + u32 ear; /* 0x34:Serial Flash Extend Access Register */ + u32 adr; /* 0x38:Serial Flash ADdress Register */ + u32 dr; /* 0x3C:Serial Flash Data Register */ + u32 tmr; /* 0x40:Serial Flash Timing Register */ +}; + +/* + * FLASH_TYPE + */ +#define CA_FLASH_TR_PIN BIT(15) +#define CA_FLASH_TR_TYPE_MASK GENMASK(14, 12) +#define CA_FLASH_TR_TYPE(tp) (((tp) << 12) & CA_FLASH_TR_TYPE_MASK) +#define CA_FLASH_TR_WIDTH BIT(11) +#define CA_FLASH_TR_SIZE_MASK GENMASK(10, 9) +#define CA_FLASH_TR_SIZE(sz) (((sz) << 9) & CA_FLASH_TR_SIZE_MASK) + +/* + * FLASH_FLASH_ACCESS_START + */ +#define CA_FLASH_ASR_IND_START_EN BIT(1) +#define CA_FLASH_ASR_DMA_START_EN BIT(3) +#define CA_FLASH_ASR_WR_ACCESS_EN BIT(9) + +/* + * FLASH_FLASH_INTERRUPT + */ +#define CA_FLASH_ISR_REG_IRQ BIT(1) +#define CA_FLASH_ISR_FIFO_IRQ BIT(2) + +/* + * FLASH_SF_ACCESS + */ +#define CA_SF_AR_OPCODE_MASK GENMASK(7, 0) +#define CA_SF_AR_OPCODE(op) ((op) << 0 & CA_SF_AR_OPCODE_MASK) +#define CA_SF_AR_ACCODE_MASK GENMASK(11, 8) +#define CA_SF_AR_ACCODE(ac) (((ac) << 8) & CA_SF_AR_ACCODE_MASK) +#define CA_SF_AR_FORCE_TERM BIT(12) +#define CA_SF_AR_FORCE_BURST BIT(13) +#define CA_SF_AR_AUTO_MODE_EN BIT(15) +#define CA_SF_AR_CHIP_EN_ALT BIT(16) +#define CA_SF_AR_HI_SPEED_RD BIT(17) +#define CA_SF_AR_MIO_INF_DC BIT(24) +#define CA_SF_AR_MIO_INF_AC BIT(25) +#define CA_SF_AR_MIO_INF_CC BIT(26) +#define CA_SF_AR_DDR_MASK GENMASK(29, 28) +#define CA_SF_AR_DDR(ddr) (((ddr) << 28) & CA_SF_AR_DDR_MASK) +#define CA_SF_AR_MIO_INF_MASK GENMASK(31, 30) +#define CA_SF_AR_MIO_INF(io) (((io) << 30) & CA_SF_AR_MIO_INF_MASK) + +/* + * FLASH_SF_EXT_ACCESS + */ +#define CA_SF_EAR_OPCODE_MASK GENMASK(7, 0) +#define CA_SF_EAR_OPCODE(op) (((op) << 0) & CA_SF_EAR_OPCODE_MASK) +#define CA_SF_EAR_DATA_CNT_MASK GENMASK(20, 8) +#define CA_SF_EAR_DATA_CNT(cnt) (((cnt) << 8) & CA_SF_EAR_DATA_CNT_MASK) +#define CA_SF_EAR_DATA_CNT_MAX (4096) +#define CA_SF_EAR_ADDR_CNT_MASK GENMASK(23, 21) +#define CA_SF_EAR_ADDR_CNT(cnt) (((cnt) << 21) & CA_SF_EAR_ADDR_CNT_MASK) +#define CA_SF_EAR_ADDR_CNT_MAX (5) +#define CA_SF_EAR_DUMY_CNT_MASK GENMASK(29, 24) +#define CA_SF_EAR_DUMY_CNT(cnt) (((cnt) << 24) & CA_SF_EAR_DUMY_CNT_MASK) +#define CA_SF_EAR_DUMY_CNT_MAX (32) +#define CA_SF_EAR_DRD_CMD_EN BIT(31) + +/* + * FLASH_SF_ADDRESS + */ +#define CA_SF_ADR_REG_MASK GENMASK(31, 0) +#define CA_SF_ADR_REG(addr) (((addr) << 0) & CA_SF_ADR_REG_MASK) + +/* + * FLASH_SF_DATA + */ +#define CA_SF_DR_REG_MASK GENMASK(31, 0) +#define CA_SF_DR_REG(addr) (((addr) << 0) & CA_SF_DR_REG_MASK) + +/* + * FLASH_SF_TIMING + */ +#define CA_SF_TMR_IDLE_MASK GENMASK(7, 0) +#define CA_SF_TMR_IDLE(idle) (((idle) << 0) & CA_SF_TMR_IDLE_MASK) +#define CA_SF_TMR_HOLD_MASK GENMASK(15, 8) +#define CA_SF_TMR_HOLD(hold) (((hold) << 8) & CA_SF_TMR_HOLD_MASK) +#define CA_SF_TMR_SETUP_MASK GENMASK(23, 16) +#define CA_SF_TMR_SETUP(setup) (((setup) << 16) & CA_SF_TMR_SETUP_MASK) +#define CA_SF_TMR_CLK_MASK GENMASK(26, 24) +#define CA_SF_TMR_CLK(clk) (((clk) << 24) & CA_SF_TMR_CLK_MASK) + +#define CA_SFLASH_IND_WRITE 0 +#define CA_SFLASH_IND_READ 1 +#define CA_SFLASH_MEM_MAP 3 +#define CA_SFLASH_FIFO_TIMEOUT_US 30000 +#define CA_SFLASH_BUSY_TIMEOUT_US 40000 + +#define CA_SF_AC_OPCODE 0x00 +#define CA_SF_AC_OPCODE_1_DATA 0x01 +#define CA_SF_AC_OPCODE_2_DATA 0x02 +#define CA_SF_AC_OPCODE_3_DATA 0x03 +#define CA_SF_AC_OPCODE_4_DATA 0x04 +#define CA_SF_AC_OPCODE_3_ADDR 0x05 +#define CA_SF_AC_OPCODE_4_ADDR (CA_SF_AC_OPCODE_3_ADDR) +#define CA_SF_AC_OPCODE_3_ADDR_1_DATA 0x06 +#define CA_SF_AC_OPCODE_4_ADDR_1_DATA (CA_SF_AC_OPCODE_3_ADDR_1_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_2_DATA 0x07 +#define CA_SF_AC_OPCODE_4_ADDR_2_DATA (CA_SF_AC_OPCODE_3_ADDR_2_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_3_DATA 0x08 +#define CA_SF_AC_OPCODE_4_ADDR_3_DATA (CA_SF_AC_OPCODE_3_ADDR_3_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_4_DATA 0x09 +#define CA_SF_AC_OPCODE_4_ADDR_4_DATA (CA_SF_AC_OPCODE_3_ADDR_4_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_X_1_DATA 0x0A +#define CA_SF_AC_OPCODE_4_ADDR_X_1_DATA (CA_SF_AC_OPCODE_3_ADDR_X_1_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_X_2_DATA 0x0B +#define CA_SF_AC_OPCODE_4_ADDR_X_2_DATA (CA_SF_AC_OPCODE_3_ADDR_X_2_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_X_3_DATA 0x0C +#define CA_SF_AC_OPCODE_4_ADDR_X_3_DATA (CA_SF_AC_OPCODE_3_ADDR_X_3_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_X_4_DATA 0x0D +#define CA_SF_AC_OPCODE_4_ADDR_X_4_DATA (CA_SF_AC_OPCODE_3_ADDR_X_4_DATA << 2) +#define CA_SF_AC_OPCODE_3_ADDR_4X_1_DATA 0x0E +#define CA_SF_AC_OPCODE_4_ADDR_4X_1_DATA (CA_SF_AC_OPCODE_3_ADDR_4X_1_DATA << 2) +#define CA_SF_AC_OPCODE_EXTEND 0x0F + +#define CA_SF_ACCESS_MIO_SINGLE 0 +#define CA_SF_ACCESS_MIO_DUAL 1 +#define CA_SF_ACCESS_MIO_QUARD 2 + +enum access_type { + RD_ACCESS, + WR_ACCESS, +}; + +struct ca_sflash_priv { + struct ca_sflash_regs *regs; + u8 rx_width; + u8 tx_width; +}; + +/* + * This function doesn't do anything except help with debugging + */ +static int ca_sflash_claim_bus(struct udevice *dev) +{ + debug("%s:\n", __func__); + return 0; +} + +static int ca_sflash_release_bus(struct udevice *dev) +{ + debug("%s:\n", __func__); + return 0; +} + +static int ca_sflash_set_speed(struct udevice *dev, uint speed) +{ + debug("%s:\n", __func__); + return 0; +} + +static int ca_sflash_set_mode(struct udevice *dev, uint mode) +{ + struct ca_sflash_priv *priv = dev_get_priv(dev); + + if (mode & SPI_RX_QUAD) + priv->rx_width = 4; + else if (mode & SPI_RX_DUAL) + priv->rx_width = 2; + else + priv->rx_width = 1; + + if (mode & SPI_TX_QUAD) + priv->tx_width = 4; + else if (mode & SPI_TX_DUAL) + priv->tx_width = 2; + else + priv->tx_width = 1; + + debug("%s: mode=%d, rx_width=%d, tx_width=%d\n", + __func__, mode, priv->rx_width, priv->tx_width); + + return 0; +} + +static int _ca_sflash_wait_for_not_busy(struct ca_sflash_priv *priv) +{ + u32 asr; + + if (readl_poll_timeout(&priv->regs->asr, asr, + !(asr & CA_FLASH_ASR_IND_START_EN), + CA_SFLASH_BUSY_TIMEOUT_US)) { + pr_err("busy timeout (stat:%#x)\n", asr); + return -1; + } + + return 0; +} + +static int _ca_sflash_wait_cmd(struct ca_sflash_priv *priv, + enum access_type type) +{ + if (type == WR_ACCESS) { + /* Enable write access and start the sflash indirect access */ + clrsetbits_le32(&priv->regs->asr, GENMASK(31, 0), + CA_FLASH_ASR_WR_ACCESS_EN + | CA_FLASH_ASR_IND_START_EN); + } else if (type == RD_ACCESS) { + /* Start the sflash indirect access */ + clrsetbits_le32(&priv->regs->asr, GENMASK(31, 0), + CA_FLASH_ASR_IND_START_EN); + } else { + printf("%s: !error access type.\n", __func__); + return -1; + } + + /* Wait til the action(rd/wr) completed */ + return _ca_sflash_wait_for_not_busy(priv); +} + +static int _ca_sflash_read(struct ca_sflash_priv *priv, + u8 *buf, unsigned int data_len) +{ + u32 reg_data; + int len; + + len = data_len; + while (len >= 4) { + if (_ca_sflash_wait_cmd(priv, RD_ACCESS)) + return -1; + reg_data = readl(&priv->regs->dr); + *buf++ = reg_data & 0xFF; + *buf++ = (reg_data >> 8) & 0xFF; + *buf++ = (reg_data >> 16) & 0xFF; + *buf++ = (reg_data >> 24) & 0xFF; + len -= 4; + debug("%s: reg_data=%#08x\n", + __func__, reg_data); + } + + if (len > 0) { + if (_ca_sflash_wait_cmd(priv, RD_ACCESS)) + return -1; + reg_data = readl(&priv->regs->dr); + debug("%s: reg_data=%#08x\n", + __func__, reg_data); + } + + switch (len) { + case 3: + *buf++ = reg_data & 0xFF; + *buf++ = (reg_data >> 8) & 0xFF; + *buf++ = (reg_data >> 16) & 0xFF; + break; + case 2: + *buf++ = reg_data & 0xFF; + *buf++ = (reg_data >> 8) & 0xFF; + break; + case 1: + *buf++ = reg_data & 0xFF; + break; + case 0: + break; + default: + printf("%s: error data_length %d!\n", __func__, len); + } + + return 0; +} + +static int _ca_sflash_mio_set(struct ca_sflash_priv *priv, + u8 width) +{ + if (width == 4) { + setbits_le32(&priv->regs->ar, + CA_SF_AR_MIO_INF_DC + | CA_SF_AR_MIO_INF(CA_SF_ACCESS_MIO_QUARD) + | CA_SF_AR_FORCE_BURST); + } else if (width == 2) { + setbits_le32(&priv->regs->ar, + CA_SF_AR_MIO_INF_DC + | CA_SF_AR_MIO_INF(CA_SF_ACCESS_MIO_DUAL) + | CA_SF_AR_FORCE_BURST); + } else if (width == 1) { + setbits_le32(&priv->regs->ar, + CA_SF_AR_MIO_INF(CA_SF_ACCESS_MIO_SINGLE) + | CA_SF_AR_FORCE_BURST); + } else { + printf("%s: error rx/tx width %d!\n", __func__, width); + return -1; + } + + return 0; +} + +static int _ca_sflash_write(struct ca_sflash_priv *priv, + u8 *buf, unsigned int data_len) +{ + u32 reg_data; + int len; + + len = data_len; + while (len > 0) { + reg_data = buf[0] + | (buf[1] << 8) + | (buf[2] << 16) + | (buf[3] << 24); + + debug("%s: reg_data=%#08x\n", + __func__, reg_data); + /* Fill data */ + clrsetbits_le32(&priv->regs->dr, GENMASK(31, 0), reg_data); + + if (_ca_sflash_wait_cmd(priv, WR_ACCESS)) + return -1; + + len -= 4; + buf += 4; + } + + return 0; +} + +static int _ca_sflash_access_data(struct ca_sflash_priv *priv, + struct spi_mem_op *op) +{ + int total_cnt; + unsigned int len; + unsigned int data_cnt = op->data.nbytes; + u64 addr_offset = op->addr.val; + u8 addr_cnt = op->addr.nbytes; + u8 *data_buf = NULL; + u8 *buf = NULL; + + if (op->data.dir == SPI_MEM_DATA_IN) + data_buf = (u8 *)op->data.buf.in; + else + data_buf = (u8 *)op->data.buf.out; + + if (data_cnt > CA_SF_EAR_DATA_CNT_MAX) + buf = malloc(CA_SF_EAR_DATA_CNT_MAX); + else + buf = malloc(data_cnt); + + total_cnt = data_cnt; + while (total_cnt > 0) { + /* Fill address */ + if (addr_cnt > 0) + clrsetbits_le32(&priv->regs->adr, + GENMASK(31, 0), (u32)addr_offset); + + if (total_cnt > CA_SF_EAR_DATA_CNT_MAX) { + len = CA_SF_EAR_DATA_CNT_MAX; + addr_offset += CA_SF_EAR_DATA_CNT_MAX; + /* Clear start bit before next bulk read */ + clrbits_le32(&priv->regs->asr, GENMASK(31, 0)); + } else { + len = total_cnt; + } + + memset(buf, 0, len); + if (op->data.dir == SPI_MEM_DATA_IN) { + if (_ca_sflash_read(priv, buf, len)) + break; + memcpy(data_buf, buf, len); + } else { + memcpy(buf, data_buf, len); + if (_ca_sflash_write(priv, buf, len)) + break; + } + + total_cnt -= len; + data_buf += len; + } + if (buf) + free(buf); + + return total_cnt > 0 ? -1 : 0; +} + +static int _ca_sflash_issue_cmd(struct ca_sflash_priv *priv, + struct spi_mem_op *op, u8 opcode) +{ + u8 dummy_cnt = op->dummy.nbytes; + u8 addr_cnt = op->addr.nbytes; + u8 mio_width; + unsigned int data_cnt = op->data.nbytes; + u64 addr_offset = op->addr.val; + + /* Set the access register */ + clrsetbits_le32(&priv->regs->ar, + GENMASK(31, 0), CA_SF_AR_ACCODE(opcode)); + + if (opcode == CA_SF_AC_OPCODE_EXTEND) { /* read_data, write_data */ + if (data_cnt > 6) { + if (op->data.dir == SPI_MEM_DATA_IN) + mio_width = priv->rx_width; + else + mio_width = priv->tx_width; + if (_ca_sflash_mio_set(priv, mio_width)) + return -1; + } + debug("%s: FLASH ACCESS reg=%#08x\n", + __func__, readl(&priv->regs->ar)); + + /* Use command in extend_access register */ + clrsetbits_le32(&priv->regs->ear, + GENMASK(31, 0), CA_SF_EAR_OPCODE(op->cmd.opcode) + | CA_SF_EAR_DUMY_CNT(dummy_cnt * 8 - 1) + | CA_SF_EAR_ADDR_CNT(addr_cnt - 1) + | CA_SF_EAR_DATA_CNT(4 - 1) + | CA_SF_EAR_DRD_CMD_EN); + debug("%s: FLASH EXT ACCESS reg=%#08x\n", + __func__, readl(&priv->regs->ear)); + + if (_ca_sflash_access_data(priv, op)) + return -1; + } else { /* reset_op, wr_enable, wr_disable */ + setbits_le32(&priv->regs->ar, + CA_SF_AR_OPCODE(op->cmd.opcode)); + debug("%s: FLASH ACCESS reg=%#08x\n", + __func__, readl(&priv->regs->ar)); + + if (opcode == CA_SF_AC_OPCODE_4_ADDR) { /* erase_op */ + /* Configure address length */ + if (addr_cnt > 3) /* 4 Bytes address */ + setbits_le32(&priv->regs->tr, + CA_FLASH_TR_SIZE(2)); + else /* 3 Bytes address */ + clrbits_le32(&priv->regs->tr, + CA_FLASH_TR_SIZE_MASK); + + /* Fill address */ + if (addr_cnt > 0) + clrsetbits_le32(&priv->regs->adr, + GENMASK(31, 0), + (u32)addr_offset); + } + + if (_ca_sflash_wait_cmd(priv, RD_ACCESS)) + return -1; + } + /* elapse 10us before issuing any other command */ + udelay(10); + + return 0; +} + +static int ca_sflash_exec_op(struct spi_slave *slave, + const struct spi_mem_op *op) +{ + struct ca_sflash_priv *priv = dev_get_priv(slave->dev->parent); + u8 opcode; + + debug("%s: cmd:%#02x addr.val:%#llx addr.len:%#x data.len:%#x data.dir:%#x\n", + __func__, op->cmd.opcode, op->addr.val, + op->addr.nbytes, op->data.nbytes, op->data.dir); + + if (op->data.nbytes == 0 && op->addr.nbytes == 0) { + opcode = CA_SF_AC_OPCODE; + } else if (op->data.nbytes == 0 && op->addr.nbytes > 0) { + opcode = CA_SF_AC_OPCODE_4_ADDR; + } else if (op->data.nbytes > 0) { + opcode = CA_SF_AC_OPCODE_EXTEND; + } else { + printf("%s: can't support cmd.opcode:(%#02x) type currently!\n", + __func__, op->cmd.opcode); + return -1; + } + + return _ca_sflash_issue_cmd(priv, (struct spi_mem_op *)op, opcode); +} + +static void ca_sflash_init(struct ca_sflash_priv *priv) +{ + /* Set FLASH_TYPE as serial flash, value: 0x0400*/ + clrsetbits_le32(&priv->regs->tr, + GENMASK(31, 0), CA_FLASH_TR_SIZE(2)); + debug("%s: FLASH_TYPE reg=%#x\n", + __func__, readl(&priv->regs->tr)); + + /* Minimize flash timing, value: 0x07010101 */ + clrsetbits_le32(&priv->regs->tmr, + GENMASK(31, 0), + CA_SF_TMR_CLK(0x07) + | CA_SF_TMR_SETUP(0x01) + | CA_SF_TMR_HOLD(0x01) + | CA_SF_TMR_IDLE(0x01)); + debug("%s: FLASH_TIMING reg=%#x\n", + __func__, readl(&priv->regs->tmr)); +} + +static int ca_sflash_probe(struct udevice *dev) +{ + struct ca_sflash_priv *priv = dev_get_priv(dev); + struct resource res; + int ret; + + /* Map the registers */ + ret = dev_read_resource_byname(dev, "sflash-regs", &res); + if (ret) { + dev_err(dev, "can't get regs base addresses(ret = %d)!\n", ret); + return ret; + } + priv->regs = devm_ioremap(dev, res.start, resource_size(&res)); + if (IS_ERR(priv->regs)) + return PTR_ERR(priv->regs); + + ca_sflash_init(priv); + + printf("SFLASH: Controller probed ready\n"); + return 0; +} + +static const struct spi_controller_mem_ops ca_sflash_mem_ops = { + .exec_op = ca_sflash_exec_op, +}; + +static const struct dm_spi_ops ca_sflash_ops = { + .claim_bus = ca_sflash_claim_bus, + .release_bus = ca_sflash_release_bus, + .set_speed = ca_sflash_set_speed, + .set_mode = ca_sflash_set_mode, + .mem_ops = &ca_sflash_mem_ops, +}; + +static const struct udevice_id ca_sflash_ids[] = { + {.compatible = "cortina,ca-sflash"}, + {} +}; + +U_BOOT_DRIVER(ca_sflash) = { + .name = "ca_sflash", + .id = UCLASS_SPI, + .of_match = ca_sflash_ids, + .ops = &ca_sflash_ops, + .priv_auto_alloc_size = sizeof(struct ca_sflash_priv), + .probe = ca_sflash_probe, +}; From patchwork Fri Apr 17 01:38: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: 1271971 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=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=b2x7x4YT; 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 493Jgg4q9Gz9sQx for ; Fri, 17 Apr 2020 11:40:15 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 22D7C81A4E; Fri, 17 Apr 2020 03:39:27 +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="b2x7x4YT"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 9918581A08; Fri, 17 Apr 2020 03:38:50 +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.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-hk2apc01on060a.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::60a]) (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 2A582805A0 for ; Fri, 17 Apr 2020 03:38:42 +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=Jii6CJW3ubzVtZf/bOJYGeMVu9e/4F8nJwr/7guST9NIKtZomq+oGb6iZxT7dva92sZZSnrBvLs69Hr5LECQ+CUnv0xDYqOIUufzE1/INYiJrTgUoKcb1REg4FQchKp9O1BJCrCHMcKNd9e4LiFOjLdHwnScyNB0ME0chptNwmSD4X25Na9apPZRBR8EPsJRrdsOV39VanSQaJjqyuPJN6JuHtYVED9xb9TgyEfO85vgFgDrciqrL+XZMNYOohx7t0jw+GiK72ouH0I/Bv6ArZThV0vRZvJ9wb4gzpNy7KnA8q0StPZtT8msEeiyPmcq3gxjkPIzNibXiP/mdSMPGg== 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=M9wd8pghwCm53fBoOzqhMbxC8Viha4nbmROT61p35Ec=; b=M67quIagvWgDgdLZ6iFKGxpkpn34yb9KUueXgkN8evbTKb2vFCj3DHLwkwfA/cONypoeQ89zJVQ9hEP0cFib/wgfj53sKuTixy9M/mHghUxllDgUj0oKH8SigUx7BsJpLNd06KA9K92/YkA9yAP4wKocW2vviUzPwCxP4v1O/94QUGOFjr2JDRtUbelMz9Ajy2aXiHSFf54tlwdINAHjR03V1L9Fki4KM0p7E9Mkstxr2g1FSwQ634NNJRaqF/uasBlBvLH1jiJlbu7VxeHSZduHzfoGsfuHZWnwMxiAsTWHayKVdVAXIzYZ9p4NXx4s5yi8qv2KqPmD2z+95R9Fng== 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=M9wd8pghwCm53fBoOzqhMbxC8Viha4nbmROT61p35Ec=; b=b2x7x4YTwKzdR6RDXzWyWV1aSbkWRhH3nO9TUJPiinPztIVHdaf/7rT+iH9tIdJABk2Gl+jpoAZq/FAsiIcWhzl/btnf88ehiJ21FMx6J1pvGBs/H4/vQfZze2xjBPC3g1c5xpYg6BgE0ajh24vm5hOkeChisKHsqIgvL9t1wdU= 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 PU1PR01MB1948.apcprd01.prod.exchangelabs.com (10.170.191.12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.25; Fri, 17 Apr 2020 01:38:38 +0000 Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d]) by PU1PR01MB1964.apcprd01.prod.exchangelabs.com ([fe80::3182:d1e7:f400:7c1d%3]) with mapi id 15.20.2900.028; Fri, 17 Apr 2020 01:38:38 +0000 From: Alex Nemirovsky To: u-boot@lists.denx.de Cc: Alex Nemirovsky , Jagan Teki , Vignesh R Subject: [PATCH v5 8/8] board: presidio-asic: Add SPI NOR support Date: Thu, 16 Apr 2020 18:38:09 -0700 Message-Id: <1587087489-6561-9-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087489-6561-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) 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 CO2PR04CA0093.namprd04.prod.outlook.com (2603:10b6:104:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2921.26 via Frontend Transport; Fri, 17 Apr 2020 01:38:36 +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: cd4f0f61-b1e9-40dd-46a2-08d7e2700d0a X-MS-TrafficTypeDiagnostic: PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948:|PU1PR01MB1948: 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: 0376ECF4DD 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:(10009020)(346002)(366004)(136003)(376002)(396003)(39850400004)(6512007)(44832011)(508600001)(2616005)(316002)(54906003)(956004)(4326008)(8676002)(86362001)(81156014)(6916009)(6506007)(52116002)(6666004)(5660300002)(8936002)(26005)(2906002)(16526019)(186003)(66556008)(66476007)(36756003)(66946007)(6486002); DIR:OUT; SFP:1101; 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: wioI9ToxVz1tg0+b08SjssIKXOvrvXXhYVO7TmFZfNtuc23BXo5X/7V8XkaujuTiFfETVtLED5eDRp6Mk0yEQ5DZRZ0+fJHzH1yQ9WinVASJY0aFgXZOQWEoxf5QhCvRXRhctvsvvmmbsZI/VyA4adW23BhEdA8msAzUSkZwYQNN2HYbfOrfp//G6ECmsnPLcCKaDPZ7wko/wFI5JJUuKJDieJ8NSFdh/u/78l9HCQokgma0EM9n3Qju1pS3cBZR2bs/S8gLu8B5sMaBW3Pva4AwqD1yAq0bXFB37kXyKFCUMVI3cwE/tTxxqtMfQfV6SnfSeo/dla5Mgl3mMR77hHI12LEfnmgnOwp47pEQZAbZcOmnlamQCiVY0651/CRG0hz6ZgG3z73pQs7RzKD/S6pBrJ8KMxEZz4EmjN8dnzVW4iyOKsRcVP99zx9F+f8E X-MS-Exchange-AntiSpam-MessageData: keJWn2cagROGaEZ/62OHplWtfqDjnLIXLOu6wxJn3+daG5d67lZBxHn5bmwd6g21qC3Tvy8GX8+yGAs/pthDdmwoa7O6WGBFK8fyxkZNiimGyvvM1Uj7SUUW2Z4+Mp0yTHJz0cP1M8ZSHr0uTAbtzg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: cd4f0f61-b1e9-40dd-46a2-08d7e2700d0a X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:38:38.2704 (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: JosrufK92BY3IHykXODLX8ko29CEufqAUKowdIaHNC6dyVCbgfGRP4W1rW+U5fYzL+KGVubXrIkKTGcb438Zl+ZFD11vcodmUduAJ6oxqBlPSLpoHGjqcvj5M9PSSi3k X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1948 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 --- Changes in v5: - NAND support removed from presidio-asic board DT. Changes in v4: None Changes in v3: None Changes in v2: 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 eef433e..cc7c888 100644 --- a/arch/arm/dts/ca-presidio-engboard.dts +++ b/arch/arm/dts/ca-presidio-engboard.dts @@ -53,15 +53,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 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