From patchwork Tue Nov 19 11:07:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 21616 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f72.google.com (mail-vb0-f72.google.com [209.85.212.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id D58F623FB4 for ; Tue, 19 Nov 2013 11:08:11 +0000 (UTC) Received: by mail-vb0-f72.google.com with SMTP id w5sf589501vbf.11 for ; Tue, 19 Nov 2013 03:08:11 -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=XROqXMLA2g4/pryIQgwebL5SGtA6CUnO4xrifzLh4UaP2NGUT9yfPgBuUjfyEylYvz H08usHYBbPTy9ZPT+4RUtDDnRJmdxkhrEmGwL6WY0qriPTPKMFFIyiMj6xU0RBzKuPe5 uw4h7VD5N23/u4OzDPTuAEwnmhmKvFf5cNVVCYHOgjTQEeFVrTRqsENW/4NzMYAfW/hu yakEwCJ1ElG6ocLeMn2ixi9S0MBfUC3h4QUu7IckF9Nl/unp/ChSc+T8WwkMBirLBY7t FTiktNDDf7XycHfHlN0J3c22rp3qlyveTDLsNvHuz2bLOgN4FTVivc3LAzWdwW9hXFBA mTog== X-Gm-Message-State: ALoCoQkPu0gFnTpdbE6MQ+CXb76Q02llODcDMB88OUHiSL9ZOWEJUgcOSa66clAv+dBuNfaGe3XX X-Received: by 10.236.69.35 with SMTP id m23mr13020551yhd.6.1384859291434; Tue, 19 Nov 2013 03:08:11 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.225 with SMTP id 1ls3072624qex.61.gmail; Tue, 19 Nov 2013 03:08:11 -0800 (PST) X-Received: by 10.220.74.69 with SMTP id t5mr20767020vcj.18.1384859291350; Tue, 19 Nov 2013 03:08:11 -0800 (PST) Received: from mail-vb0-f45.google.com (mail-vb0-f45.google.com [209.85.212.45]) by mx.google.com with ESMTPS id vr9si8013119vcb.51.2013.11.19.03.08.11 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:08:11 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.45 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.45; Received: by mail-vb0-f45.google.com with SMTP id x13so3165476vbb.4 for ; Tue, 19 Nov 2013 03:08:11 -0800 (PST) X-Received: by 10.58.46.18 with SMTP id r18mr20806915vem.4.1384859291261; Tue, 19 Nov 2013 03:08:11 -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 u4csp269500vcz; Tue, 19 Nov 2013 03:08:10 -0800 (PST) X-Received: by 10.60.145.136 with SMTP id su8mr24488550oeb.17.1384859290755; Tue, 19 Nov 2013 03:08:10 -0800 (PST) Received: from mail-ob0-f176.google.com (mail-ob0-f176.google.com [209.85.214.176]) by mx.google.com with ESMTPS id h3si15128518oep.107.2013.11.19.03.08.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:08:10 -0800 (PST) Received-SPF: neutral (google.com: 209.85.214.176 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.214.176; Received: by mail-ob0-f176.google.com with SMTP id wp4so8294326obc.7 for ; Tue, 19 Nov 2013 03:08:10 -0800 (PST) X-Received: by 10.182.103.133 with SMTP id fw5mr6480810obb.43.1384859290491; Tue, 19 Nov 2013 03:08:10 -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 d8sm34904086oeu.6.2013.11.19.03.08.09 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 19 Nov 2013 03:08:10 -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/10] ARM: ux500: Don't use enums for MSP IDs - for easy DT conversion Date: Tue, 19 Nov 2013 11:07:42 +0000 Message-Id: <1384859269-19801-4-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1384859269-19801-1-git-send-email-lee.jones@linaro.org> References: <1384859269-19801-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.212.45 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;