Received: by 2002:a25:683:0:0:0:0:0 with SMTP id 125csp118057ybg; Mon, 8 Jun 2020 18:06:37 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqjOKdlgdJZkEcI7FNtIHYUHvXt5mBvjft5F6PuZDt1b5HeAtvAr9H/0HiMrAD6H6ZUQD1 X-Received: by 2002:a50:e606:: with SMTP id y6mr25159913edm.63.1591664797283; Mon, 08 Jun 2020 18:06:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1591664797; cv=none; d=google.com; s=arc-20160816; b=QwqNq9oZ890AQrH5mm1rI/l5FpUonbpkkjYnACvcKVEIYBjwrYjMUmhBqvB9Qobh+o +u4S+LdtH9qLDDRa3kirYespeZg2WaagxYQA2OdWhZokTQjamrzvRCrZIAIf+ABiNMpq z4rA0qt9Hj22eEP/cbGuvFeECDkbmTLUlWT3/FJgiBAjYPvdVXaUfLZnHN77RGwcCEZv b0s8xA5AY7E1Wea+9sK18O76s5+aFBco7LzcyAB0zEmgrfSRttbqdsgUkATNFkM1WKaK edypk6kuaHYcRn47pgOHBnL7ZTdq/yhTj3vMg0UZItQOSBv46SXez2PiL6zNMCx+Tmwa 29ag== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=FIXmGB+fLQSJUUn980sZQSfn/CSJOqjOn1hnxOFnc+M=; b=nMI/K3PPazyl2p3ukhNS4oEsDAjaZskCHUnieclnPKDJZf/MEpCpCLXqJA9VgM9x1I /SDINOkp1mem4MlvRPeIhy4Mcu02gbNrhv/i+ul4lghmcFfl5QwyT0+7lOdT/bKKl250 /zrMhSA8JXoYwCnfU6SQaOv5lWQOhs7cTxrqdu28VAmXURULIoQjtg4yGW0tOnIu1oH7 mB/jOMqt8k22EmphtTkHngyf4IsLuQxWgPLkfD2sAjSTEGG44xIfqW1FNfDYdeYrPVqC qBMtRQCctTknHoCM66N2HwFXglRM2jN6E9sm6BlAmII6UzSjP5IzuitcGosM/rVovzkX D/Fw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="abR3F+p/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u7si9973560ejr.69.2020.06.08.18.06.14; Mon, 08 Jun 2020 18:06:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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="abR3F+p/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727064AbgFIBET (ORCPT + 99 others); Mon, 8 Jun 2020 21:04:19 -0400 Received: from mail.kernel.org ([198.145.29.99]:51738 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727907AbgFHXH2 (ORCPT ); Mon, 8 Jun 2020 19:07:28 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 763BC20885; Mon, 8 Jun 2020 23:07:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1591657648; bh=a7t4fStzPG3m+Up+iFgKY9RcL2ZlUDwF9z2e11dlUNg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=abR3F+p/nCT5iEkISgY0CdHMVwKunteYVFPFRaktVNFedWObq8KkwlUltMEqBTfOO Iljwlp+56tWPbbKKIDJQTHYQjUAffYWzMMCWYy0wbkcsAwFB0Kif7DSAMxKptNdaia I8tABKf7RNUG36YnE91pVcqtFO731x9DA5RHw7rE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Saravana Kannan , Daniel Lezcano , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.7 063/274] clocksource/drivers/timer-versatile: Clear OF_POPULATED flag Date: Mon, 8 Jun 2020 19:02:36 -0400 Message-Id: <20200608230607.3361041-63-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200608230607.3361041-1-sashal@kernel.org> References: <20200608230607.3361041-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Saravana Kannan [ Upstream commit 7a3768c206a006525afc090f92d4d618d8356b92 ] The commit 4f41fe386a94 ("clocksource/drivers/timer-probe: Avoid creating dead devices") broke the handling of arm,vexpress-sysreg [1]. The arm,vexpress-sysreg device is handled by both timer-versatile.c and drivers/mfd/vexpress-sysreg.c. While the timer driver doesn't use the device, the mfd driver still needs a device to probe. So, this patch clears the OF_POPULATED flag to continue creating the device. [1] - https://lore.kernel.org/lkml/20200324175955.GA16972@arm.com/ Fixes: 4f41fe386a94 ("clocksource/drivers/timer-probe: Avoid creating dead devices") Signed-off-by: Saravana Kannan Signed-off-by: Daniel Lezcano Link: https://lore.kernel.org/r/20200324195302.203115-1-saravanak@google.com Signed-off-by: Sasha Levin --- drivers/clocksource/timer-versatile.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/clocksource/timer-versatile.c b/drivers/clocksource/timer-versatile.c index e4ebb656d005..f5d017b31afa 100644 --- a/drivers/clocksource/timer-versatile.c +++ b/drivers/clocksource/timer-versatile.c @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -22,6 +23,8 @@ static int __init versatile_sched_clock_init(struct device_node *node) { void __iomem *base = of_iomap(node, 0); + of_node_clear_flag(node, OF_POPULATED); + if (!base) return -ENXIO; -- 2.25.1