From patchwork Fri Jul 27 12:46:00 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 10329 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 A319923E23 for ; Fri, 27 Jul 2012 12:46:35 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7222DA1912F for ; Fri, 27 Jul 2012 12:46:35 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so3110238yhp.11 for ; Fri, 27 Jul 2012 05:46:35 -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=v6PcHH5An4PxUAZWrRlptnqn/rwJE7RYsIw0bATcZrQ=; b=C0eD9epVaX/Rfdk1KVrvbIUt3m2kxYfiUx4SUwgNlOw29PUf8WtgC5BD1Y8s9uXuEZ sMw84Oc30NJvxmMNl72QHgVuBm2DdnFxwgzxmamnKqERG2KGYou1mN/Npu2Gkh1jzMAz 7i3/Ik6D1Pqld1Ffp5/pgqO81hOI1MelrFrgByCj0iIZTJvPo/TdUC8awmSDaup3ruFE AfHdvn78V9AdOQUA3N/EbykCTKk689cAEVBORatFwb90xSFGpEKZWWcOoUx92nVJBqcG LzSgKdI03F/+RrloczdJVYOKVyoXz7lrcfHUnS/FRekKAc7cjEw2qPQ1oTl4gMK5OiBx 0Dow== Received: by 10.50.10.166 with SMTP id j6mr1793042igb.38.1343393195047; Fri, 27 Jul 2012 05:46:35 -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 bs3csp29875icc; Fri, 27 Jul 2012 05:46:34 -0700 (PDT) Received: by 10.180.103.136 with SMTP id fw8mr5889829wib.20.1343393193700; Fri, 27 Jul 2012 05:46:33 -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 v55si2617189wee.145.2012.07.27.05.46.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:33 -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 ds11so2665012wgb.31 for ; Fri, 27 Jul 2012 05:46:33 -0700 (PDT) Received: by 10.180.81.165 with SMTP id b5mr21912550wiy.17.1343393193214; Fri, 27 Jul 2012 05:46:33 -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 dc3sm12342025wib.7.2012.07.27.05.46.31 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 27 Jul 2012 05:46:32 -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, olalilja@yahoo.se, ola.o.lilja@stericsson.com, alsa-devel@alsa-project.org, lrg@ti.com, broonie@opensource.wolfsonmicro.com, Lee Jones Subject: [PATCH 16/18] ARM: ux500: Remove platform registration of MSP devices Date: Fri, 27 Jul 2012 13:46:00 +0100 Message-Id: <1343393162-11938-17-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> References: <1343393162-11938-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnXIfnU/adUpcqLafbuvWO+gYrK+tYdhQcMOTT4eTAhQAYba74kW4cNumrYHx2iI7CSP/t0 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 391c129..c20d5d2 100644 --- a/arch/arm/mach-ux500/board-mop500-msp.c +++ b/arch/arm/mach-ux500/board-mop500-msp.c @@ -174,20 +174,6 @@ struct msp_i2s_platform_data msp3_platform_data = { .use_pinctrl = true, }; -/* 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,