From patchwork Tue Jul 31 13:39:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10418 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 B185D23E02 for ; Tue, 31 Jul 2012 13:39:44 +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 7A8ADA18880 for ; Tue, 31 Jul 2012 13:39:44 +0000 (UTC) Received: by mail-gh0-f180.google.com with SMTP id z12so5883265ghb.11 for ; Tue, 31 Jul 2012 06:39:44 -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=3L+z+jPZyIxt+RM6RW5WaQLlygJUxbfjN1+80G08jvA=; b=WC3k/ypYQ1LL6nW9BD3qUUhmvn9eGbILmxtvkODt+V7T1hYT9WBGnLy7cPq3v+105N w9HFKstTllaEhBEMueNwwND6qEKjZ6NMQB1pAkn1kRYtZrpCLiLeByVS5yxBPSEq27Jw KTHEUKOcwt3TG47HNnClWQ6DJLIEzVyjv6mmyl1PuAyAOw3r8hGWC4Ccd6UPi8ys2wR7 4cmVH6DZMCm9DlBy+yQm08rnMlCToltWjy/332Q1roIgKWFzJxWeO0uYkW25/2iLRNAg +DAB4TbhvwOVGJ3gGhhW1sqEAeSeF+u0Om6K9VDvtohGMgJHF+uxUr2sJueQefofT/zx xPWg== Received: by 10.50.47.161 with SMTP id e1mr2053081ign.11.1343741983709; Tue, 31 Jul 2012 06:39:43 -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.87.40 with SMTP id u8csp143528igz; Tue, 31 Jul 2012 06:39:42 -0700 (PDT) Received: by 10.180.76.135 with SMTP id k7mr2427481wiw.7.1343741982460; Tue, 31 Jul 2012 06:39:42 -0700 (PDT) Received: from mail-we0-f178.google.com (mail-we0-f178.google.com [74.125.82.178]) by mx.google.com with ESMTPS id r63si103836wed.123.2012.07.31.06.39.42 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:39:42 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.178 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-we0-f178.google.com with SMTP id u7so5232592wey.37 for ; Tue, 31 Jul 2012 06:39:42 -0700 (PDT) Received: by 10.216.138.92 with SMTP id z70mr7318356wei.68.1343741981949; Tue, 31 Jul 2012 06:39:41 -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 el6sm22252911wib.8.2012.07.31.06.39.40 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 31 Jul 2012 06:39:41 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, broonie@opensource.wolfsonmicro.com Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 12/19] ARM: ux500: Remove platform registration of MSP devices Date: Tue, 31 Jul 2012 14:39:06 +0100 Message-Id: <1343741953-17828-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343741953-17828-1-git-send-email-lee.jones@linaro.org> References: <1343741953-17828-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQmKocWIW9MDFpiNK9ON1wL0oHFr4ReSQB7QHYUXm2V83QhnFjsyrE1IcEoCCFQGLSTNLLj3 This patch removes platform device registration of all 4 MSP devices. It also takes care of all redundant infrastructure now that each of the ux500 audio components have been Device Tree enabled. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-msp.c | 14 -------------- arch/arm/mach-ux500/board-mop500.c | 2 -- arch/arm/mach-ux500/board-mop500.h | 2 -- 3 files changed, 18 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-msp.c b/arch/arm/mach-ux500/board-mop500-msp.c index 7af2dce..19473f7 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -172,20 +172,6 @@ struct msp_i2s_platform_data msp3_platform_data = { .msp_i2s_dma_tx = NULL, }; -/* Due for removal once the MSP driver has been fully DT:ed. */ -void mop500_of_msp_init(struct device *parent) -{ - pr_info("Initialize MSP I2S-devices.\n"); - db8500_add_msp_i2s(parent, 0, U8500_MSP0_BASE, IRQ_DB8500_MSP0, - &msp0_platform_data); - db8500_add_msp_i2s(parent, 1, U8500_MSP1_BASE, IRQ_DB8500_MSP1, - &msp1_platform_data); - db8500_add_msp_i2s(parent, 2, U8500_MSP2_BASE, IRQ_DB8500_MSP2, - &msp2_platform_data); - db8500_add_msp_i2s(parent, 3, U8500_MSP3_BASE, IRQ_DB8500_MSP1, - &msp3_platform_data); -} - void mop500_msp_init(struct device *parent) { pr_info("%s: Register platform-device 'snd-soc-u8500'.\n", __func__); diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index d455a61..2ef26c8 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -810,8 +810,6 @@ static void __init u8500_init_machine(void) mop500_uib_init(); - } else if (of_machine_is_compatible("calaosystems,snowball-a9500")) { - mop500_of_msp_init(parent); } else if (of_machine_is_compatible("st-ericsson,hrefv60+")) { /* * The HREFv60 board removed a GPIO expander and routed diff --git a/arch/arm/mach-ux500/board-mop500.h b/arch/arm/mach-ux500/board-mop500.h index 3fbf48f..e56c983 100644 --- a/arch/arm/mach-ux500/board-mop500.h +++ b/arch/arm/mach-ux500/board-mop500.h @@ -98,8 +98,6 @@ 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,