From patchwork Fri Apr 17 01:43:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271974 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=C6TpM4/Y; 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 493JmY0ZNZz9sQx for ; Fri, 17 Apr 2020 11:44:29 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 21CA1819FD; Fri, 17 Apr 2020 03:44:21 +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="C6TpM4/Y"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5B090805A0; Fri, 17 Apr 2020 03:44:05 +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-hk2apc01on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::602]) (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 BCCC9804D5 for ; Fri, 17 Apr 2020 03:44:00 +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=Ros+/eDRmHDhHGS87Sz+3ip/wHdRf9lDr0snMrdBi65AmY6R0mUtlZMpl2RTt+ePvsMTBqcLLZIgPflXRLNDCLlLpKMNGZ8LIdm6k8s0Hens4XEyWEvfV3n8/0RphafbPCZCrxiM+hwhSIXOnt2YT7nf236nS84m+IudnlmGHxF0NMrABuxlD98/6Rt77Z6UtWV8Pu4GLqeEyVwO/3zjeOV7lLCG7kpcF68bDsuF1CXIBjpj/6p4fIu2hQ/6etZVilwCWMgu4PZfR5RLaPlY1ap3cQf7c+FtbNnb8nNBGSqfy/H95v3VBGC0RUsE6fxj18zfnr3xA+lsPVuoQyhgig== 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=zfuQG3YqcK2pfXnmJZ/MaWRQiuHh6zTre7gukGYZT1I=; b=j5EYAT2iVCMt7seyvTNg3WSGBInGFymfKKAYNYCi7/YpgF1GIknDSeqUl4ZqiDXofee6KM9QtmMNum433frtbw6JFKuaONQ0xHBCHjanaTgKK7OQOQz8OcNTWHCNQ3BELykKq3LyKiQX5U9snDPel+JOUlCrUC9GDvBWOCiRRvElVeiAHHOTwX8KhzULmlyTUvUdLx+xwD0PKJrJuyf/PMN+1YPJIKRmspIlMv2Hw9P35q8aqyXQo69ohvnkop9GXWwQQGFt2Vh3N0wE+ShV5y+3GGV5OYMQhVBZhr/50CDzN/U0LybQa60EM6nWgb/lRlb8ABI+6jKTF1cbYPNMIg== 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=zfuQG3YqcK2pfXnmJZ/MaWRQiuHh6zTre7gukGYZT1I=; b=C6TpM4/YOPIooXwl6oZEiA1+6/1V+c2Hn+sW3hEkmIFj3vXytm+km/8MKKbehZ/QutoMr9E2vgEmJ1pvlYx70Q1DnRhRsQP3ebOCiPHOewMRrjxaf9BBPwTBFifW+E4aIgu5yhHlHIXdEHjMicY9ce5GcWr4B/fLMGV8ydXPCp4= 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:43:59 +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:43:59 +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:43:41 -0700 Message-Id: <1587087828-10419-2-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:43:57 +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: ffa05b0e-4a00-4985-906b-08d7e270cc36 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: epv6fU9bKu3teMsvf5wUsrjKVjQhnDzS0/GbLokoz/xVfK1Yxv5yBmWo/YJVd/1YM1pMXpciN3jR4VAVVjeOm4oLEzvB5/dzve2iQ+9lCRSq7rXwhvUT47FbRcyCI2QKrlkpcy0+6Mcw4FJEOtO/ugeqoHd/6CqYnWz/qbBYkfcHnk1jcGOa+z4L6yrDZzUz48uhjlXborkb7w0OOyf6yL+0JYWWYr+eOTz+YOSzm9XOK9FYRx7Y1sgXf7Jfa9skyABgYMOP2fgccDDzn5FiSBVs101snGrITa753BAMc1nc0Q5ce9lHf6v/9se+3XyRCsFQdmzBv3c3Zn5roa9NM/YXEIuqg3qJd+sleNwapSR6nrr4mFNJ5vj8odIpCYuASiSc+5vxxHuW84cYnrDFdV0tRCRPQH77Sf3jLwqZyBVsu8VvHjX5mzBitpWCVKT1 X-MS-Exchange-AntiSpam-MessageData: TIjNHElIi1RG3NhjqakgPuNcRUiMCPiElTupSIBNq4sdOnDQLhoGY71g9HR4CuN5NC8Zr52j5wP8KffF/KfiLOyzk2N6hBXocprGmuD2e/KRkGh5zXxWV2fTKav945e1tUvzsACWPlJCl8dNm3l3bg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: ffa05b0e-4a00-4985-906b-08d7e270cc36 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:43:58.8925 (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: kAx7DHz6NUmYCABKORKCzo4ec+Pq/d3yv++2MP0y4l/3q3BS5INcUG6Lpp5WLbXMKUuWnjqzf+ikSIl+aQSP4C45Jn4pjezFoTsHJZY30Bov3TXFMw06CS1iUAqzrRf/ 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:43:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271975 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=i4SCEGj9; 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 493Jml6VDPz9sQx for ; Fri, 17 Apr 2020 11:44:39 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 7DAF781A25; Fri, 17 Apr 2020 03:44:25 +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="i4SCEGj9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 6532881A0D; Fri, 17 Apr 2020 03:44:09 +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-hk2apc01on0602.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::602]) (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 9B2E780574 for ; Fri, 17 Apr 2020 03:44:01 +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=BZpbY8csCB60hDec3xXzVh/nWi7kbIfa5rUt2vdmPx50Pd2OT69ZNF8wpXlb1Z+72L4LtZuEVSqXOVTol4LZ6FqphMyw4vvyOekKLzUYTUmVMk5WxQPy+lTxAJY9Yl8jdmBSsAUSghQCfNQf99+TQaL/prEdR/XZ4hso5N3y9DoiSyGGj5dVLYcyEHcVJVxwAJ2s/AYfpTEgWxrITHMt5zZrxZjti8b80zJc8u3+cxySycnY0sClcWaYtrvQ4az/UIxUiVWtrwOgZvWQDZGeVgFl3Le6Kau+49rLAGhqiajmQmgSmsa8T90Omp1yntd7mpBnniGvwB0G1R88R+DJnA== 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=TB1rcnvmzgPdBme6KvWUbpWYCrJBVWmLFqhmSq/LM9OvsPEfAmVH6ZoQlsaEZyxekGDNQFFnVkY/3YU+aoUEeldqh8Ff6eT89n6zdgELLtOQ98qN4ODQFKdnOXHYJYXI+9I7BJ/DhklzauVUU5nhJ3++oyKrRGuAKUKYYh1GlN8mgNFjQAhU0HSG34YQx5qyeuBf3hPznKUYQkAS47RZVBXa9AgN6OFPyW8U84jq58aAESrrsVCmFGkXSZGL4A+Tjd7GIy8BbgnVbJUEY5dxvj2aEJn6AgjgvTel/tsH4gr47XlcDJW/kQmiAl/V4xPS3bJbX7S/ReUnq02u2VITrg== 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=i4SCEGj91F/Taj9MnVXOoCExjqn4HaiHTP3n7WL1pXMZNQql0SSICKHVKrZ6vjBz3Jrijr12A6CqpNORP34T59xwyjN5lAH7/gy3tqqNuqgAetFgfStd/I8uPpCLnIL+xbibdR0pd00WhEy34DbmBKcDM8l9vrI5aiMAy24SpAg= 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:44:00 +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:44:00 +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:43:42 -0700 Message-Id: <1587087828-10419-3-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:43:59 +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: 6cf5d128-9da5-48d2-9239-08d7e270cd0f 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: qMaNzZrJpGO8zwdw9+Ohmm5f8tlsbvivL17HycGOX1KbLXIxucqdgKVi80LZzz/pUhE8quNpuDnlR5wacOe1OUO6/yBAO5RjDEs4Sq5cirUa/Zv+qrOGMsE9V87hnOEUJVxz/WVom2bwP3qjyqh0hqUiRtpcZh1wgr8Z/wkhDafBPMbTeUfjRXDuG2erJpm5Jj9Y0CETRoVOJfD1B4ry3Fv7RDQT3bOk9NBlOcs7kT/MntQKw1Fv8yWN+1LSO32oK2I2B33tqwRc/UOabWBUkJaUGabx1KV+JFMgIcwTQaUgMicSXy841Q/muDImThFP5i9n7iGTepd6XcJopXtBrBcJrrLedb6KuU/yGNzSlwe51El7vIxay0dqtQxksLHtPw9wK2+a7qJkc/bxd8PfIVYkB9NDGlv895rW9fFR2FzmkmYf9f06q+OG2EF9bzpY X-MS-Exchange-AntiSpam-MessageData: mqmWGX//TMmnyf7JBYOl+Y8QvoDG3FzjG+lwYqTznhllSqLIv9lMAAspwtOeOh/WV2si/bBEBuqTF4zWWZgHIPzvUHMJir5AHGR23sSX6Bv5Hhj2nQSSyFqqAm03aZhfQfQJ0mhNQspe2ZNW5zqhbg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6cf5d128-9da5-48d2-9239-08d7e270cd0f X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:00.4066 (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: m1Mg3sWmu99cuJfYP8+Y0h2WUHASvcyzlRHr70G1Nd5LqWAfiioOY9eaiVR04w9UMknUurScHl9xs/thcIb4ETjOXgO6TIvObiF8nJ0ssLLX3eAP5PSAc6WYd5nARQGM 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:43:43 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271976 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=kXGh4UrE; 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 493Jmy24prz9sQx for ; Fri, 17 Apr 2020 11:44:50 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6AC2781A15; Fri, 17 Apr 2020 03:44:29 +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="kXGh4UrE"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D20DA81A15; Fri, 17 Apr 2020 03:44:15 +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-hk2apc01on0621.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::621]) (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 1721F804D5 for ; Fri, 17 Apr 2020 03:44:06 +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=JTsNGO5TRYmxUTNN5YDGb3eq+gMZioAJ7WWW5QHPRLWLkSGgXy8v6chAGjTuSKqq48ERX8x8EjL6YobJaPjAoR2l7N4ky3M6p79UemP3zC0/yVGB4yYFhJnVAiXdc5wZoLQIZZZ7wOxbQ4LRMWrH4i8Ol6H5GWXt6lN7Cyf1YeZLcfHKXqlkWvf1GRLjcEbITqd09QmRLBM1tb7+dTAaIqqeX316eHtnWigF/Kx1Igu5BJkVnxOo7YDLdca78RbT0i8lPLLoseoSir2eT8FcsHwMQ6GdxPPQc2pWg897ZzZOVsKxgDkH+Pnq2VWtLg4LC/9uF1xHQ5Q/b4P+8GBF6g== 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=JLKsGLKtA4MirVGXYcz5ubEYy8lBa3seORamlvveJ4k0TDuxGAEZyhDeO/Mq+AR+iKmUmY56ushAh9QOVw4mkve5iqC8j2Hy+u8vlYtOWdXSLp36u3k4MZTO07b8RMNNg6ZO1RwadhhaCyNnivw3RYGem8NIdweVQEYz5UIWrIsJSLlu0ZcIhaj9l2v0Mu1cvYe6MqsaM1o+gOWcljGVwwwxwODsyet5EvIOqBiShb/HZTfnsasFEAl19LH+I3IiDEUwI11BgsweNGlJ2eS1S0hyN7M2u2EdLZISycOPXkjrJ8YCJkBmLKB48X7D7eqcO9dQF3nWW5IpaOZR8E8Htw== 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=kXGh4UrEIvDwVEd8gCCEJwLnjz9LIqFh8/rELQ6px/umP93E27j0fkvoWV4msK9VAo5fFruZJITECIfLerw2OUM1kmQU7ktT3YmAQam2herLPi6jbH/rr/pc20ZyBJ1sbRcfNP7jcXpeRTS0L3RICC6DVsKsXIaw925jZPphA5g= 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:44:02 +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:44:02 +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:43:43 -0700 Message-Id: <1587087828-10419-4-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:00 +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: a363fcbd-39d9-495a-6556-08d7e270ce17 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: yZZvxlkPLzTEmKPjOG/u+MxoifbHZCZHz2P1UsHIxKhG0diqvXtKsLuny8HQGM9loMNOMOnAPAxN6TCbcfGU6RXcBnK+ViG7nmgNFP0eLM5a6mxUFMxAtUs6bJcj3rfX9xRB6B5KSxPR/hBZA02vE31CuIGktl8QSYGZidPsExCuuARBh3KZsjLVjCRMor5gJmlWyOs4Z5+S8u6op24cBVExd+5ze3Lsoodh+j0nrXZKhVnaAtjzFsGkodoNd1Fw33w5ZvhJXfdm6l7oAtWF+3rVX6IK8tTjeo+FlXXviIPfmz2pBQ6JgYablpQSp1BzOloKmhqF3EPA/mM5/t2uiPLvT+6IdUoYBPDMERC/bCM0NaPXzgL4s3bTng9Xe6Foee/DPe0iNLR2+aGaVdFXZslXz9brgu8lroxaUuCUBWglMNmX4OC6gLFEelPKCbeq69mEz/v7A1ErhsPOGR5CfJQ3EvNg5bOwU23X2wjODUltoxriwYku/PE2RRHgOy6U0bZVCozEclBsUzN6XXmUrw== X-MS-Exchange-AntiSpam-MessageData: Pzig8tq/n2CuNm9yriZc2u9JmhelyQiNsaOkgRqaRYb5YFAgJkp2n6v9CGLUAmzPVzJMhTXA/ROf9JYt64zAGjLGvh5B6iIfi6oXGQWnizm/TSo/lCiyPaNLNojNFQEKL2Pc32cDG4ViTRQVOVSoIg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: a363fcbd-39d9-495a-6556-08d7e270ce17 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:02.6294 (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: Tck2Uf3SzDf+qSbXDepF87oVAZuhTAQPXbZfZTE0NyRt3xLASoRfx1V5mFwtgTjMRnjFxjx25tbaKVOE8k6mzczNwE6KLHk4/nmNhbEoGe4UOnZSp8orD0a4BA+N87A9 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 --- 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:43:44 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271977 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=EWbbWkNZ; 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 493JnB04kfz9sSh for ; Fri, 17 Apr 2020 11:45:01 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 3FE7C81BED; Fri, 17 Apr 2020 03:44: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=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="EWbbWkNZ"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 65C9181A29; Fri, 17 Apr 2020 03:44:15 +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-hk2apc01on0621.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::621]) (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 4B47081A07 for ; Fri, 17 Apr 2020 03:44:07 +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=bfedai1F/lfgG/Yz9Y0LhBdwojjDvA2cnS5jrCIVhzcif9Oual1kD7L6ovAoO7yrpnNHUZtjgOXZRYcy6XSeOYXL2sxgHpRIezKscZGYxF4meWN2/ez1K94ehZr5FkpE65LOI7k1W+ei/Rtmpk3ie4YoeMkY5SfRqyIUGPBb4NqQMLN9r9eVqPWlynGcIUahqCbM0GbpsD7RetA1SeGb7pxpwxgO5sbHiz1ay8wa91flPnTCSnV1QP1rJeryWWG9XLaAh9ggOj0eCtHPZKC2tba/LideAw+x3aArO6sH7XSpbQG7eMtWIWiRwQndmdMHTeX2DqN+VIj2KRf3ZqCmhA== 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=Y45YJ9GgF3zh3MLOijEQ0WNGjCmyg5BXn11a3DnL2gMDzUURim7kh4q428zBB99ZV+P8a36q5WQknLIxyEcPs22t/4boS/XCCWEKY/WJ0Abu68SH1xjYS4azQ8mR3IekePjYrlWMBII/jAS5GQ9vILl7/0M1i0ioDMyUrjWbmVIwfUD52m9WMzbZ0nUCSqP5qS09MWBjA+t82+qKkXADc+uqVaCg+7KZpYS524DT3FaLvOGXboJvWnHUfM8ZFmTbxsYSnTpUnZSpCfUuO/qtrkIwMHnBKwc98XFY7G3TtJExT0CM03s1opcvwPeAOic/rqU07GdTe5jcfSbKcnAQQg== 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=EWbbWkNZOtUlogruFwMwW82C+Hww9qjVBkiP1ymh2FvXqkePbJxPwe207JOmjvIc1M6odTLFNlB9U8OcouEGGMrh6YvPmsiKvllrjmX8fPDR0hOPaBwfOAfyVE/Ah5Ke9A/0gPhTixhhnfeKjvW/eLZBz5qVm3Md+eUGF7js4MA= 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:44:04 +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:44:04 +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:43:44 -0700 Message-Id: <1587087828-10419-5-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:03 +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: a3c12006-3f57-4e9c-3534-08d7e270cf4c 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: EmIieK4LMIPiVx9A09UZPNwLLy99YMkxptrNIAauMYCLMrjpHC7Va517JTErp2sKs3D5BKM+UBPQYx17NZXy9RGQ1UTLsGa6OCdcBekpoKtwP01Ln2pp8ZfpcG1FZCBlXKyXG+EjWLCyVkqR1UGS/OAPXp1cna/9sIfAdqdBhusOK0tl/zD9cCbbJmctGjExz29LQz9xihK7bhHeXrpR9eFAf2RNTWsgqEAhLuTtKL8XYKd+PpZybp5oYVWwXEO7qtDETChIGzUu79Uu+/eeepsxFPCFC+9ak40mfZquhIy5EJ4qYlIWxesXHgnm66kqMWjEEwy0B0Ku3afMF+EhZbkQ4YZBQrWOmHvmeIQD1zzZlfoo6GSzOW0tf83Cypbs7onboOagCav5KW/xWWwo3DCaprAhrudOsyzX2UEFMMX0ff448UiIW9Sbm94NhY9A X-MS-Exchange-AntiSpam-MessageData: RjQUYKw67rF1nctpjFanV7IEAFM5Wq6RljK/6hZITSfpFSjRiKa7McgsVnQZ+NuzL75RqUuedohE5rSa/HCgwcYnvSwC84Ciz2caPPZmDHpmYXZCPSPiPmnd20Wb5PJZER9ENKzseNKssR8iYAvAlg== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: a3c12006-3f57-4e9c-3534-08d7e270cf4c X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:04.1765 (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: LxKHSNFomQNLYM24OA3kgRdUWJpB8o05jMjZx9LwfaQUkQD/y1jkJe1WbmbSsxod0g9AZyGUdRbAEXJouhkflXpoKwapLqfz5Q3ZMHPrz8cCvSs1lNcOZzh1ta6PyTZT 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 --- 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:43:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271978 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=b0dS3dG9; 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 493JnQ4smsz9sQx for ; Fri, 17 Apr 2020 11:45:14 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id A326381A2F; Fri, 17 Apr 2020 03:44:39 +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="b0dS3dG9"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 112EF81A07; Fri, 17 Apr 2020 03:44:18 +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-hk2apc01on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::618]) (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 7A3F080574 for ; Fri, 17 Apr 2020 03:44:10 +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=kKPP0TdalVNPTzBk23LPKmr+DHc87CEtu3uPUMI2uEbOq2XanIdPDSA2hXuDZ/q4PWEOLQEr7uH6cdn/IC/W2TIcyCD4eDyQwrnGhod6luu9DGFh3WzY5yemptoWdTksQ+LBvrFILMiHVxaCzX/gpLYysMjsoPzG99wDB7ir5yzKdATP6BFjB8B8ung2BzX07rWLr0XhmC7HCpIlEspwFYJy4ggzojdS/eTLhvJ3M3MpO0YRjhC8w6VHtK8oZNXXVzNUCc40QR87DFw6b/8y7npHTOHhStjaou4PB4V+E/Sx24ib56NECnAlEZV8+kaPPrA3yzxTzHSA4xzXwWBSWA== 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=gaMBCj83OgPGeoaxAlaJ+QCFS5ATY1+bzfGtR/VDzS/UeuENP0rm2khVi2nLaXtJSYfQ0VrHp5S4MCWBlCPjNqxzSFFooupwu15MDGyCttLoVs40ejECvDHqykJhJRPqGZ65C2F656NHpwzfl33PjpYeItuqdk9NmR8j8byeIxXEVKUj7EdNExQx3c8gfNgWMZe4m7w+pQivaFXsSuGxyNMZNwhsE9IiP0btQuq7dGptS2NkAmovyy/AteBBwkaqDhgoZ+zrPfyzgqreh93U7x1xj0Yh4axHehMd3hf/qwnMmBQ7ZMeQToAiI3vNDdkNUQKwl3835s13clTxJuRcAw== 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=b0dS3dG9OJuwnzhahNFQpOQ8y2CjUZBj1FO9BqELcEs6cqJeoy0u4iiXsC/3ddacnwjWsdBL7KBo4ppWKKJTgKRWuxmw/Q7lXzh5dtbUnV6elG7crydZZie2zL7b/+xKKGRti5f8cexF0jZOPvNLfwR4mzh+AJo9f/Hgtb1XxQE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alex.Nemirovsky@cortina-access.com; Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com (10.170.191.16) by PU1PR01MB1882.apcprd01.prod.exchangelabs.com (10.170.190.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.26; Fri, 17 Apr 2020 01:44:06 +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:44:06 +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:43:45 -0700 Message-Id: <1587087828-10419-6-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:04 +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: 6ccc8d1f-dda5-4ad4-6c25-08d7e270d053 X-MS-TrafficTypeDiagnostic: PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-LD-Processed: 0694623c-6669-497c-89c3-3a32a9934313,ExtAddr X-MS-Oob-TLC-OOBClassifiers: OLM: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)(136003)(366004)(396003)(39850400004)(376002)(44832011)(8676002)(2616005)(8936002)(956004)(6916009)(4326008)(5660300002)(81156014)(508600001)(186003)(86362001)(316002)(54906003)(16526019)(6666004)(6486002)(36756003)(66476007)(66556008)(66946007)(6512007)(2906002)(52116002)(26005)(6506007); 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: ouQpqyLfwM0sWUvTnbdNi6MidYsnxSFOqXrN5Gk6KgCD0/Mq0nNCSb+qT9rTQFGpwre2JuCtQqSbHqVP8KbuiBrKkTiXxr+l4TD5h4QDONxRIechnrizPo/kjGu4jWmDWIZr+sBZpMFVo4hVR2ZlKUAlzvUJpXkLuC9Jgzc/73so5bLiA4eYrw6vZsN27Mm8/b/wb3pdfVqwIAcNPacD+Tdeps92VpBN+GJQ2hBpjcieJCngo3Rm7t/Wh4DoDRnNOoWrLI39hTgbfmSLMQjhvfoKdBbvXpBcFQIU5f1oXP6SLnH15pKfPJVWCMYOlN++DzGEXYmiaTDgB0Txyc3Xhyox8zSm3uzEWP9d0As25RM5cvBoXDopm5J9IZQk/nLMr6pUJ1gYc1QL7X2X1NLnfB41PRZQCCtJp8yQaqcb4g0TaIWWmQiOwvJ7m8eZOSQl X-MS-Exchange-AntiSpam-MessageData: fN2DVrgZkrJX8IYHZkMXZd3avUxmM9Ff9cbaxFzp2Nc7pqFzKvBZ6z2KbwExaqDtVEph0Ywr3weTbUQp2bK3G4oa1BT8vShvhrF0reY6eEXx+VgOSGmFAo2N49jY8Zz60EZ6VYfrk1lOxzkvqyw3vQ== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 6ccc8d1f-dda5-4ad4-6c25-08d7e270d053 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:05.8705 (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: AwNgLxq9eS0D93MeRJz7ca5ODQFYa6oSfxxxGv0uvA7AF0yzK5Uj5llfDLb2bJUJTffgm54i98RcTkVbJsf1OyINdnc95sa2qVWNfMFKZuyUj/Zj3zAP3ImXch/31k+r X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1882 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean 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:43:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271979 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=If/nRp/j; 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 493Jnf5PD7z9sSh for ; Fri, 17 Apr 2020 11:45:26 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id C021281C43; Fri, 17 Apr 2020 03:44: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="If/nRp/j"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id E11FD80574; Fri, 17 Apr 2020 03:44:19 +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-hk2apc01on0618.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::618]) (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 7F5FC81A0D for ; Fri, 17 Apr 2020 03:44:11 +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=AZse76HBaFWU1UO+0mcGKZKgfOvm99Or52hWS/PPVrCdUWOGuzAZjj+4X8fmNBp4TOr3+coxo8NR0U3ArIlobjkpdtXpQSp85mrGLy8gVFVkJME/JscHuGgux/oExujsWN736BL+2MrXZJ2YD7vbEFmcJEXXnOtosTU9pHTeuWtKx8sfS7k3JW1eVArAaz/JxTqLkYKIrzm9LZsisHEOFiSgSoo1lAzXnJnUYf8x1wes+Hf4UQwSBLfPTXUn9fyX5H9erhhhmQptSmfMQ1D33KMvp8hsrijxsnUS2lUs8NoMQsrG5KY9LNzI8liOzbKZWXPkGWNbMImvBho+JyAgyQ== 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=HEipjgXcBWkdjSMubEjcfc93UdUWleS0OXdf+6fCcIdbAbj6Bzso1DytbhlyoiJwxKeb2FkLiU9NTk6g/GwdCNiu/t1+/47KRZyX1tVYdU7SWO4nCkraOFWNt3FTHAfxOeDL5EnnaFsX3gzRXQCYjlBAYXeFWQcJKBuuefr+aJyQnloVQSkInPN3VRvrkwOIGmTe5urdKJH24oU8+0jovgA6H0KkVODAUA+A253IBPcZRmGKJv+v+ZbDLImc+xq9cPZvSHKdTFIRr6P1u/2elRRRLdIYsi11NAYF3A1x4rEVJiyDATfUh9Gt83gz2EaUq8XOIHLvzTz8NUjquWjlxg== 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=If/nRp/jMkbhjw6rSdxrGToe+7aZrbbGDkwZduShFnOibsqokz/aaWxkMglTVuvMcSm4rvh0qtPiCBALCVFaXI7vIplTF6neZ5VOGunRvI0vCviahEHchmjbLFg/zwYcUxDikNeUBJvUByLH3j9ELgwqsaZ394Umc5Acb+tqLBM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Alex.Nemirovsky@cortina-access.com; Received: from PU1PR01MB1964.apcprd01.prod.exchangelabs.com (10.170.191.16) by PU1PR01MB1882.apcprd01.prod.exchangelabs.com (10.170.190.143) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2921.26; Fri, 17 Apr 2020 01:44:07 +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:44:07 +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:43:46 -0700 Message-Id: <1587087828-10419-7-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:06 +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: 9ca77f9e-d028-44f9-e8d4-08d7e270d155 X-MS-TrafficTypeDiagnostic: PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882:|PU1PR01MB1882: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-LD-Processed: 0694623c-6669-497c-89c3-3a32a9934313,ExtAddr X-MS-Oob-TLC-OOBClassifiers: OLM: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)(136003)(366004)(396003)(39850400004)(376002)(44832011)(8676002)(2616005)(8936002)(956004)(6916009)(4326008)(5660300002)(81156014)(508600001)(186003)(86362001)(316002)(54906003)(16526019)(6666004)(6486002)(36756003)(66476007)(66556008)(66946007)(6512007)(2906002)(52116002)(26005)(6506007); 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: u/kA7h3bcCeI0G+TiiFqZcPs05FIxpBirIJVsHMzvbn51QH3G35+KJiqvm+hXbsN/hAB1X6j9Y60kgrizMRtZd8pzk/N3hTt08qbdZaVF1yWuBqXwzqHiQNz63u43tRynk3g1lzc48OJ2hW81uFM8u0BshHu6osqlBhms/htfUh7P/K5UWnJYX6trBRV0DH/10HBazhr5THF64+yAcG8+T5eH6FLUI4z5mxhfKzDwmLKI4X3fi1KGkVJnoe22dHSF0ZaR6/eGflz3SoJUa4J2ybxwj80CIjllrFxFLQiHGc7UPYYPJlw+LXJk3ENs6/No77gJMRpwEysK87CF38bYjqNBctYEeB/CyNui+DH8HuKx+IRVrqLilMW1kVbFyaozbUcYdiseRvBhNh7hnN8rzs8VrKJ9O9Jq8y0AI4Yw5FxIUfk7BmYqjtejmd5ZYMa X-MS-Exchange-AntiSpam-MessageData: WU0r1PGN1GGsPYF9kYYbkPGL09U7KCTWv4r1ql3owWki06GHUk+E0BGmoDjE1F4xZWfze22deys1YOgZsYNifFVjp1IsnYOLpARGiU9IeHC1t6JA58UrtWIZZJ7Qn+Kbve9I0DkrxX3QqGwavm292Q== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 9ca77f9e-d028-44f9-e8d4-08d7e270d155 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:07.5125 (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: L8AMnHwq9GF8BDjYuo7dGd/XGnOEYZpsZR5wh269ZDOUACPtMTP5KPd52wZL90WoW3TnrRrKfS+9zdq0GgQIV/S3ogDRNQkV6xTtNSZLuHoEMVCmsI/Jm3k5IIVtogLw X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB1882 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.30rc1 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.2 at phobos.denx.de X-Virus-Status: Clean 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:43:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271981 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=No3V/30P; 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 493Jp43Ps6z9sQx for ; Fri, 17 Apr 2020 11:45:48 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1554481BED; Fri, 17 Apr 2020 03:45:07 +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="No3V/30P"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id D339581B8F; Fri, 17 Apr 2020 03:44:29 +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-hk2apc01on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::62e]) (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 BEA0481A16 for ; Fri, 17 Apr 2020 03:44:13 +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=maWoG/rwrzxUVnp0hz82Lg0quJE2L1VKPQtd6jJ+E4kkMVIku2K/6xOwldX1oAHodDaTTSMTFNJnvWEBHkuYw4GT7echRfcr1KEsilu3Zw04VSGyljVIXk8PXTq9ev9DGeYYuM9esWc92d35LSdBJRmleYct85OT2bdvO+xv+umWs8tI87R9yc2FeYmcugmcq0x4Ze8MztiUd7DJxAmcZzcRgj6MOsbW4mpFQXR292Z5IRWs+9jp137mZRS/w0MGecFM243JyuxNh/FBql7RuOzG1xk7I+gEtjs5XpbCKnFAfNi4O9vywk79945FDh0bWPDNn9Pm2bSJPRrmhvUeRQ== 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=hXiAiQauID3efC05aXgEPbqFRztCopWJT31jO1PB27cuU/ghWYZoI9+THjslRdDT1mkLhzw0qGHJ1UAv2w+9PoBG6fZ83xKbipIb6/+hfIx/ZM4jI4zryR/F1+vLiO0FRNwy2ygL3Z56mGEFySdwmFjTSwzDKCXhf9BR/tKGgQEQ0DzVQWfMPHAIJe/RfM1EAvho/c+ATnYywVbYiJmOWaqLsbgH0H09VtI44RMxhx48RM//20OSrerObNtVFOWWXc6ZdC9xDzLA/c2w8fBIauwHB/FnJHocdRczToRP90FgIEfknB4pIFIEljnPCSiS2eJ1hkc9XCVfwMUX5IYmLg== 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=No3V/30Pk1vTmyIXk4zNgZYgArWfvKx331iV3heFFTDLUDf023xHQepW5oUgy3kFAF27tps396gn8tZORKtwC/Fa5WVggCXib/z87SeL7EgJoMdZZPzZ/sHYeMsypjTslMKCRjgaVjVNzzQIyrSipUgN0MPyooKudxDVpuy01E8= 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 PU1PR01MB2137.apcprd01.prod.exchangelabs.com (52.133.193.146) 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:44:09 +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:44:09 +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:43:47 -0700 Message-Id: <1587087828-10419-8-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:07 +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: adf57a42-98a2-4320-a4e5-08d7e270d270 X-MS-TrafficTypeDiagnostic: PU1PR01MB2137:|PU1PR01MB2137:|PU1PR01MB2137:|PU1PR01MB2137: 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)(376002)(39850400004)(346002)(396003)(366004)(136003)(8676002)(6916009)(81156014)(186003)(2616005)(54906003)(956004)(26005)(6506007)(6486002)(8936002)(30864003)(16526019)(52116002)(316002)(6512007)(2906002)(36756003)(4326008)(5660300002)(86362001)(508600001)(66946007)(6666004)(44832011)(66556008)(66476007); 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: AbLTUCCffCZFp0zWzktyWLHmxc98SUGHuL/e/YXnv/57FJsCWiDu3YNNgHGmCjJvmq/Uyj78/obKqd+J4EGnlhjfV1M4HSm1+KVZkXhEcSo83zTYiHuiREqTLEM6KNw6p7wLPlRJ3TJwCh/OtUgXqxZ8nDCC12Ij1OFbwyawQcWCJAg0teGSRHz26Ji6dZDwcmxShdS5LReJSjOF5eXvbvP905HPFoZVuf6IkrZUedcKoToKN+0UhpAPr7x8eaMKfnkptirQxi9gjQw0onMDOz16rOrJIvYZFYwXGxl0oS9bEbsbnFnrTDGf9lfOKRps4JLrDjnj2T0vpSRI4pCqQqC24xqOEZKpnBoDOItrpWFilAO7lFZqyxXf3SFjGbd6tdr1FfCVDIjltuwAmwN1cYALWb7hIrKnUShgCQ+Oyaukd4WVaBNO0Xdo6XPVdtzY X-MS-Exchange-AntiSpam-MessageData: aB6LEW5R5i9qdgyPeNq/QES91P1asOUsm6VJ1PRdlVEZiTsWUhAemqsxixWqRwxZHGgzVAD7LYaMXXV131qtzcDHkGzzaHfZ1CJjsdHA5huAcY0G+XQ2khlp42CUktGxEDbXOlVIyQgWpxms/XmxWA== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: adf57a42-98a2-4320-a4e5-08d7e270d270 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:09.5913 (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: //oL+Hl0mbJOA6yD+BnXsXYp5/LfxmNpjbhMEV2k8JT3HTHPwEym+3DFve+PRUe/TLZt8bQLqIpAcutYh46lISa5I/oQXgRLUUFWKqluYfKlgjd4PuT36ZSZI9YxoWY8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB2137 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:43:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Nemirovsky X-Patchwork-Id: 1271980 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=dCP75QI8; 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 493Jns4m69z9sQx for ; Fri, 17 Apr 2020 11:45:37 +1000 (AEST) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id CDC0481C5C; Fri, 17 Apr 2020 03:45:02 +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="dCP75QI8"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2088281A2F; Fri, 17 Apr 2020 03:44:23 +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-hk2apc01on062e.outbound.protection.outlook.com [IPv6:2a01:111:f400:febc::62e]) (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 E568781A25 for ; Fri, 17 Apr 2020 03:44:14 +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=eSxjkoXjCwD8oieREkM+UuljJ2OlFt4LTbKOinhKpejd9tOSb8Jyj0mgksjxLw0YMJjSPymU3pz+8WBpUUh8HNw0rbdzoXToIcfErdjp68xzSwZIKfP1pxdNBP1tVg/35GBBi7P84ATXq++BMarhm4eTF1rzQDq/FtxBFQGh168zP5eGY9rkQ1P90aeoZxoi9nu4Gc4mDEEgCDsuv24uL2Mj5CEsM9sYOOnYP06ZgtfPNGhFUAEqkDhlXgmGU7geh4+gXKX3smgFH2q4MA9AsRhucOWuFzD2wr4LyDX8Ki6GiDTDaruJY8PphfjEqKypOa8LS7VsxmOB2UmrHvLnTA== 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=auocd4Ciu9SvT4CILDH5Jjdr/jECbKaUAF/1K6UU7XGgZtHCoOh3jacvhNAKdxEQO6DGKQGBRnAZNXRvmK3xnWN8wb+ouphorBRppdr7FEhPJuc/vckVdBf4bpD9shMESzUdXjdSYPvKgkLBPu85nNoAE180fk32yfZIpd3mwnME3ujx+OOndQMDXBIWae5kBo6Axkf+bJMjYzaLEc1A1z75+6Bb/H6VJETrlyvyNIXSolJzfCCr8KNyyoAf9p2SBcTJXgvkPaXP2h7TwRq2eIeu4g+qtFQl96f6Vfp6oP7qWF+R7HByz1YtpWFLIRtUyTc69DwtRLkNn3vqreIh1g== 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=dCP75QI8bniiCX5PX/UhvKFzYd7JGJmXkDyaN9taB/72b2frg5VrA/J07KJKTLV4J48/QxrBxdQ3J9H6VMEMAAmGBbnSNtG4NTc9bTWqbF7u9pVkjN3I3togjm2nRrhCz3kN+UTtc3ZMUx4Lk1v9IS6l/EtExlR4Bs++TgQm4uY= 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 PU1PR01MB2137.apcprd01.prod.exchangelabs.com (52.133.193.146) 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:44:11 +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:44:11 +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:43:48 -0700 Message-Id: <1587087828-10419-9-git-send-email-alex.nemirovsky@cortina-access.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> References: <1587087828-10419-1-git-send-email-alex.nemirovsky@cortina-access.com> X-ClientProxiedBy: MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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 MWHPR10CA0010.namprd10.prod.outlook.com (2603:10b6:301::20) 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:44:09 +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: 16bed386-78e9-4d9a-f93e-08d7e270d384 X-MS-TrafficTypeDiagnostic: PU1PR01MB2137:|PU1PR01MB2137:|PU1PR01MB2137:|PU1PR01MB2137: 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)(376002)(39850400004)(346002)(396003)(366004)(136003)(8676002)(6916009)(81156014)(186003)(2616005)(54906003)(956004)(26005)(6506007)(6486002)(8936002)(16526019)(52116002)(316002)(6512007)(2906002)(36756003)(4326008)(5660300002)(86362001)(508600001)(66946007)(6666004)(44832011)(66556008)(66476007); 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: +LleqlZ7r6wQhMIZbyjdWD0flOy19HVY0J5trQkAFrmstT4I+gipVAOrkD6C3Dt3xZK3NGFsjZMOfwzR6EwRvKGziS01Ca0sca+1vFjb04IGqvECZU43fHXsDtpt4yheSf/ahgMq51IiCTi2udhhxaDsEuFla4QM9cGPZwTYzEgsb2JplMjw9LJQ2qA5O4JmavoREykUNjOzE4AThv6mzQdUedtw5jJnXYtRnI5HvKHQm/nk3n6i4Q3Yg9+ihUAIe/yFpmmAzaYZIaqeD2ezIa6Z7eNSIvzVk2J9Fgw2eL1c0X/6WwppLpzDVIgZbohtM6CSQm/HA1XAGKG6COXreLU1KJru0zBuWULQLAkLtPjdNF2sfjBW6ljaYe6XWovfVg8qPDT9ylhwv9MjFjpnrZxf9cwydttVLeVmboVHNwjn8Es4+BUR7ulg2VlTTfCn X-MS-Exchange-AntiSpam-MessageData: l1lK3GsMt8ZpNnEXMP7Vf+7bF+8xfjIUmBSbXZdw8+DaCPOP6tZSaEqnk91RPUmTZC4tH6S7VhNSh7D8vENHhGhJtF891rDuYaI1/wRzAdZop3+oc/XbXi0ta+u3g8mb1SSgm4HRv9mKWuW1y4qCdA== X-OriginatorOrg: CORTINA-ACCESS.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 16bed386-78e9-4d9a-f93e-08d7e270d384 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2020 01:44:11.1654 (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: XV6TO7yLqgIBMoslLRB3PYqtmdkm+cp9UaPlyJO+704Qh+HLyuPsfhgYfBy8VHLvMu9juuG/g0cwjNGSeZmOyiEeSNdzJpTj8GHLusw9c7kCdtmezgsDFF7yv3CCML6c X-MS-Exchange-Transport-CrossTenantHeadersStamped: PU1PR01MB2137 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