From patchwork Sat Mar 1 18:08:37 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 3752111 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 90088BF13A for ; Mon, 3 Mar 2014 08:48:03 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BABD7203A9 for ; Mon, 3 Mar 2014 08:48:02 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id D2FDD20255 for ; Mon, 3 Mar 2014 08:48:00 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id B4BC72655F3; Mon, 3 Mar 2014 09:47:58 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 23DFD261AC9; Mon, 3 Mar 2014 09:47:46 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9C5362650AF; Sat, 1 Mar 2014 19:08:29 +0100 (CET) Received: from filtteri5.pp.htv.fi (filtteri5.pp.htv.fi [213.243.153.188]) by alsa0.perex.cz (Postfix) with ESMTP id 83422262625 for ; Sat, 1 Mar 2014 19:08:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by filtteri5.pp.htv.fi (Postfix) with ESMTP id 712055A79B7; Sat, 1 Mar 2014 20:08:19 +0200 (EET) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri5.pp.htv.fi [213.243.153.188]) (amavisd-new, port 10024) with ESMTP id oAZJC5wQSxMN; Sat, 1 Mar 2014 20:08:14 +0200 (EET) Received: from cooljazz.bb.dnainternet.fi (91-145-91-118.bb.dnainternet.fi [91.145.91.118]) by smtp4.welho.com (Postfix) with ESMTP id C00175BC010; Sat, 1 Mar 2014 20:08:16 +0200 (EET) From: Aaro Koskinen To: Jarkko Nikula , Peter Ujfalusi , linux-omap@vger.kernel.org, alsa-devel@alsa-project.org Date: Sat, 1 Mar 2014 20:08:37 +0200 Message-Id: <1393697317-16733-1-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.8.3.3 X-Mailman-Approved-At: Mon, 03 Mar 2014 09:47:44 +0100 Cc: Aaro Koskinen Subject: [alsa-devel] [PATCH] sound: omap: n810: fix init with DT boot X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP Since 3.14-rc1 only DT boot has been supported on N810. Make a minimal fix to retain functionality. This file should be properly converted to DT in longer term. Signed-off-by: Aaro Koskinen Acked-by: Jarkko Nikula --- sound/soc/omap/n810.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sound/soc/omap/n810.c b/sound/soc/omap/n810.c index 3fde9e4..d163e18 100644 --- a/sound/soc/omap/n810.c +++ b/sound/soc/omap/n810.c @@ -305,7 +305,9 @@ static int __init n810_soc_init(void) int err; struct device *dev; - if (!(machine_is_nokia_n810() || machine_is_nokia_n810_wimax())) + if (!of_have_populated_dt() || + (!of_machine_is_compatible("nokia,n810") && + !of_machine_is_compatible("nokia,n810-wimax"))) return -ENODEV; n810_snd_device = platform_device_alloc("soc-audio", -1);