From patchwork Wed Jul 22 22:24:54 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adrian Alonso X-Patchwork-Id: 498860 X-Patchwork-Delegate: sbabic@denx.de 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 E971714090B for ; Thu, 23 Jul 2015 08:26:44 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 357714B854; Thu, 23 Jul 2015 00:26:41 +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 enkUQiOw11K4; Thu, 23 Jul 2015 00:26:41 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 4354A4B85E; Thu, 23 Jul 2015 00:26:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 6A4654B804 for ; Thu, 23 Jul 2015 00:26:29 +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 QqSpaBY6ovND for ; Thu, 23 Jul 2015 00:26:29 +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-bl2on0123.outbound.protection.outlook.com [65.55.169.123]) by theia.denx.de (Postfix) with ESMTPS id 0615D4B833 for ; Thu, 23 Jul 2015 00:26:19 +0200 (CEST) Received: from BY2PR03CA060.namprd03.prod.outlook.com (10.141.249.33) by BY2PR03MB253.namprd03.prod.outlook.com (10.242.37.15) with Microsoft SMTP Server (TLS) id 15.1.219.9; Wed, 22 Jul 2015 22:26:16 +0000 Received: from BN1AFFO11FD040.protection.gbl (2a01:111:f400:7c10::133) by BY2PR03CA060.outlook.office365.com (2a01:111:e400:2c5d::33) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Wed, 22 Jul 2015 22:26:16 +0000 Authentication-Results: spf=fail (sender IP is 192.88.168.50) 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.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1AFFO11FD040.mail.protection.outlook.com (10.58.52.251) with Microsoft SMTP Server (TLS) id 15.1.213.8 via Frontend Transport; Wed, 22 Jul 2015 22:26:15 +0000 Received: from bluefly.am.freescale.net (bluefly.am.freescale.net [10.81.17.130]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t6MMQ3ff005860; Wed, 22 Jul 2015 15:26:15 -0700 From: Adrian Alonso To: , Date: Wed, 22 Jul 2015 17:24:54 -0500 Message-ID: <1437603903-2304-5-git-send-email-aalonso@freescale.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437603903-2304-1-git-send-email-aalonso@freescale.com> References: <1437603903-2304-1-git-send-email-aalonso@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD040; 1:NZuhO6Go0EC2qfjsq+vtARwW7oqNCVqbJhbzF+4lDRtP0JoLaixZq8/WAdnGvEx+J47yoWhLHYj2B2XfGv/qqOSX8NKcV3Sq5ISkXrB4IYyrl5VvVzUuszDu/mNw+vG053itLFw+MmgVU6nEUjDS2wbADsspmnO6SmweWAKwGIw63twm7kBlaqckVzCLWuB7dE/0F0mKSDYEk0a9Se+s6fOc9/ZKGDGpjKGBpmAGT3ClilXfqlRaWZ4FCL0KIyhdI2YkQDTSW/AR5sWPv0J1ZKMPAGPwt3Rfc6PTn6uPn3hSJi7+bqxaZY4pdAYGN7yXeYPTJSh6kJz7u1KCf8nY+SLGHmop/6EkX5W7qxMUbL72uCZe2xkCLooAxnXU+6O3GwLacz2aDxAs1oYk+9xbmKFSQmiya+7UXfu8gm1LP9RPeTFmjW9PG4HDzoo68LqP X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(339900001)(189002)(199003)(5003940100001)(87936001)(6806004)(19580405001)(86362001)(5001770100001)(575784001)(77096005)(76176999)(50986999)(50466002)(19580395003)(107886002)(2950100001)(5001960100002)(48376002)(189998001)(50226001)(105606002)(106466001)(92566002)(104016003)(62966003)(77156002)(85426001)(229853001)(46102003)(47776003)(36756003)(33646002)(4001430100001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB253; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB253; 2:VfDwdPEmIZDTVLRqQROskCnJqUPzDwZabOGExr7zVOnqllgQyrCSaojWylzbscDF; 3:d496P+elB4KlPsHexRDB1KWtdrlg84eYDSpaO+sX//hArd7nt64zpTuIkPueu3HGhmj7b7HLrLs4oawuq7IhF9mTM5OngvZI/D8Qf9nTIVmP2H4Zn596xjO+jfCBX5QOcFXDmITOASEJ8oh/q5VT3sWtjiGWTs2BHmTrcnMOLMmEN09ZLly/HA9enl9FmkdmSOyr/24C7JH0t3AeC0aHN51RUn42DHtz7qkjMoVGbVU=; 25:zagtOm9PwxELFkEwTxgiVxWOOFo6NQ0OzyNpIhqm2/kBcDgLw0Hh9Wpv5dGFUN0TWPrN/jiFdufxywh25E+IfDxEbmXVzRKyoNMgqgVxxJ0b78uGLN68G5Ql2RnLZnAh9UtxVdQ2hq9SJ5avyeYH0nYashre7zKVmogqgYgOnpiqwnFj75epgE3Dxk/Pc8rA+ieEAWuHCouaQEiySmrOZ+WNFSd3oMco2Rmuavw/3Xq6zag0uu5KpXPWPqfB9pYQ; 20:FCgKmIWXJwfhn7XhSF0NVta7l7OVUWIyujYH6CLUoFQfvq5VLWHGF/+6cSY/BKcLHl1euT+jjKtyzLjtuJ1HUN4soidjfN0leRmJEQFO23ngwmcDH17Cu/oxA4P9qmAYhEPn9Q7BwfNe79ZzntTkey6erGmkElXCbEYrY14Jwi1SpGtjcguxtH0Uc7d2kBhMwHEGiEdDSCSaKvpx2DGYVUs9/fIzFiW6EAjlDjU475fxFZXOUIoivYH3MHqrZR7fAxvJxLwbtRqTtm7pA/ohSZvyWCcevUj11eYHiu8qGmRsq2Ya2PaEDX4PXnO792BWYro0bVG8hELjR+fnqzIq5xTmKAicTZQo5/BmgYXJnhY= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB253; BY2PR03MB253: 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:BY2PR03MB253; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB253; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB253; 4:3OK7h/qPBYz+PYtMaZbrChAZk+r1kCDpzSNxf8P4HnrujT6uttStEz8rrmKMRmMzWiUvAGEK5vJzw0d/ll1rcQrSBjAQjoBoXE71RhTD4WhR5aDkNg2gD50yn3xCs3VQmzBn+37IDK1+9HxXjvDBpfKDWyU8lVlAyaaO3neJp9ANwgqSNVKZvv5QbzD33WU7xB7dxpejLC0dp30/m38oKdZGS8ciQXHeWnAygV+fItyUwup6B7h3dgdTeF75NM18DB/WfSEW8uvous2zlHl7IQNjmyN49bfXwMYxc/cO01k= X-Forefront-PRVS: 0645BEB7AA X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB253; 23:u+R2+SPrLCzwsZgNfutUkWVk/wFYL9yPjN7cnn9gzm?= =?us-ascii?Q?I7l8n4k2RRxCcG22tEop7ZXfobIYa/L0QadeptGjar/WUTHoVU5zpnExHnzo?= =?us-ascii?Q?JBzExM86ds3V3OWu5MKusdMz/lAI9l2I2D9z1d4GF+f/7wlfJYAEI3t+2/s3?= =?us-ascii?Q?oZqfEIY71DJ18hSLUQorJvxutYCzTGRzaBXHTHSKu9eEAJ6CcyOUUih3oifO?= =?us-ascii?Q?8BoCA6BP7G4csW4K+zuS2HE3A+Wkey3gonvbqtNT9DQ2VjnO6CZqJlS2VGoz?= =?us-ascii?Q?lAH8sQXQbh1AoY0Z70CMGECAZ9n7l+db+GVdEhNsHjAS6LRVTtqpmR2RioVL?= =?us-ascii?Q?h21eI4ZaJlk4eWDCMQ/cs+3aq8gaJiB8G6DyKx65vdueKq437hxUMp4RlHPW?= =?us-ascii?Q?eQZwc08fRB43rUASKZRETvgmCinoxEWtVHBLaOtRf6lBeAIrqz8hG4gx2NaU?= =?us-ascii?Q?E4Yi/waXvb3I2cdFSbc22fxWAmLv1q/ZXKLTvq+jnppDtgzQ8RdwwcjVNz0L?= =?us-ascii?Q?Q7yqdpmwQsnTISN/W2nLNjTJgjmcRyCHy0MIh3+Hu6GzZILxkXpGGNg/S1ST?= =?us-ascii?Q?oQ5cwNFxyS/+VneT2UfTPK2vs7KdvbMr/05PvIcFA0RyLaSVv7di6fdhActZ?= =?us-ascii?Q?OqT/T5uapAW2+dWf3PFoCpiw2AlUE6NB5/qM+PbdNFe7B7RmCjIQ4a3PCSAx?= =?us-ascii?Q?DZJcrtoRo4LT6Airp9hRu+I4LIW0MQPGwULWi35hNnu5ci70n6t9F1B9uHGO?= =?us-ascii?Q?BsDXknceGfosRC8OH+5o4yeEajrbe0jLa/XmTeWevvb6Nm08R+SoeZD9LPKI?= =?us-ascii?Q?cLDNk9KJQwXDLnirbsw9WUGJwZqqGdLiPc54OZJoNfeQtjsn4w8YFg7iZn1j?= =?us-ascii?Q?9cK9EKYU7/rm2oL6xxU9JfrTS/pk0JxNxCxDGTEtF71PoLa2oEiTQ1oUvnfr?= =?us-ascii?Q?jm3vlb6BK1H6NnBsjX43+F+F9odelnUa3xR8DkNH/xfW98Jdh0FdhZ72T2RF?= =?us-ascii?Q?A=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB253; 5:b8cgmF8ijUOqXNYvH2BUVLxBxlRhXeDJGkK6hWEgMgmXkXMQoepWTqdSmtLAL5VgYCqg+MHj9pqFQbz/JhuJWFDrKTllKROm5tpFDORhZ5NqgMMHRLyG6e1VPdff9zWk3bwJtT3IEDgDFExrdQKvig==; 24:ywduyjvnOorOOneHrT5VkAf0p9Vwcpd5r+q4FuOE2RkcaddLkDO4+58vZm7h5mBJuCLnxTtEXRDpfY+nHpdELbH9mpTLdniTgQAFr8frvD4=; 20:EHf6NH7AnboYgSskDilTg5OAG45R51HdrRTnE9quqIP6DJYExUKZgpzA6+A3HOhV8IoimuvUiZFYl0/L6ZxjwA== X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jul 2015 22:26:15.9669 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB253 Cc: Fabio.Estevam@freescale.com, otavio@ossystems.com.br Subject: [U-Boot] [PATCH 06/15][v3] 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 --- Changes for V2: Resend Changes for V3: Resend 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__);