From patchwork Thu Aug 20 09:20:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 248010 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:522:0:0:0:0 with SMTP id h2csp1195446ils; Thu, 20 Aug 2020 02:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxskyO+OGPuKED5gIRq1pPzKAzXdlwc3vs8Zot99dYXsqKz98joydsjrcuhqUYuosWsmT4M X-Received: by 2002:a17:906:cecd:: with SMTP id si13mr2452368ejb.96.1597916530561; Thu, 20 Aug 2020 02:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1597916530; cv=none; d=google.com; s=arc-20160816; b=uDiFDIwf99OsWsaJXCS/reTwdiyMbodAE6tIxObhgUcUYiGR8sIslA+qedHg0sIuOe umZqsp+ieRdZxLaEpDjhdzOnOPgeIYpWoJVKtItxCJQCad85ZT0D6b7wB3OvPCOgyTFj j81QZEQS2xZ3Zk0xGfrL2g8PA8S+RnGCCdjnm9DiWBXP+197DCVljx7ddpILjUh5M16x a9SuZgI4RAGkY/xhuoZR9j3DgXGw1kkHahbCoGhnyqgx5Xo/O3SN/n0cTlfp1jBCYO9x JvYokWUzFq4NvKaAEQ6Z046rWEEBSjMF4D+l2mBdupKTGfQFsloicxvldHojGBI43HsA /6ow== 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=LxxPLqPs7h8vRZ2paK/ShFH5DsG8RRYd/mZl5ttzZ2Q=; b=ltt/YGxcfZ6f5/bQCcfUjPdIgLZSvPkpD/7YBRFN8uQOU0L+OpvXNKKM/DQ9HSWPR6 //jPyzOE1NoHec9Kd760tlbQoTM6bdHRo1qYIEb3o1FzX9R1mBw9JGLaBYxytBOy9wOA nbxPvSlImuKTO5xHpNpFG4CogNkbJmVaHA25nTFlHV7lrAUtrJgjhqHeb0KfKrg0v1Bn CM/Hj73rQq0lENLvoz22tkERLx8IX4CvZXMYiV7d6DBPM+mHtY6kI8K8QXkW4h/+0Shj WQziuOmfkE+Eej3/8AJOAUddlt3SfXpbvsZeY2v8mIsTlx5bHWnsIwXUx9zEnAT9lhmq Enmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HwR1SFkR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f8si916433edy.251.2020.08.20.02.42.10; Thu, 20 Aug 2020 02:42:10 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=HwR1SFkR; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729137AbgHTJmH (ORCPT + 15 others); Thu, 20 Aug 2020 05:42:07 -0400 Received: from mail.kernel.org ([198.145.29.99]:36156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729132AbgHTJl6 (ORCPT ); Thu, 20 Aug 2020 05:41:58 -0400 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 14776207DE; Thu, 20 Aug 2020 09:41:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597916517; bh=nibtvUdmYlYfzAmksvOuc+YpD990OolnyT4nsyqRArQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HwR1SFkRB9OoJm6k78RspePjp+zc0QfgYoLMfXKwG1SzaCciGkx2HDbnI0Evu6uQt JTAcbx1S0wrFv9DZwJVm5HpbCXTPmgYaQlkLvwKSnJLAjkAuPYzFjt0UFIvXb5msiH y+4/VijYw2+7ubBkr+VBNc/6G0yUFpMfURbJAY3Q= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sudeep Holla , Alexandre Belloni , Valentin Schneider , Linus Walleij , Sasha Levin Subject: [PATCH 5.7 126/204] rtc: pl031: fix set_alarm by adding back call to alarm_irq_enable Date: Thu, 20 Aug 2020 11:20:23 +0200 Message-Id: <20200820091612.583800658@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200820091606.194320503@linuxfoundation.org> References: <20200820091606.194320503@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Sudeep Holla [ Upstream commit 4df2ef85f0efe44505f511ca5e4455585f53a2da ] Commit c8ff5841a90b ("rtc: pl031: switch to rtc_time64_to_tm/rtc_tm_to_time64") seemed to have accidentally removed the call to pl031_alarm_irq_enable from pl031_set_alarm while switching to 64-bit apis. Let us add back the same to get the set alarm functionality back. Fixes: c8ff5841a90b ("rtc: pl031: switch to rtc_time64_to_tm/rtc_tm_to_time64") Signed-off-by: Sudeep Holla Signed-off-by: Alexandre Belloni Tested-by: Valentin Schneider Cc: Linus Walleij Cc: Alexandre Belloni Link: https://lore.kernel.org/r/20200714124556.20294-1-sudeep.holla@arm.com Signed-off-by: Sasha Levin --- drivers/rtc/rtc-pl031.c | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 diff --git a/drivers/rtc/rtc-pl031.c b/drivers/rtc/rtc-pl031.c index 40d7450a1ce49..c6b89273feba8 100644 --- a/drivers/rtc/rtc-pl031.c +++ b/drivers/rtc/rtc-pl031.c @@ -275,6 +275,7 @@ static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) struct pl031_local *ldata = dev_get_drvdata(dev); writel(rtc_tm_to_time64(&alarm->time), ldata->base + RTC_MR); + pl031_alarm_irq_enable(dev, alarm->enabled); return 0; }