From patchwork Wed Nov 6 10:16:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 21366 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f199.google.com (mail-ie0-f199.google.com [209.85.223.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 76A6E20DB9 for ; Wed, 6 Nov 2013 10:16:53 +0000 (UTC) Received: by mail-ie0-f199.google.com with SMTP id qd12sf29398789ieb.2 for ; Wed, 06 Nov 2013 02:16:53 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=0LTXI0uMPmodb8sCciYYdH1setFxKdTu+U5kfwNpcf8=; b=DMaGaW6B/KrcmeWOPNTYSNRosRQ2zSBn0flxQvBDl2AC7bVehyETlb2W8fCybmC7jL YSkmmSYUhnH3gXkWyXP6VdvPBzn0w01xGUgGuNzadInOaj9nxtdNZUtMG5JrFwxLAuH2 nL4X8DGrzVbtkHaigSJyCqKhSqsR2XUOSzM667Hi/gPQylFOzwQVClUlb0KkRzQi5x/h UOZ9kDn6stfdJhIMVxDG+5QI8Ve6MOAHgmEwaYG97+SostnltuigUyEubQ/QVajErHUv CR/8jIINpxafRjmuKBguTSx3Bn4+qq34Br9PK6QCQGK1iVzHXH74w9KYz6GBHAFKv0cm KFGw== X-Gm-Message-State: ALoCoQkY1M8M7a1msoWGN1kn4Zsi1OACoi7wywvzhWyZuAUhkDBmpwEZFqX71C/E68GpkEzZXBLi X-Received: by 10.50.12.68 with SMTP id w4mr813517igb.0.1383733013050; Wed, 06 Nov 2013 02:16:53 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.103 with SMTP id x7ls558583qeb.14.gmail; Wed, 06 Nov 2013 02:16:52 -0800 (PST) X-Received: by 10.220.47.10 with SMTP id l10mr564758vcf.32.1383733012943; Wed, 06 Nov 2013 02:16:52 -0800 (PST) Received: from mail-ve0-f178.google.com (mail-ve0-f178.google.com [209.85.128.178]) by mx.google.com with ESMTPS id ip2si8164207vcb.116.2013.11.06.02.16.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:16:52 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.178; Received: by mail-ve0-f178.google.com with SMTP id db12so3509825veb.9 for ; Wed, 06 Nov 2013 02:16:52 -0800 (PST) X-Received: by 10.221.6.195 with SMTP id ol3mr558039vcb.34.1383733012862; Wed, 06 Nov 2013 02:16:52 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp273196vcz; Wed, 6 Nov 2013 02:16:52 -0800 (PST) X-Received: by 10.50.1.102 with SMTP id 6mr19906845igl.0.1383733012311; Wed, 06 Nov 2013 02:16:52 -0800 (PST) Received: from mail-ie0-f175.google.com (mail-ie0-f175.google.com [209.85.223.175]) by mx.google.com with ESMTPS id ki9si7002651igb.10.2013.11.06.02.16.52 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:16:52 -0800 (PST) Received-SPF: neutral (google.com: 209.85.223.175 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.223.175; Received: by mail-ie0-f175.google.com with SMTP id aq17so16664776iec.20 for ; Wed, 06 Nov 2013 02:16:52 -0800 (PST) X-Received: by 10.50.154.10 with SMTP id vk10mr19573656igb.1.1383733011833; Wed, 06 Nov 2013 02:16:51 -0800 (PST) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginm.net. [92.233.57.238]) by mx.google.com with ESMTPSA id ka1sm13308397igb.7.2013.11.06.02.16.50 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 06 Nov 2013 02:16:51 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@linaro.org, Lee Jones Subject: [PATCH 03/13] ARM: ux500: Don't use enums for MSP IDs - for easy DT conversion Date: Wed, 6 Nov 2013 10:16:15 +0000 Message-Id: <1383732985-18928-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> References: <1383732985-18928-1-git-send-email-lee.jones@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.128.178 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Signed-off-by: Lee Jones --- arch/arm/mach-ux500/board-mop500-audio.c | 8 ++++---- include/linux/platform_data/asoc-ux500-msp.h | 9 +-------- sound/soc/ux500/ux500_msp_i2s.h | 2 +- 3 files changed, 6 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c index d528059..c5eeee3 100644 --- a/arch/arm/mach-ux500/board-mop500-audio.c +++ b/arch/arm/mach-ux500/board-mop500-audio.c @@ -29,7 +29,7 @@ static struct stedma40_chan_cfg msp0_dma_tx = { }; struct msp_i2s_platform_data msp0_platform_data = { - .id = MSP_I2S_0, + .id = 0, .msp_i2s_dma_rx = &msp0_dma_rx, .msp_i2s_dma_tx = &msp0_dma_tx, }; @@ -47,7 +47,7 @@ static struct stedma40_chan_cfg msp1_dma_tx = { }; struct msp_i2s_platform_data msp1_platform_data = { - .id = MSP_I2S_1, + .id = 1, .msp_i2s_dma_rx = NULL, .msp_i2s_dma_tx = &msp1_dma_tx, }; @@ -67,13 +67,13 @@ static struct stedma40_chan_cfg msp2_dma_tx = { }; struct msp_i2s_platform_data msp2_platform_data = { - .id = MSP_I2S_2, + .id = 2, .msp_i2s_dma_rx = &msp2_dma_rx, .msp_i2s_dma_tx = &msp2_dma_tx, }; struct msp_i2s_platform_data msp3_platform_data = { - .id = MSP_I2S_3, + .id = 3, .msp_i2s_dma_rx = &msp1_dma_rx, .msp_i2s_dma_tx = NULL, }; diff --git a/include/linux/platform_data/asoc-ux500-msp.h b/include/linux/platform_data/asoc-ux500-msp.h index 9991aea..2f34bb9 100644 --- a/include/linux/platform_data/asoc-ux500-msp.h +++ b/include/linux/platform_data/asoc-ux500-msp.h @@ -10,16 +10,9 @@ #include -enum msp_i2s_id { - MSP_I2S_0 = 0, - MSP_I2S_1, - MSP_I2S_2, - MSP_I2S_3, -}; - /* Platform data structure for a MSP I2S-device */ struct msp_i2s_platform_data { - enum msp_i2s_id id; + int id; struct stedma40_chan_cfg *msp_i2s_dma_rx; struct stedma40_chan_cfg *msp_i2s_dma_tx; }; diff --git a/sound/soc/ux500/ux500_msp_i2s.h b/sound/soc/ux500/ux500_msp_i2s.h index 258d0bc..875de0f 100644 --- a/sound/soc/ux500/ux500_msp_i2s.h +++ b/sound/soc/ux500/ux500_msp_i2s.h @@ -475,7 +475,7 @@ struct ux500_msp_dma_params { }; struct ux500_msp { - enum msp_i2s_id id; + int id; void __iomem *registers; struct device *dev; struct ux500_msp_dma_params playback_dma_data;