From patchwork Thu Jul 26 10:28:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10250 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 1E35D23E56 for ; Thu, 26 Jul 2012 10:29:20 +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 E293BA18866 for ; Thu, 26 Jul 2012 10:29:19 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so1774077ghb.11 for ; Thu, 26 Jul 2012 03:29:19 -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=UYtaTc1XEBphmjNPuDCvvC3wyZgpnafsLj38VDCG29A=; b=aDCZqOWZv5HYG3OrROb6v6Mzx296anb7THJwmJfcn2NefnlTr0NvhYPdkF0yiVc3h3 ZCbrO90+N5kg0LykkvsIApyQ8TqZ3NO4eihzYwCeIFIwJv/XMwAxhFFk768le23CsNbZ m9X/WabIrKL6HD+/8c74Sa62h/XrxQrLUr5/wIimFzRE+FfpFfJ7jfaH67eUVNbNhCGG LGnfn57OgMluiHoTQDjs8MHCPty+TYQvdKSFr5QvHerA/gbAQEl8XviSh6EayhUWPsFW A6zJ0hH64IYSRwiNs3XOOniubBvbEcy6xvALd6Gk1PUXEDnRzYUC2O/yAXO+HUdukI2M zGQw== Received: by 10.50.207.3 with SMTP id ls3mr1221010igc.0.1343298559303; Thu, 26 Jul 2012 03:29:19 -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.43.93.3 with SMTP id bs3csp133349icc; Thu, 26 Jul 2012 03:29:18 -0700 (PDT) Received: by 10.216.242.204 with SMTP id i54mr7004172wer.114.1343298557182; Thu, 26 Jul 2012 03:29:17 -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 b57si24102927wef.8.2012.07.26.03.29.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:17 -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 mail-wg0-f50.google.com with SMTP id ds11so1580986wgb.31 for ; Thu, 26 Jul 2012 03:29:17 -0700 (PDT) Received: by 10.216.181.195 with SMTP id l45mr6536181wem.52.1343298556830; Thu, 26 Jul 2012 03:29:16 -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 fb20sm11559455wid.1.2012.07.26.03.29.15 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 26 Jul 2012 03:29:16 -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, sameo@linux.intel.com, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, Lee Jones Subject: [PATCH 03/21] ARM: ux500: Clean-up MSP platform code Date: Thu, 26 Jul 2012 11:28:36 +0100 Message-Id: <1343298534-13611-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> References: <1343298534-13611-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlSUFB1dK0EEANPu/31xD0Pb+pd4fsDvzg2hxMB7mCrDbrGEAvbaGN6UM2dQDLNyiei/0v/ This patch contains a couple of general MSP clean-ups and a bug-fix. The general clean-ups pertain to layout changes and changing functions to be void instead of int and not to regardlessly return '0'. The bug that's fixed is thought to be caused by a merge error. The code erroneously attempts to platform_device_register a non-existent struct. It's a simple fix, just reference the correct platform_data structure in its place. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 28 +++++++++++++--------------- arch/arm/mach-ux500/board-mop500-msp.h | 14 -------------- arch/arm/mach-ux500/board-mop500.c | 1 - arch/arm/mach-ux500/board-mop500.h | 3 +++ 4 files changed, 16 insertions(+), 30 deletions(-) delete mode 100644 arch/arm/mach-ux500/board-mop500-msp.h diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 9960480..217df1d 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -192,21 +192,21 @@ static struct platform_device *db8500_add_msp_i2s(struct device *parent, } /* Platform device for ASoC U8500 machine */ -static struct platform_device snd_soc_u8500 = { - .name = "snd-soc-u8500", - .id = 0, - .dev = { - .platform_data = NULL, - }, +static struct platform_device snd_soc_mop500 = { + .name = "snd-soc-mop500", + .id = 0, + .dev = { + .platform_data = NULL, + }, }; /* Platform device for Ux500-PCM */ static struct platform_device ux500_pcm = { - .name = "ux500-pcm", - .id = 0, - .dev = { - .platform_data = NULL, - }, + .name = "ux500-pcm", + .id = 0, + .dev = { + .platform_data = NULL, + }, }; static struct msp_i2s_platform_data msp2_platform_data = { @@ -223,12 +223,12 @@ static struct msp_i2s_platform_data msp3_platform_data = { .msp_i2s_exit = msp13_i2s_exit, }; -int mop500_msp_init(struct device *parent) +void 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); + 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, @@ -262,6 +262,4 @@ int mop500_msp_init(struct device *parent) pr_info("%s: Register platform-device 'ux500-pcm'\n", __func__); platform_device_register(&ux500_pcm); - - return 0; } diff --git a/arch/arm/mach-ux500/board-mop500-msp.h b/arch/arm/mach-ux500/board-mop500-msp.h deleted file mode 100644 index 6fcfb5e..0000000 --- a/arch/arm/mach-ux500/board-mop500-msp.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * Copyright (C) ST-Ericsson SA 2012 - * - * Author: Ola Lilja , - * for ST-Ericsson. - * - * License terms: - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as published - * by the Free Software Foundation. - */ - -void mop500_msp_init(struct device *parent); diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index e641003..b87393c 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -54,7 +54,6 @@ #include "devices-db8500.h" #include "board-mop500.h" #include "board-mop500-regulators.h" -#include "board-mop500-msp.h" static struct gpio_led snowball_led_array[] = { { diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index d04a8e6..1d7316b 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -92,6 +92,9 @@ void __init mop500_stuib_init(void); void __init mop500_pinmaps_init(void); void __init snowball_pinmaps_init(void); void __init hrefv60_pinmaps_init(void); +void mop500_msp_init(struct device *parent); +/* Due for removal once the MSP driver has been fully DT:ed. */ +void mop500_of_msp_init(struct device *parent); int __init mop500_uib_init(void); void mop500_uib_i2c_add(int busnum, struct i2c_board_info *info,