From patchwork Mon Oct 5 19:48:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 54505 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by patches.linaro.org (Postfix) with ESMTPS id 2C06122F05 for ; Mon, 5 Oct 2015 19:49:34 +0000 (UTC) Received: by lafb9 with SMTP id b9sf28010069laf.3 for ; Mon, 05 Oct 2015 12:49:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:content-type:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=CheoZpLe/h5Ts+tW4c5zoCVDCwSus4Y/hsdwuVlT9GM=; b=Qp4KKuATqD6gMDshulEFF7gU3lug2/RhOfAimF66NvK6pGTlp8EldKV340P3oVcn26 Sgnqi/Nc4Kuia6qkdef0oVQF01yDa6ElvQgyErkRdHDY2hcI/7SHDXhwU7tGbWq9lP8c n2oS7kdNSzQAf3zJ9poPe+LljNRc2+q6/s+ve4v4UJbjZv/yRpoBYyBC1z7ecyZ6O7PC xH25baAFeKCWmKGM1EBbsNn+yNIND2igESfOyapWXNv7hrawfOb0tsJxyPzBlrlrQFs6 /4AnWhPkALreuFgTeQeqqdDo709Ja1viJtvPvgNVEu4cMuT2jWc+byLx7WlaAXFANiX4 6dbA== X-Gm-Message-State: ALoCoQlW91hNZgUayolKTLrjmd4+Whpz96MOsu5ndQRjkWsKE913aDKAzwZy7GU2xe/ijuvLs0Gc X-Received: by 10.195.18.100 with SMTP id gl4mr5632910wjd.4.1444074573066; Mon, 05 Oct 2015 12:49:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.218.207 with SMTP id r198ls518799lfg.40.gmail; Mon, 05 Oct 2015 12:49:32 -0700 (PDT) X-Received: by 10.112.167.8 with SMTP id zk8mr10274450lbb.15.1444074572914; Mon, 05 Oct 2015 12:49:32 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id p79si18071076lfb.76.2015.10.05.12.49.32 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 05 Oct 2015 12:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbcao8 with SMTP id ao8so64283167lbc.3 for ; Mon, 05 Oct 2015 12:49:32 -0700 (PDT) X-Received: by 10.112.130.70 with SMTP id oc6mr12861404lbb.32.1444074572280; Mon, 05 Oct 2015 12:49:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.59.35 with SMTP id w3csp1444903lbq; Mon, 5 Oct 2015 12:49:31 -0700 (PDT) X-Received: by 10.66.251.35 with SMTP id zh3mr42254395pac.121.1444074569600; Mon, 05 Oct 2015 12:49:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id a1si42552431pas.56.2015.10.05.12.49.29; Mon, 05 Oct 2015 12:49:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753369AbbJETtZ (ORCPT + 5 others); Mon, 5 Oct 2015 15:49:25 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:50987 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753356AbbJETs4 (ORCPT ); Mon, 5 Oct 2015 15:48:56 -0400 Received: from dflxv15.itg.ti.com ([128.247.5.124]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id t95JmoEl021071; Mon, 5 Oct 2015 14:48:50 -0500 Received: from DLEE70.ent.ti.com (dlee70.ent.ti.com [157.170.170.113]) by dflxv15.itg.ti.com (8.14.3/8.13.8) with ESMTP id t95Jmohn028709; Mon, 5 Oct 2015 14:48:50 -0500 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE70.ent.ti.com (157.170.170.113) with Microsoft SMTP Server id 14.3.224.2; Mon, 5 Oct 2015 14:48:50 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id t95Jmn1I008423; Mon, 5 Oct 2015 14:48:50 -0500 From: Felipe Balbi To: Tony Lindgren CC: Arnd Bergmann , Linux OMAP Mailing List , Felipe Balbi Subject: [PATCH] arm: omap2: timer: don't disable our timers Date: Mon, 5 Oct 2015 14:48:48 -0500 Message-ID: <1444074528-3905-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.5.3 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , We actually want these devices to be created because we will be moving timers to drivers/clocksource and this will prevent them from probing. Signed-off-by: Felipe Balbi --- Tony, I wonder if you can get merged as a fix, or do you prefer receiving it together with my timer series ? arch/arm/mach-omap2/timer.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 0ff676273b4b..0c00138d7bd5 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -136,12 +136,6 @@ static struct clock_event_device clockevent_gpt = { .tick_resume = omap2_gp_timer_shutdown, }; -static struct property device_disabled = { - .name = "status", - .length = sizeof("disabled"), - .value = "disabled", -}; - static const struct of_device_id omap_timer_match[] __initconst = { { .compatible = "ti,omap2420-timer", }, { .compatible = "ti,omap3430-timer", }, @@ -161,9 +155,7 @@ static const struct of_device_id omap_timer_match[] __initconst = { * * Helper function to get a timer during early boot using device-tree for use * as kernel system timer. Optionally, the property argument can be used to - * select a timer with a specific property. Once a timer is found then mark - * the timer node in device-tree as disabled, to prevent the kernel from - * registering this timer as a platform device and so no one else can use it. + * select a timer with a specific property. */ static struct device_node * __init omap_get_timer_dt(const struct of_device_id *match, const char *property) @@ -183,7 +175,6 @@ static struct device_node * __init omap_get_timer_dt(const struct of_device_id * of_get_property(np, "ti,timer-secure", NULL))) continue; - of_add_property(np, &device_disabled); return np; }