From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752657AbbDAF3D (ORCPT ); Wed, 1 Apr 2015 01:29:03 -0400 Received: from [198.137.202.10] ([198.137.202.10]:39363 "EHLO terminus.zytor.com" rhost-flags-FAIL-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1751186AbbDAF27 (ORCPT ); Wed, 1 Apr 2015 01:28:59 -0400 Date: Tue, 31 Mar 2015 22:28:19 -0700 From: tip-bot for Maxime Ripard Message-ID: Cc: hpa@zytor.com, linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, mingo@kernel.org, maxime.ripard@free-electrons.com, tglx@linutronix.de Reply-To: tglx@linutronix.de, maxime.ripard@free-electrons.com, mingo@kernel.org, linux-kernel@vger.kernel.org, daniel.lezcano@linaro.org, hpa@zytor.com In-Reply-To: <1427796746-373-3-git-send-email-daniel.lezcano@linaro.org> References: <1427796746-373-3-git-send-email-daniel.lezcano@linaro.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:timers/core] clocksource/drivers/sun5i: Use of_io_request_and_map() Git-Commit-ID: a45860d0ba433c217d359fa2cc2a4984d18ce263 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a45860d0ba433c217d359fa2cc2a4984d18ce263 Gitweb: http://git.kernel.org/tip/a45860d0ba433c217d359fa2cc2a4984d18ce263 Author: Maxime Ripard AuthorDate: Tue, 31 Mar 2015 12:12:24 +0200 Committer: Ingo Molnar CommitDate: Tue, 31 Mar 2015 17:53:58 +0200 clocksource/drivers/sun5i: Use of_io_request_and_map() of_iomap doesn't do a request_mem_region() on the memory area defined in the DT it maps. Switch to of_io_request_and_map() to make sure we're the only users. Signed-off-by: Maxime Ripard Signed-off-by: Daniel Lezcano Cc: linux-arm-kernel@lists.infradead.org Link: http://lkml.kernel.org/r/1427796746-373-3-git-send-email-daniel.lezcano@linaro.org Signed-off-by: Ingo Molnar --- drivers/clocksource/timer-sun5i.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/clocksource/timer-sun5i.c b/drivers/clocksource/timer-sun5i.c index 03f04d8..87f7b81 100644 --- a/drivers/clocksource/timer-sun5i.c +++ b/drivers/clocksource/timer-sun5i.c @@ -137,7 +137,7 @@ static void __init sun5i_timer_init(struct device_node *node) int ret, irq; u32 val; - timer_base = of_iomap(node, 0); + timer_base = of_io_request_and_map(node, 0, of_node_full_name(node)); if (!timer_base) panic("Can't map registers");