From patchwork Wed Sep 18 12:14:32 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 20424 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ye0-f197.google.com (mail-ye0-f197.google.com [209.85.213.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E1BC2246E9 for ; Wed, 18 Sep 2013 12:15:26 +0000 (UTC) Received: by mail-ye0-f197.google.com with SMTP id q5sf6738276yen.0 for ; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) 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=K96MD9+75FP+zfSZW1iR3bEggqte5py7haEme+OsV5I=; b=fHtiNr4T9ehiS7fg/JgwjhdhQuOxs3MuSwsfPYvk6tsAvVcs/2fgGzXuRLRhJu0tLg 4N07zaPOpieV8JsCL28obQ/VMbTYcEs7powABbL40cbDVGU+AbVVd+ZnKIgBSAh0kVgM 9RSHBw0mGo33bWQWQpR7R+FEj946MTb3QzBtth2shvO5lQnmoRhq9wziL9MGLwBbDCZ3 u10Vx8+SR4w9D7j2WezRuZNyF2OxYbwzo93CBxhjXOViZHIyk0vg5fuz5qUQ6pNrFsMy j6/BvkSXKQAUQr4Zk03vXM8W4Ewozv47LZTG38L+A98HOiyG4qXJy4WKnuGfM2+T8/o2 uRJQ== X-Gm-Message-State: ALoCoQl7eLshC9D0JvdGGjawuObDgvY02eZJ/mQAcNrTOrAKt4Xu0sJkPVxOFkt/vl8L4yKUCOCY X-Received: by 10.236.97.7 with SMTP id s7mr151961yhf.56.1379506526718; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.87.36 with SMTP id u4ls3290774qez.56.gmail; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) X-Received: by 10.220.46.72 with SMTP id i8mr38281981vcf.10.1379506526639; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id rl1si415025vcb.149.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:26 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 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.177; Received: by mail-ve0-f177.google.com with SMTP id db12so5266945veb.8 for ; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) X-Received: by 10.220.169.203 with SMTP id a11mr300632vcz.26.1379506526469; Wed, 18 Sep 2013 05:15:26 -0700 (PDT) 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 u4csp214526vcz; Wed, 18 Sep 2013 05:15:25 -0700 (PDT) X-Received: by 10.14.216.201 with SMTP id g49mr2281238eep.77.1379506524140; Wed, 18 Sep 2013 05:15:24 -0700 (PDT) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx.google.com with ESMTPS id 7si1509069eeu.158.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:21 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.177 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.215.177; Received: by mail-ea0-f177.google.com with SMTP id f15so3335113eak.8 for ; Wed, 18 Sep 2013 05:15:21 -0700 (PDT) X-Received: by 10.14.113.137 with SMTP id a9mr58595674eeh.3.1379506521280; Wed, 18 Sep 2013 05:15:21 -0700 (PDT) Received: from localhost.localdomain (cpc15-aztw25-2-0-cust493.aztw.cable.virginmedia.com. [92.233.57.238]) by mx.google.com with ESMTPSA id b45sm2382210eef.4.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Sep 2013 05:15:20 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@linaro.org, Lee Jones Subject: [PATCH 35/41] ARM: ux500: Relocate AUXDATA relating to MSP (Audio) Date: Wed, 18 Sep 2013 13:14:32 +0100 Message-Id: <1379506478-16625-36-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.8.1.2 In-Reply-To: <1379506478-16625-1-git-send-email-lee.jones@linaro.org> References: <1379506478-16625-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.177 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: , MSP no longer requires clock-name bindings, so we need to move them to a more appropriate header indicating that we're still passing DMA related platform data to them. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 44b4879..dd6af6c 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -224,6 +224,14 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1", &mop500_sdi1_data), OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2", &mop500_sdi2_data), OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4", &mop500_sdi4_data), + OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, + "ux500-msp-i2s.0", &msp0_platform_data), + OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000, + "ux500-msp-i2s.1", &msp1_platform_data), + OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000, + "ux500-msp-i2s.2", &msp2_platform_data), + OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, + "ux500-msp-i2s.3", &msp3_platform_data), /* Requires clock name bindings. */ OF_DEV_AUXDATA("stericsson,db8500-musb", 0xa03e0000, "musb-ux500.0", NULL), OF_DEV_AUXDATA("stericsson,db8500-prcmu", 0x80157000, "db8500-prcmu", @@ -236,15 +244,6 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires device name bindings. */ OF_DEV_AUXDATA("stericsson,db8500-pinctrl", U8500_PRCMU_BASE, "pinctrl-db8500", NULL), - /* Requires clock name and DMA bindings. */ - OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, - "ux500-msp-i2s.0", &msp0_platform_data), - OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80124000, - "ux500-msp-i2s.1", &msp1_platform_data), - OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80117000, - "ux500-msp-i2s.2", &msp2_platform_data), - OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80125000, - "ux500-msp-i2s.3", &msp3_platform_data), /* Requires clock name bindings and channel address lookup table. */ OF_DEV_AUXDATA("stericsson,db8500-dma40", 0x801C0000, "dma40.0", NULL), {},