From patchwork Wed Aug 1 08:46:15 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 1263241 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 7249C3FC23 for ; Wed, 1 Aug 2012 08:48:18 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SwUZT-0002wY-3Q; Wed, 01 Aug 2012 08:46:23 +0000 Received: from mail-ey0-f177.google.com ([209.85.215.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SwUZQ-0002w7-B9 for linux-arm-kernel@lists.infradead.org; Wed, 01 Aug 2012 08:46:20 +0000 Received: by eaaq12 with SMTP id q12so1659213eaa.36 for ; Wed, 01 Aug 2012 01:46:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=NbdtsdJjtY+H7QNKlIBRThTMgeLPlt35iS9+LD0K4bY=; b=fXoU1O6JbTVJl0kFj0VjZVhT0W+CKKcJu76PTq/JdUh4F/r5+PujGrEDPyDmq2hy6k jSeZpLmspWyU0apHhTI71Y2gpTbs54jtPSLGjzl2lsjpv49mIe1bnlB27VGldvpo0mfz B7p50KsSAXqDtD3/MpK9jt+r2phbkHwfGdy9wovy+z+67sqV7IVXcorb1gyE8Zfwipdb TJtkKFX/uNESZqwtkv7i0fH+aH7sScbgPyZ9Fb1AebluRNe+J2IbEzSUVJ1UwR1E9e8X +5v0IQMU7r3mQ089pumBbCsthUUw6vpJpS30icOLd1fUOldYrsYhKhkrHJo+DWGJQIWv oUSw== Received: by 10.14.204.197 with SMTP id h45mr21420855eeo.8.1343810777799; Wed, 01 Aug 2012 01:46:17 -0700 (PDT) Received: from [192.168.0.134] (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id h42sm6899816eem.5.2012.08.01.01.46.16 (version=SSLv3 cipher=OTHER); Wed, 01 Aug 2012 01:46:16 -0700 (PDT) Message-ID: <5018ECD7.5030005@linaro.org> Date: Wed, 01 Aug 2012 09:46:15 +0100 From: Lee Jones User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:14.0) Gecko/20120714 Thunderbird/14.0 MIME-Version: 1.0 To: Lee Jones Subject: Re: [PATCH 3/6 v2] ARM: ux500: Fix merge error, no matching driver name for, 'snd_soc_u8500' References: <1343741493-17671-1-git-send-email-lee.jones@linaro.org> <1343741493-17671-6-git-send-email-lee.jones@linaro.org> In-Reply-To: <1343741493-17671-6-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlwQhFz1m5AXSxdd9LfKLeLh2+Qv+q54gjeDoSoUwxJh9PZ0OBxsDkJHpoh1xHY2R0CK5k1 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.215.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, olalilja@yahoo.se, linux-kernel@vger.kernel.org, STEricsson_nomadik_linux@list.st.com, lrg@ti.com, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org From: Lee Jones Date: Fri, 27 Jul 2012 13:10:52 +0100 Subject: [PATCH 1/1] ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' The platform attempts to register platform device 'snd_soc_u8500' which doesn't actually exist. Here we change the reference to the correct one 'snd_soc_mop500'. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 9960480..df15646 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -191,9 +191,9 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, return pdev; } -/* Platform device for ASoC U8500 machine */ -static struct platform_device snd_soc_u8500 = { - .name = "snd-soc-u8500", +/* Platform device for ASoC MOP500 machine */ +static struct platform_device snd_soc_mop500 = { + .name = "snd-soc-mop500", .id = 0, .dev = { .platform_data = NULL, @@ -227,8 +227,8 @@ int mop500_msp_init(struct device *parent) { struct platform_device *msp1; - pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); - platform_device_register(&snd_soc_u8500); + pr_info("%s: Register platform-device 'snd-soc-mop500'.\n", __func__); + platform_device_register(&snd_soc_mop500); pr_info("Initialize MSP I2S-devices.\n"); db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0,