From patchwork Fri Apr 19 16:48:05 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: 10908997 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 970C9922 for ; Fri, 19 Apr 2019 16:48:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 893C228C9B for ; Fri, 19 Apr 2019 16:48:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 79B6528CA4; Fri, 19 Apr 2019 16:48:52 +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 796F428C9B for ; Fri, 19 Apr 2019 16:48:51 +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=oaIgZb+Ek1Z3+4JOdbvHR5AsjEUEzMp/BU8mPEvi82c=; b=j4TzAp+etJhODO wExhPxPGSM4zvN1TJofl7wrSMvt/DNHVoPNwD9dhoduKGST+ciNEd36qM1hJ3LytjohchVmdDKBmQ v5VyQQypugFyjrreKlm/2saIZze5xytVUHk8+NEVGDV7/Cya8b/gGOYfiNnnUEvUHRXEuxDX2mrOj emNfHiOCUqn0YPZmA82CltPW+oPh5ha12ZjifpX5Sv9dQG0QSHZsVBXPqVbY9oChQYxS5/XCzVGSt 1O3p12qrN/qhwPI3/LV+coPAWDsgnaz8BqgUdJnqmdzRbt+vzY+ZSTUyXdUWUlfjjLdfMWOs5/DDp zhg58fnnlk8KEpmffjLA==; 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 1hHWgy-0002G4-Dk; Fri, 19 Apr 2019 16:48:48 +0000 Received: from mail-ed1-x541.google.com ([2a00:1450:4864:20::541]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hHWgS-0001hD-LS for linux-arm-kernel@lists.infradead.org; Fri, 19 Apr 2019 16:48:17 +0000 Received: by mail-ed1-x541.google.com with SMTP id g6so4816591edc.8 for ; Fri, 19 Apr 2019 09:48:16 -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=jUfcItRpO2hx612krZRy+YsfynN5A1FzQU9vxJ3jr+s=; b=Ia85muqXJQDvGg560u5r+qC19LPgw0ypOG52+nQL5vvGqFP189gLOrbXwaXQQTSKjW AkXsg9Ym9HXP199jy2Ap262fKhw13OQobkw+LH88wPf3SRzjmnEMYB3Ah6ziaIis8WVR tyyHVz9iU0iBQqwNrA+wtU0JPWD3hYumE2cBWdLRxdpJNIXmjJ+wg9M29BzcExcO72hW WTj5BQzIO0pXCN0OChkP6wQOmogNEjm5bmoqRANrok3oyxkCOpWetUDcdHRhfOI5gOCX b13mkeYvmkFZJFFYXfgson4ET950vrrhp3veQ/uX58N7+W2MGHoqfWCjLuCLPyRWi33M HBmA== 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=jUfcItRpO2hx612krZRy+YsfynN5A1FzQU9vxJ3jr+s=; b=aaCCbufmN/i+svMqzSHp4hoV5P0THdGwwnHHvLPzI1MyMzDGCbMLAq5VpzpZ7/2b/1 txlNFjOzcg+S9cRGpboLaOSuxaWk3MxEoKdfVDr1UVtytQ9XGG9b1HUbFjC/bNOlQYb0 HvpCXrNjzGiOpSts24bjY0dnrSO2sc4h66tsEGWacFxdHiQwOVSNRw7GFfQraYTs5KIR qpN6/5Xfkx2VG+Wa3iHXYMeDyb78PfNauPzFM+tQcQTZe0sh11LLRTpcOiUxg9v9TBjU GvkmZROE8UlW4ZpqcyG6i8BVBxDBV33CuK7txmuHrtVPBkB4jMR2uLvhQDcX6TZpgL63 Makw== X-Gm-Message-State: APjAAAXxWJ1qchJBHYVp5BM/0ZOs5Y+ptmXIH3eDeyhAQBPSylNKUoTx EiYbIdz7G26VvYHSynCt277gzg== X-Google-Smtp-Source: APXvYqyrJCQ2vBMBWKP8NfnAYzjX0dupVrhXAziXmYJQG5p/nwKidTeXgK3cyLOA/x4NaKNyqWuRnA== X-Received: by 2002:a17:906:7c5a:: with SMTP id g26mr2463876ejp.121.1555692495055; Fri, 19 Apr 2019 09:48:15 -0700 (PDT) Received: from event-horizon.net ([80.111.179.123]) by smtp.gmail.com with ESMTPSA id e17sm955380eja.33.2019.04.19.09.48.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 19 Apr 2019 09:48:14 -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 v2 2/5] nvmem: imx-ocotp: Ensure WAIT bits are preserved when setting timing Date: Fri, 19 Apr 2019 17:48:05 +0100 Message-Id: <20190419164808.23236-3-pure.logic@nexus-software.ie> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190419164808.23236-1-pure.logic@nexus-software.ie> References: <20190419164808.23236-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-20190419_094816_703248_63D8FC42 X-CRM114-Status: GOOD ( 13.20 ) 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 --- 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;