From patchwork Thu Aug 16 13:41:07 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1331981 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 68F8FDFB34 for ; Thu, 16 Aug 2012 13:41:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754222Ab2HPNlY (ORCPT ); Thu, 16 Aug 2012 09:41:24 -0400 Received: from na3sys009aog101.obsmtp.com ([74.125.149.67]:33887 "EHLO na3sys009aog101.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753853Ab2HPNlX (ORCPT ); Thu, 16 Aug 2012 09:41:23 -0400 Received: from mail-ob0-f174.google.com ([209.85.214.174]) (using TLSv1) by na3sys009aob101.postini.com ([74.125.148.12]) with SMTP ID DSNKUCz4gvA7wZRlY0SzpkzYULrn5qSORxTu@postini.com; Thu, 16 Aug 2012 06:41:23 PDT Received: by obbuo13 with SMTP id uo13so3694291obb.19 for ; Thu, 16 Aug 2012 06:41:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=/azsot2Vr3pj/aAlZ8VQVtaxOSA/0gCkbYz5DThDCv0=; b=S3UlZewsZ/tDJSP0Luv8/8fB6gWKmLOVsbYlfz9fQr921Pzu6AJFgbwZ2cz6pdlOqf z04c1qh63gkryOgKroNuPlX3fokR7z+pam4cqjale7NGXTVkKmyZLPdfU29cqlYicfx7 tA05y5sjdn9ew8gmgfqe2JlqZp4OIaxhfHiVEfO6xfvyafZsD80hVsxhYPeYf1S6O1hF zKwQgH6EmxbjitOa1ww99Vd+vkwS8p+pbv+P2MqVCmWQgGrKcaDylbZkBE2iXHi3pROE XsB3OXGy+9X8+mn1hWVM3cS0Zkd9yfNiJ8CecN6v6UMfur7JzKpBE/Hq8xO58Dh62iDJ Os0A== Received: by 10.182.111.74 with SMTP id ig10mr1064214obb.14.1345124481828; Thu, 16 Aug 2012 06:41:21 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id x10sm2977371oeb.8.2012.08.16.06.41.19 (version=SSLv3 cipher=OTHER); Thu, 16 Aug 2012 06:41:21 -0700 (PDT) From: Peter Ujfalusi To: Mark Brown , Liam Girdwood , Tony Lindgren Cc: Jarkko Nikula , alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org, Benoit Cousson Subject: [PATCH v3 8/9] ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data Date: Thu, 16 Aug 2012 16:41:07 +0300 Message-Id: <1345124468-8876-9-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1345124468-8876-1-git-send-email-peter.ujfalusi@ti.com> References: <1345124468-8876-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQlVYkWepEYPASHVSlUX9SUeWMSwhc4Pv61p6/+s/uveZwZARZhJloZf+Cqdz1/5kZkrRZv7 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Only create the devices in a legacy way if we do not have the DT data. Signed-off-by: Peter Ujfalusi Acked-by: Tony Lindgren --- arch/arm/mach-omap2/mcbsp.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-omap2/mcbsp.c b/arch/arm/mach-omap2/mcbsp.c index 660e00b..d57a357 100644 --- a/arch/arm/mach-omap2/mcbsp.c +++ b/arch/arm/mach-omap2/mcbsp.c @@ -15,6 +15,7 @@ #include #include #include +#include #include #include @@ -113,7 +114,8 @@ static int __init omap_init_mcbsp(struct omap_hwmod *oh, void *unused) static int __init omap2_mcbsp_init(void) { - omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL); + if (!of_have_populated_dt()) + omap_hwmod_for_each_by_class("mcbsp", omap_init_mcbsp, NULL); return 0; }