Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp3688190ybv; Mon, 10 Feb 2020 04:44:13 -0800 (PST) X-Google-Smtp-Source: APXvYqzgchlTa42+8GSe8m9z5sMlK8uNf9oiWBDISMTZwNYOcViwDodgQfQZhRwrQawdQ6wNw2CJ X-Received: by 2002:a05:6808:244:: with SMTP id m4mr694439oie.125.1581338653594; Mon, 10 Feb 2020 04:44:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1581338653; cv=none; d=google.com; s=arc-20160816; b=twYX9L1E7Z9aXA8Gsj3lIZEobqCjBjTnTEhx5OiWZlc1qzdpqfQ+WT9sz8zX2BZEIJ xWeZuQm0UFwbCTGH2Nnqoi7EKfxxaZVS3W3vVV8rNIjwQyOwDl9k3QcBY/VavwjZAMyQ c0RHeTUsWTDVsKPvP431D/Yd2FzVC92AFIM5N0O1SOk1HRuEa/sMf1wgr3Mwig+2ZD6k p/mFdKgpfOIPFFfQ5AfrASHsopBC4f3KAkxM+xkQszvecyyDMISnAk0Jz5IPJnKJ76ws 5NRbRmqrfdSYrFBxLpg6utwtPF1prCvuj5Mro1eh5cnbt8s6ZB21v9yVCcqAqLjyMXyQ g6NA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=W/4iaRSFz7bmz8B1IuWf8rMzONKofEz2MjvKYkWdlBA=; b=GAWomhLurM9tC6LodU5kwobbzqBQl+GQQZSaZn07okp4T9fQI2IUesjegyaE3tru3W B2ztIBqvM2OKqIdg2YQ1BLoeDdCU3v5nhev8KAGu5TzT6I2x+QLuHxSMWC0b5vtAuSre Cc8fT24SPxF7VVaX3mWXsOqlCpvij1FwYAP9neYiNkA5ZAHQZ4zxh8NnPh/6ki7+NqVY 1lTXBJAyZtRaAGUUenlvzJDu93/AsDfjP18e01vUHeH6fLSW/1OysnXwXH337F5vXhgA b6C+XmwwmhUW4OyrNXunWi+tf9gy0M5Ldhr9HP1NI4yQFyBAN690wkmFkyLeJtyalkdI qfGw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=igWQLZEC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v21si114731oie.178.2020.02.10.04.44.02; Mon, 10 Feb 2020 04:44:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=igWQLZEC; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730488AbgBJMnr (ORCPT + 99 others); Mon, 10 Feb 2020 07:43:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:39506 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729632AbgBJMkI (ORCPT ); Mon, 10 Feb 2020 07:40:08 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0BE2120842; Mon, 10 Feb 2020 12:40:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338408; bh=GwZdwREzGE9MPLKTYsn7DObTxaT5mDCtNNqqyD94k+g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=igWQLZEC0jdldBjvKiIskR5zONHfjoaP4wlms3OrSPc39eewrnjknKPXxM/vsL3ab UPlKoUyod0bhi82WzY0wNeIT+++9iykKSMW0oTInwSkuLHbJMJ/hgkd5R8z/kVNUje D3uvw0gIZZDys3ZIKhzuzpQBYdFmdkAx+aYO/dLs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Peng Fan , Srinivas Kandagatla Subject: [PATCH 5.5 112/367] nvmem: imx: scu: fix write SIP Date: Mon, 10 Feb 2020 04:30:25 -0800 Message-Id: <20200210122434.896078564@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122423.695146547@linuxfoundation.org> References: <20200210122423.695146547@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peng Fan commit 40bb95dbb8acca35f8d52a833393ddbb01cfa2db upstream. SIP number 0xC200000A is for reading, 0xC200000B is for writing. And the following two args for write are word index, data to write. Fixes: 885ce72a09d0 ("nvmem: imx: scu: support write") Signed-off-by: Peng Fan Signed-off-by: Srinivas Kandagatla Cc: stable Link: https://lore.kernel.org/r/20200109104017.6249-2-srinivas.kandagatla@linaro.org Signed-off-by: Greg Kroah-Hartman --- drivers/nvmem/imx-ocotp-scu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) --- a/drivers/nvmem/imx-ocotp-scu.c +++ b/drivers/nvmem/imx-ocotp-scu.c @@ -15,8 +15,7 @@ #include #include -#define IMX_SIP_OTP 0xC200000A -#define IMX_SIP_OTP_WRITE 0x2 +#define IMX_SIP_OTP_WRITE 0xc200000B enum ocotp_devtype { IMX8QXP, @@ -212,8 +211,7 @@ static int imx_scu_ocotp_write(void *con mutex_lock(&scu_ocotp_mutex); - arm_smccc_smc(IMX_SIP_OTP, IMX_SIP_OTP_WRITE, index, *buf, - 0, 0, 0, 0, &res); + arm_smccc_smc(IMX_SIP_OTP_WRITE, index, *buf, 0, 0, 0, 0, 0, &res); mutex_unlock(&scu_ocotp_mutex);