Message ID | 20181108083754.1746-6-peter.ujfalusi@ti.com (mailing list archive) |
---|---|
State | RFC, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A61E11709 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 8 Nov 2018 08:38:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94F072C800 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 8 Nov 2018 08:38:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 88CBE2C81A; Thu, 8 Nov 2018 08:38:45 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 3ADAC2C800 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 8 Nov 2018 08:38:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=mJY+5X7hrlaF7CN+yWzPQc1A6oWMmBST6qTiDqOKY3s=; b=DYD30gMupX/zBF TADUf2HARMCev75r2+f1+CmfPI/whGt7WBqjUvwQ7tqJlIU0oLeoOUtKgOaiioX9vzco3aug/tSZl qhIBOj26S85WRKYv2Ht871FtMLAbnhaUkEUyJRfu6brWHrJvJtcewzfDe84d9r9jg5ycKhGJBNiWY LhIfWbyklxazd9mHahWs0W8KNx8y820vWpJCxXo2Jm/NT7aAXrgbcEUaXhB3wFgKq2v40C8fCyfaK 55tdjTPTrj2fQaLdJoSiJhMIS7gd7cs8cifV6EyfzkifZBBI4aYNS4fdwMxJ3Rw+6xQrBUbrLCgnP e2Wo3jairL+2Vs16gCBg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKfpq-00052A-Kq; Thu, 08 Nov 2018 08:38:42 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKfoh-0003aV-UE for linux-arm-kernel@bombadil.infradead.org; Thu, 08 Nov 2018 08:37:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Type:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=S+Kh2jM3SArB/Z0GAWyT0DgmdQJ/9Ni6nS3Z48n1Ss4=; b=l+EUhiOwnkmZcQkqHJCTST2J0n Ku1FGyjxK9URMlhgwxPBhNOAFVou6cq1h3U95SMbtfOAaEfFGqaTfAQJpYz6Np7VI2CzrXCKjPKz4 Kuk0dqo/eMrmfi8kbHWP0AS+klblrVaL2+lFqSs63negRa+gcqfs9TgssEo6u81sN4vfDgSDNE+4A i1DZBSXzmN7Jkpyy72yyczYKnU9fJfie7wq78ADnDFELBBh0+/Vd2U9KlAA6GL5M/iTgHaG+f1nb4 KVRV5xa7x08D1q/DQ7mih0vCyjxnqcXKZCoyw13JU4W/0mx1JAlmEYDaH8eQonCm3LDJ5axAvTrwK l1WnMs2w==; Received: from fllv0015.ext.ti.com ([198.47.19.141]) by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gKfoe-0006B8-JB for linux-arm-kernel@lists.infradead.org; Thu, 08 Nov 2018 08:37:30 +0000 Received: from fllv0035.itg.ti.com ([10.64.41.0]) by fllv0015.ext.ti.com (8.15.2/8.15.2) with ESMTP id wA88as3H110471; Thu, 8 Nov 2018 02:36:54 -0600 Received: from DLEE104.ent.ti.com (dlee104.ent.ti.com [157.170.170.34]) by fllv0035.itg.ti.com (8.15.2/8.15.2) with ESMTPS id wA88as2o039129 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=FAIL); Thu, 8 Nov 2018 02:36:54 -0600 Received: from DLEE103.ent.ti.com (157.170.170.33) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1466.3; Thu, 8 Nov 2018 02:36:53 -0600 Received: from dflp33.itg.ti.com (10.64.6.16) by DLEE103.ent.ti.com (157.170.170.33) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1466.3 via Frontend Transport; Thu, 8 Nov 2018 02:36:53 -0600 Received: from feketebors.ti.com (ileax41-snat.itg.ti.com [10.172.224.153]) by dflp33.itg.ti.com (8.14.3/8.13.8) with ESMTP id wA88aamp023819; Thu, 8 Nov 2018 02:36:51 -0600 From: Peter Ujfalusi <peter.ujfalusi@ti.com> To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>, <jarkko.nikula@bitmer.com>, <tony@atomide.com>, <nsekhar@ti.com> Subject: [RFC 5/9] ARM: davinci: dm365-evm: Update for the new ASoC Kcofnig options Date: Thu, 8 Nov 2018 10:37:50 +0200 Message-ID: <20181108083754.1746-6-peter.ujfalusi@ti.com> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181108083754.1746-1-peter.ujfalusi@ti.com> References: <20181108083754.1746-1-peter.ujfalusi@ti.com> MIME-Version: 1.0 X-EXCLAIMER-MD-CONFIG: e1e8a2fd-e40a-4ac6-ac9b-f7e9cc9ee180 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181108_083728_731284_46E42F16 X-CRM114-Status: GOOD ( 10.36 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: alsa-devel@alsa-project.org, linux-omap@vger.kernel.org, jsarha@ti.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
ASoC/ARM: Merge the davinci and omap audio directories
|
expand
|
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c index 8143756ff38b..09e439d4abf5 100644 --- a/arch/arm/mach-davinci/board-dm365-evm.c +++ b/arch/arm/mach-davinci/board-dm365-evm.c @@ -794,9 +794,9 @@ static __init void dm365_evm_init(void) /* maybe setup mmc1/etc ... _after_ mmc0 */ evm_init_cpld(); -#ifdef CONFIG_SND_DM365_AIC3X_CODEC +#ifdef CONFIG_SND_SOC_DM365_AIC3X_CODEC dm365_init_asp(); -#elif defined(CONFIG_SND_DM365_VOICE_CODEC) +#elif defined(CONFIG_SND_SOC_DM365_VOICE_CODEC) dm365_init_vc(); #endif dm365_init_rtc();
The codec selection config options for DMA365 has been changed. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> --- arch/arm/mach-davinci/board-dm365-evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)