From patchwork Tue Feb 4 19:52:22 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24134 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f69.google.com (mail-pa0-f69.google.com [209.85.220.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 350CF202FA for ; Tue, 4 Feb 2014 19:53:06 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id fa1sf23887377pad.4 for ; Tue, 04 Feb 2014 11:53:05 -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=1mw1CiGJTRuQs3kCOKndOUGUTonBOFE9Yq5oPu/VB9A=; b=YvG6afrR05fzfz+ptdMCqYwLIjbtzAkowlNVuCrkrAKUug9/wZFKiEBbl2XVqU3FLW bIDZrmF4KeLZcPT5MTFyWkEQFpd3x0zkHibINpt9Pu/Ul9Fu/SkC2t2lDfnBeq0An9xK xjvegijVEx6xK53DUTLC52LJcuWDIz96O/XnWRubRs9D0+q35eepnVGZaBB0FCSQ5y8e kQfi/QAWVMLi1jAez//8XT5vb+xPB0y2+mEuu2Onfjz2JrzBK0WVpe8FPYVGLes7QDb5 IceAoSpw1XOCWNkrW/t6CukQHfWYs5bMdE+APQ4jEw2qIZPQs/JQwgQjsdzMCQcUGY3p XY0Q== X-Gm-Message-State: ALoCoQmRayPVDkrKxSvrWbqbx5JoU+aCTw10Ko20vL1tPTqJJK85p/9HmnL/SEmIUnOtTZDCauL0 X-Received: by 10.66.158.6 with SMTP id wq6mr5267321pab.39.1391543585425; Tue, 04 Feb 2014 11:53:05 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.29.134 with SMTP id b6ls2487966qgb.91.gmail; Tue, 04 Feb 2014 11:53:05 -0800 (PST) X-Received: by 10.220.188.10 with SMTP id cy10mr1314460vcb.36.1391543585273; Tue, 04 Feb 2014 11:53:05 -0800 (PST) Received: from mail-ve0-f170.google.com (mail-ve0-f170.google.com [209.85.128.170]) by mx.google.com with ESMTPS id x7si8619317vel.38.2014.02.04.11.53.05 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:05 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.170 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.170; Received: by mail-ve0-f170.google.com with SMTP id cz12so6435062veb.15 for ; Tue, 04 Feb 2014 11:53:05 -0800 (PST) X-Received: by 10.52.84.102 with SMTP id x6mr78557vdy.49.1391543585206; Tue, 04 Feb 2014 11:53:05 -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 u4csp270680vcz; Tue, 4 Feb 2014 11:53:04 -0800 (PST) X-Received: by 10.194.142.170 with SMTP id rx10mr14748950wjb.13.1391543584254; Tue, 04 Feb 2014 11:53:04 -0800 (PST) Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by mx.google.com with ESMTPS id cw3si13189645wjb.23.2014.02.04.11.53.03 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:04 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.177 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.177; Received: by mail-we0-f177.google.com with SMTP id t61so4609000wes.22 for ; Tue, 04 Feb 2014 11:53:03 -0800 (PST) X-Received: by 10.194.109.68 with SMTP id hq4mr29926746wjb.12.1391543583805; Tue, 04 Feb 2014 11:53:03 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.53.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:53:03 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 06/10] ARM: ux500: move AB8500 DMIC settings to DT Date: Tue, 4 Feb 2014 20:52:22 +0100 Message-Id: <1391543546-11158-6-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.128.170 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 move the AB8500 DMIC (microphone) pin setup from the board file to the device tree. Cc: Patrice Chotard Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 25 ++++++++++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 24 ------------------------ 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 9cf12d5d0923..6222b8e951c2 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -35,7 +35,8 @@ <&ycbcr_default_mode>, <&pwm_default_mode>, <&adi1_default_mode>, - <&usbuicc_default_mode>; + <&usbuicc_default_mode>, + <&dmic_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -318,6 +319,28 @@ }; }; }; + /* This sets up the microphone pins */ + dmic { + dmic_default_mode: dmic_default { + default_mux { + ste,function = "dmic"; + ste,pins = "dmic12_d_1", + "dmic34_d_1", + "dmic56_d_1"; + }; + default_cfg { + ste,pins = "GPIO27_J6", + "GPIO28_K6", + "GPIO29_G6", + "GPIO30_H6", + "GPIO31_F5", + "GPIO32_G5"; + 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 443b1f4b828a..851f530e6e16 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -57,30 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), /* - * pins 27,28 are muxed in DMIC12 - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("dmic12_d_1", "dmic"), - AB8500_PIN_HOG("GPIO27_J6", in_pd), - AB8500_PIN_HOG("GPIO28_K6", in_pd), - - /* - * pins 29,30 are muxed in DMIC34 - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("dmic34_d_1", "dmic"), - AB8500_PIN_HOG("GPIO29_G6", in_pd), - AB8500_PIN_HOG("GPIO30_H6", in_pd), - - /* - * pins 31,32 are muxed in DMIC56 - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("dmic56_d_1", "dmic"), - AB8500_PIN_HOG("GPIO31_F5", in_pd), - AB8500_PIN_HOG("GPIO32_G5", in_pd), - - /* * pins 34 is muxed in EXTCPENA * configured INPUT PULL DOWN */