From patchwork Mon Apr 22 15:04:57 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: 10911163 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 3940B922 for ; Mon, 22 Apr 2019 15:05:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 29D4028553 for ; Mon, 22 Apr 2019 15:05:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1DD5628595; Mon, 22 Apr 2019 15:05:38 +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 C10D728553 for ; Mon, 22 Apr 2019 15:05:37 +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=OmI2qelZvSngcS 9uJdv0CmivumE2+GydeFW8TnLElOTNbqGQ0RYUPGCln1gwnd7tQqH0cb7j/LyCvegUxSGLVqyuOMH PPABqYof1W9NvPaUUZlE8HHkcXU06QNlksS4uktcUtJwnlgMyDp0DRwN3ybVxkFtyA5hjI6/dI1aC bgZMYYVhByuT+m3UnyyI/TL3Z5cc3Nq1q38tWouNd7H6Aajp7yKvA9ym+toh0ztVmdA+XznjgY4yh Y+wokFr0aF0+dLi1Hj5F3zlg0lK3p6e/w4TOuMX2oTTWe3dYXYIfFHZi0+khaXlUTQqUeAMKA4MfG v4Z4HamdRXviNE8kSlww==; 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 1hIaVj-00064w-V0; Mon, 22 Apr 2019 15:05:35 +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 1hIaVO-0005eE-TD for linux-arm-kernel@lists.infradead.org; Mon, 22 Apr 2019 15:05:16 +0000 Received: by mail-ed1-x544.google.com with SMTP id y67so9716879ede.2 for ; Mon, 22 Apr 2019 08:05: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=IVbtxF3jDrquU3Idz6wIkdfMEWlufYdGfP/A2AA3tt+0Z5PubASGj8ssJHz0TblEFr Wo0vDtyqQNINpMcgpZUXr3Z2phJdhzdLEsyb374hGWnZkiNwNzc2hvGj/P5pyur/N3NP xhZcU/uBDZnJMlCweus9pFjxEOpYOZDOburkAGuu8z6K6cK5S48k/yUKamdpnaMw5juZ B16m1pGl+ZIsdh8G3T6+1jUapBNH/n5qKw+zaTtRFnThLEvJZ6gqcHshQ3lJddwWU0eZ HUPjtU7e9LBplWmPSvH/Or4QYFoHLGTscVuxnKXFYXrhTLPrZtVDCM0wuUaOkTmW4RqN mTnA== 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=hKHUHtfQXF6LKGFhBAkJPpUIFdqoZO0oJEr2b/a5LdmXhZiyamgnaTzCKetiM8U9lJ 0bdVQQ3yRbmm0mpPba5/jef/XFlfUMKGWvPkCAcWPjaNLrffOfOtgqZJjNy0QmYR/qeO WeIKzrlDitKqTiPUIxAhNdPKobEr7AiHUhydE/z5WdlRRm5gFomuhBcJU3a6ZxpAau+Z byB9PUYWbM6eOGWa9CrGeH6gsoaoklUckDkOF82w908jiw7iH5c4ev77sowPGRI+xZjT vjt7NGSUfm7Dc+IGWlguNESvekjY027dRjT8Z067cg+jo4qPnVPhkXe7bi1utSB9kMzF Akew== X-Gm-Message-State: APjAAAWRrka9b/6mv3wQY8StqxOp2sZ89WyzHY6R2+O1Kqx7UeQZGd9U wwSkO7GXxjYPgwGsP3QcwZfe6cXcm2I= X-Google-Smtp-Source: APXvYqxVezUQLIqIKXsoTmfbB3tEROS3caKLNUXnLvNw1x+Ytwj4OE+N32JSsKbpG4BEcX+fir0DEQ== X-Received: by 2002:aa7:da92:: with SMTP id q18mr12102012eds.223.1555945513375; Mon, 22 Apr 2019 08:05:13 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id f27sm3712688edb.77.2019.04.22.08.05.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Apr 2019 08:05: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 v4 2/5] nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing Date: Mon, 22 Apr 2019 16:04:57 +0100 Message-Id: <20190422150500.11082-3-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190422150500.11082-1-pure.logic@nexus-software.ie> References: <20190422150500.11082-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-20190422_080514_977712_CB18690A X-CRM114-Status: GOOD ( 12.76 ) 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;