From patchwork Mon Aug 13 14:22:47 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Ujfalusi X-Patchwork-Id: 1313121 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 539A6DF223 for ; Mon, 13 Aug 2012 14:23:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752287Ab2HMOW7 (ORCPT ); Mon, 13 Aug 2012 10:22:59 -0400 Received: from na3sys009aog123.obsmtp.com ([74.125.149.149]:38978 "EHLO na3sys009aog123.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752225Ab2HMOW6 (ORCPT ); Mon, 13 Aug 2012 10:22:58 -0400 Received: from mail-ob0-f170.google.com ([209.85.214.170]) (using TLSv1) by na3sys009aob123.postini.com ([74.125.148.12]) with SMTP ID DSNKUCkNwoIpgcAIRX5M5yrRJtrNCX9r+hlo@postini.com; Mon, 13 Aug 2012 07:22:58 PDT Received: by obbwc18 with SMTP id wc18so12515528obb.1 for ; Mon, 13 Aug 2012 07:22:57 -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=Mksm1tipkSuiet3DteywXPNGbiVOkUZA/ONFqi6gbmHJhT4D/a11YeVbSVB+Mb0E34 CzF+hWDIQ3NDVroQhIkcDa7chc9r5qMnwgiDK9J0YllcckyvMoCyBcW0qujC1C0MHD8N sraFGQKO+LYe3dYCkXy8Noa/y9QpPTgZVNd8Vf8EyKSvkCZvebn/PStHX3ughWC/otpL 2F+szw7e2iA0l4ekwICZzYa0Mrcskp77TAnHMVSgwjKOB9jTM0i/tplwXOAbc7oSxiNj s1HTCbdgQduUkyzhW1S+pyykRXiJZgChg4vBpk4HsJf15aTbvAvoISVIShensvQlxKSg 4yfg== Received: by 10.182.164.103 with SMTP id yp7mr12072949obb.26.1344867777310; Mon, 13 Aug 2012 07:22:57 -0700 (PDT) Received: from barack.emea.dhcp.ti.com (dragon.ti.com. [192.94.94.33]) by mx.google.com with ESMTPS id th3sm6355591obb.6.2012.08.13.07.22.54 (version=SSLv3 cipher=OTHER); Mon, 13 Aug 2012 07:22:56 -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 v2 8/9] ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data Date: Mon, 13 Aug 2012 17:22:47 +0300 Message-Id: <1344867768-26335-9-git-send-email-peter.ujfalusi@ti.com> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> References: <1344867768-26335-1-git-send-email-peter.ujfalusi@ti.com> X-Gm-Message-State: ALoCoQmqxrfXcYfxGskSSP5aAwO4ZX0FHGxyI72jXX+JxvKMgKxgpOeadd8lraCL5Hfp1SBhRmnr 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 --- 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; }