From patchwork Wed Apr 24 20:26:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 10915715 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0650013B5 for ; Wed, 24 Apr 2019 20:26:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E9EF828AC0 for ; Wed, 24 Apr 2019 20:26:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DE50628AD5; Wed, 24 Apr 2019 20:26:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 90BA928AC0 for ; Wed, 24 Apr 2019 20:26:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=UE+gNYEoOuaaOT3lCv1YF1eGfd9C/aVoHqpL4iSxszQ=; b=TaG4UrPx7vvRCO 3W/27hOS4LhlUQVzbW11LVoAH6fVZJcmSySh2ZnQgxg+y6pd4BD0+UZwBWNcoztnyqWjkJXaj+c7U Tedvb+2X5FJo09X8ZlahXdBYyNx+9Ci1zaPDMQXz2tver+NqSnXEIFLZPM3gC2fOu1nSgydoe5AIT /CVIq8KhKmUar7eqh4FGuiV/oSwAUyzugiSHr0p6kG7yzIGWTa7CgyqnbwXbGQBShaSJi0VaSxNXY uEbqsU2AFP66SkTMLxHb2Vaiot650p2zD6TPc1xTJtJ95xi67kNK3RPIskn/lP+NFjQOFHlMe6agv ssj61kZBFxccTB+0FrCA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJOTc-00022g-MS; Wed, 24 Apr 2019 20:26:44 +0000 Received: from mail-ed1-x544.google.com ([2a00:1450:4864:20::544]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hJOT9-0001Zi-MG for linux-arm-kernel@lists.infradead.org; Wed, 24 Apr 2019 20:26:17 +0000 Received: by mail-ed1-x544.google.com with SMTP id f53so17143710ede.4 for ; Wed, 24 Apr 2019 13:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nexus-software-ie.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=m8sw1rwYxfc4LACpMZCX1Kbzn04GKQLj3+eLoghKtB0=; b=D2stNmYqmMXkRyi3XGVZvJFifdC348OUn/NpGht2+tyBgprhHA+2sKZRVe0kVv3j74 wdeuBAOWv4lvIp4SMquyq56AuiyHpvV/3CEIG8ERLIGMmlQTvzmJ0GP7wvjPTGIiBVjT IM4qymxykyCN7REpNgrQvMC6uI5yHox5owUcpzpHATOMDFamPxAPuUZoTxe5kwmWrSBo KO0AUm7jmYyYQkNFbN2hpsyK6hLWkG9GASWVXVxNrHdy0w51pbqoVmL7kdhUN9gxr/mZ YcCUYeBK44w/eTfMWEz7HWm4PH7FgA9//NLfaNEiMhc2L0m0ztK49o6cY46CdUjwpnGT 4BvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m8sw1rwYxfc4LACpMZCX1Kbzn04GKQLj3+eLoghKtB0=; b=A5J/zM6n3CbhyarEcc1reDGPo5IuCUEbdReBrQJsjlaX1k3y9MwYhQ7RZdAjP7tUAr CLByGg5tEMnJVp4m03osA+w/8xeZhkEeiHaXwen80P7Tw1It+shCwsVz6AcBk1oD9jh2 vXEEaK4f8ODMUEdGKxc+T9m7wTECaFaOIEPVfJNgKRZQTR2xsyOEE6vH+U7F7fo5iaWA WpVUCWICZICj/BqkX2ipgrpb6Tmitmg+JB5ZzBxx7dRMIuBP4eDudNzqI2t1i3vzEQoE ++5RjIYNJ78Q+nvdhLXOQFciWQto3YIjLcPjS/4siXpLMYWbLMnCX/J/5nnEp2Ycpim5 KkGg== X-Gm-Message-State: APjAAAVk8uCykTjGijf+ikXdPQQx8GMYMw2VajLbux0DzYmAKJ1lrFrF UAY9Mbx3XcNqDFA00b7ggS36sg+0Tgo= X-Google-Smtp-Source: APXvYqz67dm5s/T9mxTEEutE+N+jTvsUXVx4zTsaF1m1zg+xPTozqm74oj+RZjauE42xtSue0OfXaA== X-Received: by 2002:a17:906:6781:: with SMTP id q1mr17458095ejp.267.1556137573189; Wed, 24 Apr 2019 13:26:13 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id c26sm3728988eja.86.2019.04.24.13.26.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Apr 2019 13:26:12 -0700 (PDT) From: Bryan O'Donoghue To: l.stach@pengutronix.de, peng.fan@nxp.com, shawnguo@kernel.org, srinivas.kandagatla@linaro.org, leonard.crestez@nxp.com Subject: [PATCH v5 2/5] nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing Date: Wed, 24 Apr 2019 21:26:04 +0100 Message-Id: <20190424202607.23522-3-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190424202607.23522-1-pure.logic@nexus-software.ie> References: <20190424202607.23522-1-pure.logic@nexus-software.ie> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190424_132615_800349_DAD19A01 X-CRM114-Status: GOOD ( 12.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: aisheng.dong@nxp.com, abel.vesa@nxp.com, anson.huang@nxp.com, linux-imx@nxp.com, kernel@pengutronix.de, fabio.estevam@nxp.com, Bryan O'Donoghue , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP The i.MX6 and i.MX8 both have a bit-field spanning bits 27:22 called the WAIT field. The WAIT field according to the documentation for both parts "specifies time interval between auto read and write access in one time program. It is given in number of ipg_clk periods." This patch ensures that the relevant field is read and written back to the timing register. Fixes: 0642bac7da42 ("nvmem: imx-ocotp: add write support") Signed-off-by: Bryan O'Donoghue Reviewed-by: Leonard Crestez --- drivers/nvmem/imx-ocotp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/nvmem/imx-ocotp.c b/drivers/nvmem/imx-ocotp.c index 6600c4ddeb51..85a7d0da3abb 100644 --- a/drivers/nvmem/imx-ocotp.c +++ b/drivers/nvmem/imx-ocotp.c @@ -189,7 +189,8 @@ static void imx_ocotp_set_imx6_timing(struct ocotp_priv *priv) strobe_prog = clk_rate / (1000000000 / 10000) + 2 * (DEF_RELAX + 1) - 1; strobe_read = clk_rate / (1000000000 / 40) + 2 * (DEF_RELAX + 1) - 1; - timing = strobe_prog & 0x00000FFF; + timing = readl(priv->base + IMX_OCOTP_ADDR_TIMING) & 0x0FC00000; + timing |= strobe_prog & 0x00000FFF; timing |= (relax << 12) & 0x0000F000; timing |= (strobe_read << 16) & 0x003F0000;