From patchwork Thu Aug 9 15:47:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10637 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 E231B23E02 for ; Thu, 9 Aug 2012 15:48:38 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id A59CCA18440 for ; Thu, 9 Aug 2012 15:48:38 +0000 (UTC) Received: by mail-yx0-f180.google.com with SMTP id q6so585182yen.11 for ; Thu, 09 Aug 2012 08:48:38 -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=ls/JVH+wbgc5TmhdBFu5K2HChhXzxRg/HKvSgQlyGG4=; b=frxyRg9blo6tSA1nkH9eh7j6KDy4kVboMYrPNCBpoesvFwzWZx3pXVrR5G5feZh3nC oAhC+CrQ/cXs9AGM44W2s0vLYwRRvG76/72VuXudDFMDXePXyvMNRZosGOqn4eff4Wq7 RkwR9xm1zZH4gQA3h5crleFbNVp6VUX2WhZdIKCLmDa6yeg0ycX9ZugoKBDdTlseIU/d 6iwKkBLuAAmEMAj6IYHVRVJIkDwV/MkCu/Hbvyv8bjIB2+RjGhAYQNgIT2L2QuLp72Ve vpQcB99vD5s2iGqOGD5y9g8RxVQNcCn6fVb4guEok7G1+8pmTixdb2uYQwdH2/XyaB3k infA== Received: by 10.50.95.230 with SMTP id dn6mr1570328igb.16.1344527318092; Thu, 09 Aug 2012 08:48:38 -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 ew8csp15272igc; Thu, 9 Aug 2012 08:48:37 -0700 (PDT) Received: by 10.180.89.65 with SMTP id bm1mr5275686wib.1.1344527316710; Thu, 09 Aug 2012 08:48:36 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id a7si3086405wiy.10.2012.08.09.08.48.36 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:36 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.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-wi0-f178.google.com with SMTP id hr14so379609wib.13 for ; Thu, 09 Aug 2012 08:48:36 -0700 (PDT) Received: by 10.216.54.146 with SMTP id i18mr11335269wec.187.1344527315951; Thu, 09 Aug 2012 08:48:35 -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.34 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 09 Aug 2012 08:48:35 -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 17/22] ARM: ux500: Remove platform registration of MSP devices Date: Thu, 9 Aug 2012 16:47:43 +0100 Message-Id: <1344527268-5964-18-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: ALoCoQmV3cbw3t6atZMZIg3NdDLAb9IkZdzim8exS++dswRKvMYXSs6TvQsiaMk7YaVphReWV0K3 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 58768c2..326de5a 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-mop500'.\n", __func__); diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 0c141d5..f48d463 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -815,8 +815,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,