From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1B19EC432C0 for ; Tue, 19 Nov 2019 05:42:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D6487222A4 for ; Tue, 19 Nov 2019 05:42:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142173; bh=gOAVXjwy6vR30WXWpwBc3912Jaop/VrTFamikl0hOYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0hy+18npvbsYFnlgIGao3IQXd7LgGVMSJi0wVY2VJ50Fqi7YSj0ze+BoKKTxoFtY/ fHGFurWON7uDXNfdOjVTZInNRKAYbRzbHx1yozoDhAEppHeo5+v0m3srdq39tSq87i 4/1tBrFMgnQw2nefvX1IDdx7pmOfNUGlNqYpK6i4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730438AbfKSFmw (ORCPT ); Tue, 19 Nov 2019 00:42:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:37584 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729356AbfKSFmp (ORCPT ); Tue, 19 Nov 2019 00:42:45 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 D4D9D222A4; Tue, 19 Nov 2019 05:42:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574142165; bh=gOAVXjwy6vR30WXWpwBc3912Jaop/VrTFamikl0hOYA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0Gn9+pA6oXe5Gs13SXy1agGsKwLQWFMr/vQCJWcpFRpeOnjPQcvwBMef3MUOckk3G Y13soPxSe4FTUQqtuc9ij1aRqdE4/ENo67dTBTqTXcfj+Yal8QSYJCnffW0DukyESQ yriftmGAG4P0qKgU3CcXqGV9un4Plik207sog8/E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Alexandre Belloni , Sasha Levin Subject: [PATCH 4.19 412/422] rtc: tx4939: fixup nvmem name and register size Date: Tue, 19 Nov 2019 06:20:09 +0100 Message-Id: <20191119051425.890716018@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191119051400.261610025@linuxfoundation.org> References: <20191119051400.261610025@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: Alexandre Belloni [ Upstream commit 2ab78755e93a10f6216c860a2012f3592f395603 ] The default word_size and stride of 1 are correct for the tx4939. Also fix the nvmem folder name. Signed-off-by: Alexandre Belloni Signed-off-by: Sasha Levin --- drivers/rtc/rtc-tx4939.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/drivers/rtc/rtc-tx4939.c b/drivers/rtc/rtc-tx4939.c index 08dbefc79520e..61c110b2045f8 100644 --- a/drivers/rtc/rtc-tx4939.c +++ b/drivers/rtc/rtc-tx4939.c @@ -253,9 +253,7 @@ static int __init tx4939_rtc_probe(struct platform_device *pdev) struct resource *res; int irq, ret; struct nvmem_config nvmem_cfg = { - .name = "rv8803_nvram", - .word_size = 4, - .stride = 4, + .name = "tx4939_nvram", .size = TX4939_RTC_REG_RAMSIZE, .reg_read = tx4939_nvram_read, .reg_write = tx4939_nvram_write, -- 2.20.1