From patchwork Tue Feb 4 19:52:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24132 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pb0-f69.google.com (mail-pb0-f69.google.com [209.85.160.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8331D202FA for ; Tue, 4 Feb 2014 19:53:01 +0000 (UTC) Received: by mail-pb0-f69.google.com with SMTP id md12sf22500636pbc.8 for ; Tue, 04 Feb 2014 11:53:00 -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=LCxbX3kuSmuK1QmeePOSAhLZjNVM2dKhFzhqC9kNuF0=; b=LUuOdnKEvBEZl+jA34wKZ2dEtDDRhuzDtTAfLUnbIndZp5CMpNZNnI+QnIaH+CTCp7 l4c7dFmjEntMrcjYooUSMtCcQqL8MFx++kidS69rpr2T0LnyaGquaK+v3Ch3mTuhoHu8 Q/A6zNJvR4QjuMx0iaSR+nSKVc3VFXDzfipoCtwAm9YGYnp9WHx4haB+UYPWeDysSv72 +47FZ39WHC1YcU5YCxLTQPmZIe95stA4bOk7hY5tvV35SQdCmDz3Nz/yA/UCPRj8/Cko ZKxOiwb7bUnQp4asHurXZTLlsvGxbUDoxngVrQ31KbSM3m7M5brN10oMlSUMnZEfsL2Y L3hA== X-Gm-Message-State: ALoCoQmRHQIspX+vuvh7wi+o1y7JrQPma0gqJKsC74wH8eEB6GF8o9euXo3Q61kzgO0a0sL+b8Tn X-Received: by 10.68.231.233 with SMTP id tj9mr9183420pbc.2.1391543580747; Tue, 04 Feb 2014 11:53:00 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.96.138 with SMTP id k10ls2465637qge.66.gmail; Tue, 04 Feb 2014 11:53:00 -0800 (PST) X-Received: by 10.58.58.3 with SMTP id m3mr2268221veq.32.1391543580603; Tue, 04 Feb 2014 11:53:00 -0800 (PST) Received: from mail-vb0-f44.google.com (mail-vb0-f44.google.com [209.85.212.44]) by mx.google.com with ESMTPS id yt16si8644653vcb.117.2014.02.04.11.53.00 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:00 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.44 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.44; Received: by mail-vb0-f44.google.com with SMTP id f12so6074482vbg.17 for ; Tue, 04 Feb 2014 11:53:00 -0800 (PST) X-Received: by 10.52.30.167 with SMTP id t7mr1943677vdh.36.1391543580495; Tue, 04 Feb 2014 11:53:00 -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 u4csp270673vcz; Tue, 4 Feb 2014 11:52:59 -0800 (PST) X-Received: by 10.180.182.199 with SMTP id eg7mr14172898wic.13.1391543579464; Tue, 04 Feb 2014 11:52:59 -0800 (PST) Received: from mail-we0-f173.google.com (mail-we0-f173.google.com [74.125.82.173]) by mx.google.com with ESMTPS id pn9si13192978wjb.2.2014.02.04.11.52.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:52:59 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.173 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.173; Received: by mail-we0-f173.google.com with SMTP id x55so4610378wes.4 for ; Tue, 04 Feb 2014 11:52:59 -0800 (PST) X-Received: by 10.180.101.166 with SMTP id fh6mr14085489wib.2.1391543578894; Tue, 04 Feb 2014 11:52:58 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.52.57 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:52:58 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 04/10] ARM: ux500: move AB8500 audio interface 1 settings to DT Date: Tue, 4 Feb 2014 20:52:20 +0100 Message-Id: <1391543546-11158-4-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.5.3 In-Reply-To: <1391543546-11158-1-git-send-email-linus.walleij@linaro.org> References: <1391543546-11158-1-git-send-email-linus.walleij@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.44 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: , This moves the pin muxing and configuration for audio interface one over to the device tree as a hog configuration. Cc: Patrice Chotard Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 20 +++++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 10 ---------- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index cdf2b3fd22dc..3aae4ec5bcc9 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -33,7 +33,8 @@ <&gpio26_default_mode>, <&gpio35_default_mode>, <&ycbcr_default_mode>, - <&pwm_default_mode>; + <&pwm_default_mode>, + <&adi1_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -283,6 +284,23 @@ }; }; }; + /* This sets up audio interface 1 */ + adi1 { + adi1_default_mode: adi1_default { + default_mux { + ste,function = "adi1"; + ste,pins = "adi1_d_1"; + }; + default_cfg { + ste,pins = "GPIO17_P5", + "GPIO18_R5", + "GPIO19_U5", + "GPIO20_T5"; + input-enable; + bias-pull-down; + }; + }; + }; }; }; }; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index b75089faf956..d0b262242ab7 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -57,16 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), /* - * pins 17,18,19 and 20 are muxed in AUDIO interface 1 - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("adi1_d_1", "adi1"), - AB8500_PIN_HOG("GPIO17_P5", in_pd), - AB8500_PIN_HOG("GPIO18_R5", in_pd), - AB8500_PIN_HOG("GPIO19_U5", in_pd), - AB8500_PIN_HOG("GPIO20_T5", in_pd), - - /* * pins 21,22 and 23 are muxed in USB UICC * configured in INPUT PULL DOWN */