From patchwork Thu Aug 9 15:47:27 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10621 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 62CF623E02 for ; Thu, 9 Aug 2012 15:48:13 +0000 (UTC) Received: from mail-gh0-f180.google.com (mail-gh0-f180.google.com [209.85.160.180]) by fiordland.canonical.com (Postfix) with ESMTP id 32170A18A4B for ; Thu, 9 Aug 2012 15:48:13 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id g10so584535ghb.11 for ; Thu, 09 Aug 2012 08:48:13 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=YLLmRvj/uRvlir4bvh5r7IcoxwoGaSjlv17YZVD+CBE=; b=KPSOO/drN43HNAq8qPuWM4AmsBdgJjr1jcVb/9KeU+ijj4uWgksT5wHbyc07ZcUrbC 3aZQpL6R5ib+An1Zh7dZBhNIfUTpOlyJDlMGn2iPTfkT4KStWBJKjeqwkNV3Eqk4Qg5v a7B1aC3AzxD7nT0JubJhOnZobf3kNOh0PO93zrfLoQrBPT4gcPb1rsJGoXO3p8n1212v p4N3Y4bt7I6yLavOTPPc7Dg4dnLrE0a1gGfkmdL96qs+qH6KXLb/tOXB6m2YYX409dq2 uqyTyJ9EOEMrNuVDo0wxWHHBi0OXqQN3/+NOUBbOeKQyw01T9RGXZ3vtr5LcctnS7L8I Ft5Q== Received: by 10.50.154.132 with SMTP id vo4mr1576813igb.31.1344527292474; Thu, 09 Aug 2012 08:48:12 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.200 with SMTP id ew8csp15213igc; Thu, 9 Aug 2012 08:48:11 -0700 (PDT) Received: by 10.216.74.21 with SMTP id w21mr1077658wed.77.1344527290925; Thu, 09 Aug 2012 08:48:10 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id ed3si2922594wib.27.2012.08.09.08.48.10 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:10 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by wgbds11 with SMTP id ds11so531652wgb.31 for ; Thu, 09 Aug 2012 08:48:10 -0700 (PDT) Received: by 10.216.243.1 with SMTP id j1mr49090wer.29.1344527290379; Thu, 09 Aug 2012 08:48:10 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id q4sm2278954wix.9.2012.08.09.08.48.08 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:09 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 01/22] ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500' Date: Thu, 9 Aug 2012 16:47:27 +0100 Message-Id: <1344527268-5964-2-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> References: <1344527268-5964-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQk+Xl4PrRUXuhmM/8OpDqvQQp8OQiRKkVg5fxpeFKhN++f0y1Tn6qa/d+Y5ubrYTLbVK2No 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,