From patchwork Wed Jul 15 22:49:15 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Alonso X-Patchwork-Id: 496023 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 168D914029D for ; Thu, 16 Jul 2015 10:34:03 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 92A374B734; Thu, 16 Jul 2015 02:33:57 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id o-cJQTzRXhJh; Thu, 16 Jul 2015 02:33:57 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id F28204B703; Thu, 16 Jul 2015 02:33:45 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CB1134B61C for ; Thu, 16 Jul 2015 01:06:22 +0200 (CEST) Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E9bQwCj7CQWX for ; Thu, 16 Jul 2015 01:06:22 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0140.outbound.protection.outlook.com [65.55.169.140]) by theia.denx.de (Postfix) with ESMTPS id 1C1254B615 for ; Thu, 16 Jul 2015 01:06:18 +0200 (CEST) Received: from BN3PR0301CA0043.namprd03.prod.outlook.com (10.160.152.139) by BY1PR0301MB1224.namprd03.prod.outlook.com (10.161.203.20) with Microsoft SMTP Server (TLS) id 15.1.213.14; Wed, 15 Jul 2015 22:51:24 +0000 Received: from BL2FFO11OLC016.protection.gbl (2a01:111:f400:7c09::130) by BN3PR0301CA0043.outlook.office365.com (2a01:111:e400:401e::11) with Microsoft SMTP Server (TLS) id 15.1.219.17 via Frontend Transport; Wed, 15 Jul 2015 22:51:18 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BL2FFO11OLC016.mail.protection.outlook.com (10.173.160.82) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 15 Jul 2015 22:50:28 +0000 Received: from bluefly.am.freescale.net (bluefly.am.freescale.net [10.81.17.130]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t6FMoOQd030445; Wed, 15 Jul 2015 15:50:27 -0700 From: Adrian Alonso To: , Date: Wed, 15 Jul 2015 17:49:15 -0500 Message-ID: <1437000559-3208-7-git-send-email-aalonso@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437000559-3208-1-git-send-email-aalonso@freescale.com> References: <1437000559-3208-1-git-send-email-aalonso@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11OLC016; 1:XVZWfdvFctotcfTSyx94EsHwe5mlN5ZOMbvnoAAL7UKOz/R+Bxi0c6eBeAuHux65n8KQgmKgomLkqUF2ou7kaT3u54pT0+W6uYAMBDG0RgFH4NjzHWHdrLGZZhjDCXkGQ3FXYyXQRa/Cg2Ewk9QHsPy/zNH7LJF/EhDmOHzdjXL+CzYGCq8FTSBckR3Qk/vlRpd144mu/eNAEWWEdv23eBDYjp3JJruYm1iVLwWd1F39oMzl08TD24tRUeteL44YJOtnz86Q/w9+/1lwuDEYbEYUYBCvnMvdzqYvn6QJUO4SZEOjfFLQmc1BKZv/j/GfSTNuWgvygEwurrqkZ1JjrQtmeLwyBsoJ3iefekOMN5LjAEzgrrThdcD73oXXzesbLHsvLZXT6qxt28yLoJWqebdZetLIwBn3MqMMbtW7cuFMQYIjU5W8C6saGscfgVIg X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(199003)(189002)(106466001)(50466002)(46102003)(85426001)(229853001)(6806004)(76176999)(48376002)(50226001)(47776003)(50986999)(104016003)(19580395003)(33646002)(105606002)(92566002)(189998001)(19580405001)(2950100001)(86362001)(36756003)(107886002)(5001770100001)(5003940100001)(87936001)(575784001)(77096005)(5001960100002)(77156002)(5001920100001)(62966003)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR0301MB1224; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:sfv; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1224; 2:+qpUtk5PPQUUtXBzTPetP2bqDGDWLmFGjRd3BHsOOi31QAItvTT8FDPJo/J737aE; 3:Hq/wBVm5qIBkMEWESm9KRlDcF7ihGcWJMBKzLrETmg2OWY08BtX4xg84+SHn5zKHh4CjK7p2SFXHgyNdPs69c+qKoLxsXUwQiFJti88SJovO7C0N3vbupBt3narPFuvoXcQtidOvXSyF7mJBimkHXlR9CNSVybVVBEKj0en8Rb4LR5H/3ojnHGPef3S7o+OTSEhKEQwJ0/PpB9LbOiCoMfGDaFT9vXdooxa7qmbVqLc=; 25:fnKPwM1tb+Nu7lJNBCdZCu0DXkq1VNNugYjgYXZif0ayXk+NTm7gKo+aqjo75z31naEvHKgRpAsCQ2EkYU/DrKC3ifHVweCdtDJ+n2JHzOgovfVpqR+kLHMQcDww3bQw8u6LBTN4e2x4XPW+aum/kIUj6tK+10/1dlUXRE8qeAFPDLWd3v7iIXx49Jx7+eCnbFVo2E+tmL/YbhDfGZPlIB5FTSEwTXjDwwb+2CfCt208K3U+CiTCb/WRiapDFUjO; 20:UD93GyRe00XNDuEobWwknCj5JNzU8oAVyx+JxDg2lwtQ1UIe7qNKYEc3l8NtlxnGO+o1FvgeBOpjwI4lNMHL01pZaFOfKR4TotB9SzcPhXqNlPoTdfQ3YAoxt6CMSUadyi3A50uWOs3lpaKJ1OEQLDZYhimQNotVzQTUUfwqnD0rKHwZwSSCRzwwq3m5ElQLJChMvkkKT9zFTJvTD2oRZYNTMTmrCu+8BtFPQEPUd7/TvYTRMWHlb6WMTPe9uaHI1h64HLcWecpZu/JSJEW5yADt4WPzr0lQwIORtA84KuODqVvN5L99bR1Iuw8ZAC806uqIN3TsLZ1d1INy+5CR69uv5VDu4AGWiON0u145BFY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1224; BY1PR0301MB1224: X-MS-Exchange-Organization-RulesExecuted X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY1PR0301MB1224; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1224; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1224; 4:C/yFUKRV9Q1ebGbcXGCijMfo/4PkP8Mto6mSlE1ru/4jFZzl9GNnmfD7KtRVd2QwOSFsSMBDKvGhl5qdaJHZ8bRaIkf1GtKEpzdGfXaqop0KC9PzG5o8JjJX8Oet8I4xDv5pJZawoJ2wS/plzwcXSTuED/EoBwg1LPpZNgFY4Wyvk6YdEsSOSPgaotdZMgqS+91XaneHc9Zz5w/LPSAb+lZnJmOibndL34gRKD0lpD3RcLrn75SzHZlHZAAUQrGhYNZt+FqKEYXocWcaib5EBbXbJd80LzPxMt+ZXbUcBzA= X-Forefront-PRVS: 0638FD5066 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1224; 23:OWQ5Kq7fiRqs28nEl8Mv8oERnnqK3ZqTZ4v2doW?= =?us-ascii?Q?ycM0/82IxsnRpkmaLMhq0ijXIKRuzW6ePN6i7MtAYJWqs5kK8kP/rGZmVEwo?= =?us-ascii?Q?Q5bxiz/vgm5GpsWLBBLyIckM5agdlneikqyO5dlNpofLp1lpy1grZduJDau4?= =?us-ascii?Q?A5jB9heL3UeOloaYRDPEMOw/GG2F690Jc9BPKJJk6M/By82wn7KzNGQd+E4T?= =?us-ascii?Q?QJCVHBfaM6VEKDM0TKw+Gq9xLcvdNFlZx2NNdHA35tA855DpbFOu8TPQEqhv?= =?us-ascii?Q?7c/LHVciY+6Pa6OKRLcMrmSR3JVA7GUWNoQYeR7Gi+Kxcb50g+GBxFTOW9jr?= =?us-ascii?Q?AmQcSDFYwaNVX85bbuA4tHG/PPzgsrX4slV882dVHoJFd7kUUVhYtRPgwrZ/?= =?us-ascii?Q?ChlO3b6WImoPf4GSQCL3hLMScbjYQVDNXYe+raunAxdx/qhMG9+SxnBk0zPb?= =?us-ascii?Q?WI4A3a27H52dYOzOKms/HmH24VApgjsDJdYkSdpJqvxcQcPNoxa3lVBhKeqg?= =?us-ascii?Q?jcLtF9WaSNI4wuQ+BtHqLWDXO6bBeRhxS9s74GsyO3xVCfual5IIixRp+tX4?= =?us-ascii?Q?MaU5QTGfi1yR6UDDBhjpgdNzxS/A9Ite++V+wcxua1jkatmhslPtOL0oCDkr?= =?us-ascii?Q?1aU+lLVcd3o3Hx+dL5o4YxBK/CkCaMlBFefmZlVoT4qI2m1npzMheo38IWGV?= =?us-ascii?Q?0VvurMAnLiqgAvsM/t5GdoQOxRd0Q8mDVzA9MMWWMz4KA7gDl9G5j+X9Co+B?= =?us-ascii?Q?8teUXzy0zhVei6O27PprD0IWk+fUG7+2eq7+k0UfaRQElvidSgAIl72Dp8zy?= =?us-ascii?Q?woxfk1XTW5v3x89X35Vm73RNXLNNu8jwuOYtQms/OjgzHmiIsk9lr/LRso7V?= =?us-ascii?Q?bWJwUK+8Vhcl62rQ6a7DiB1XX7vGPCyWgLu9m3/exzXHjU5knxEolGA3i7Qm?= =?us-ascii?Q?yf5cfrF4Oxln/nn9BQpHbkUd6A9xai6gT2XDGJt6qrV7XKR3xMUgVNJb/ZyI?= =?us-ascii?Q?D3an4rbzcnxU6Eh01kZPiY9kE?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1224; 5:Ea5/kUrmBJFPDhZD1nJqnhMJza/jRNdqDYsx2DOPyI9EqRoyVT7tRoz8rnZkL5kkw7VQfn0Ar/IS5VCGleDVNTy/5LMa23aKduWa6nQi5lRSyfnj6HtIALkytaBoRviOkhjVPPCGLBM98ogBMtXNXg==; 24:MZwPC6OQTOCwatph5yzaNAC9plW84j8pd83db+e4AEfx/zJa8ZISOM6HAzgkrGTHawo5t70ZWgnn2fWFfuBnk9txAWXj86v4IQJ/ZcMEltk=; 20:VYOufvFf0XTHrXKZbUtI4qjw/B6BIAlUE1WmMhO96qtOATQOPLRZJvQi4xSeDnnVQXDKJ1AR6sfvVnV2uuqYeg== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Jul 2015 22:50:28.5188 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR0301MB1224 X-Mailman-Approved-At: Thu, 16 Jul 2015 02:33:38 +0200 Cc: Fabio.Estevam@freescale.com, otavio@ossystems.com.br Subject: [U-Boot] [PATCH 07/11] imx: ocotp: mxc add i.MX7D support X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.15 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" * Ocotp of i.MX7D has different operation rule. This patch is to add support for i.MX7D ocotp. Signed-off-by: Adrian Alonso Signed-off-by: Peng Fan Signed-off-by: Ye.Li --- drivers/misc/mxc_ocotp.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 73 insertions(+), 1 deletion(-) diff --git a/drivers/misc/mxc_ocotp.c b/drivers/misc/mxc_ocotp.c index d92044e..7f0e9e4 100644 --- a/drivers/misc/mxc_ocotp.c +++ b/drivers/misc/mxc_ocotp.c @@ -25,8 +25,21 @@ #define BM_CTRL_ERROR 0x00000200 #define BM_CTRL_BUSY 0x00000100 #define BO_CTRL_ADDR 0 +#ifdef CONFIG_MX7 +#define BM_CTRL_ADDR 0x0000000f +#define BM_CTRL_RELOAD 0x00000400 +#else #define BM_CTRL_ADDR 0x0000007f - +#endif + +#ifdef CONFIG_MX7 +#define BO_TIMING_FSOURCE 12 +#define BM_TIMING_FSOURCE 0x0007f000 +#define BV_TIMING_FSOURCE_NS 1001 +#define BO_TIMING_PROG 0 +#define BM_TIMING_PROG 0x00000fff +#define BV_TIMING_PROG_US 10 +#else #define BO_TIMING_STROBE_READ 16 #define BM_TIMING_STROBE_READ 0x003f0000 #define BV_TIMING_STROBE_READ_NS 37 @@ -36,6 +49,7 @@ #define BO_TIMING_STROBE_PROG 0 #define BM_TIMING_STROBE_PROG 0x00000fff #define BV_TIMING_STROBE_PROG_US 10 +#endif #define BM_READ_CTRL_READ_FUSE 0x00000001 @@ -109,6 +123,25 @@ int fuse_read(u32 bank, u32 word, u32 *val) return finish_access(regs, __func__); } +#ifdef CONFIG_MX7 +static void set_timing(struct ocotp_regs *regs) +{ + u32 ipg_clk; + u32 fsource, prog; + u32 timing; + + ipg_clk = mxc_get_clock(MXC_IPG_CLK); + + fsource = DIV_ROUND_UP((ipg_clk / 1000) * BV_TIMING_FSOURCE_NS, + + 1000000) + 1; + prog = DIV_ROUND_CLOSEST(ipg_clk * BV_TIMING_PROG_US, 1000000) + 1; + + timing = BF(fsource, TIMING_FSOURCE) | BF(prog, TIMING_PROG); + + clrsetbits_le32(®s->timing, BM_TIMING_FSOURCE | BM_TIMING_PROG, + timing); +} +#else static void set_timing(struct ocotp_regs *regs) { u32 ipg_clk; @@ -130,12 +163,17 @@ static void set_timing(struct ocotp_regs *regs) clrsetbits_le32(®s->timing, BM_TIMING_STROBE_READ | BM_TIMING_RELAX | BM_TIMING_STROBE_PROG, timing); } +#endif static void setup_direct_access(struct ocotp_regs *regs, u32 bank, u32 word, int write) { u32 wr_unlock = write ? BV_CTRL_WR_UNLOCK_KEY : 0; +#ifdef CONFIG_MX7 + u32 addr = bank; +#else u32 addr = bank << 3 | word; +#endif set_timing(regs); clrsetbits_le32(®s->ctrl, BM_CTRL_WR_UNLOCK | BM_CTRL_ADDR, @@ -155,7 +193,11 @@ int fuse_sense(u32 bank, u32 word, u32 *val) setup_direct_access(regs, bank, word, false); writel(BM_READ_CTRL_READ_FUSE, ®s->read_ctrl); wait_busy(regs, 1); +#ifdef CONFIG_MX7 + *val = readl((®s->read_fuse_data0) + (word << 2)); +#else *val = readl(®s->read_fuse_data); +#endif return finish_access(regs, __func__); } @@ -176,8 +218,38 @@ int fuse_prog(u32 bank, u32 word, u32 val) return ret; setup_direct_access(regs, bank, word, true); +#ifdef CONFIG_MX7 + switch (word) { + case 0: + writel(0, ®s->data1); + writel(0, ®s->data2); + writel(0, ®s->data3); + writel(val, ®s->data0); + break; + case 1: + writel(val, ®s->data1); + writel(0, ®s->data2); + writel(0, ®s->data3); + writel(0, ®s->data0); + break; + case 2: + writel(0, ®s->data1); + writel(val, ®s->data2); + writel(0, ®s->data3); + writel(0, ®s->data0); + break; + case 3: + writel(0, ®s->data1); + writel(0, ®s->data2); + writel(val, ®s->data3); + writel(0, ®s->data0); + break; + } + wait_busy(regs, BV_TIMING_PROG_US); +#else writel(val, ®s->data); wait_busy(regs, BV_TIMING_STROBE_PROG_US); +#endif udelay(WRITE_POSTAMBLE_US); return finish_access(regs, __func__);