From patchwork Tue Feb 4 19:52:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24136 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f199.google.com (mail-ig0-f199.google.com [209.85.213.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F1AAC202FA for ; Tue, 4 Feb 2014 19:53:08 +0000 (UTC) Received: by mail-ig0-f199.google.com with SMTP id c10sf17814521igq.2 for ; Tue, 04 Feb 2014 11:53:08 -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=7O5Xxg7WfG45B5muUdQA3mteTqmegyftwHvbTEzo8gE=; b=RppSSXCmFDXLgriV5NdYt6n9iJ9aGnt69/WAarYWg+iHmZH4FqQf//IGq1CHRa8iHw oemp9ox+mk9OyAHwQG7UKFCBvLigBEUSZ0GbTZPVyEx0iiqUzROMlGVKYPip1H87yXxI oeVQSapPl2fuhRFl5bOhxRB7WfyylUhesxwJ77MNRoP0YshuJF2Q2RSU0xmbab0ytaBU lQK4ucioqsck/RsK+GCCc3vxTbWiCOFgsrH25hHwqcuTO05g/xnoYN+Y9tqGfWx4kLjE fOynhXzoEboJtGZwJ+Aj+E85fyJ7gn6R6xsdl8F4an4gWjK7bxS4fpe/AR66JXDNaLJv lxoQ== X-Gm-Message-State: ALoCoQkTW3j1RM/sXGn7h+H7+vbCsSvG/REf92er7soloj8CDQrNper3aLgrYFcSnQNodokTGgmY X-Received: by 10.182.134.200 with SMTP id pm8mr16700490obb.19.1391543588191; Tue, 04 Feb 2014 11:53:08 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.50.171 with SMTP id s40ls2314260qga.17.gmail; Tue, 04 Feb 2014 11:53:07 -0800 (PST) X-Received: by 10.221.34.211 with SMTP id st19mr34288330vcb.5.1391543587916; Tue, 04 Feb 2014 11:53:07 -0800 (PST) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id tj7si8628004vdc.85.2014.02.04.11.53.07 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:07 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.172 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.172; Received: by mail-ve0-f172.google.com with SMTP id c14so6482820vea.3 for ; Tue, 04 Feb 2014 11:53:07 -0800 (PST) X-Received: by 10.220.11.141 with SMTP id t13mr2293636vct.30.1391543587843; Tue, 04 Feb 2014 11:53:07 -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 u4csp270686vcz; Tue, 4 Feb 2014 11:53:07 -0800 (PST) X-Received: by 10.194.84.144 with SMTP id z16mr29965343wjy.23.1391543586912; Tue, 04 Feb 2014 11:53:06 -0800 (PST) Received: from mail-wg0-f51.google.com (mail-wg0-f51.google.com [74.125.82.51]) by mx.google.com with ESMTPS id o10si7487476wix.17.2014.02.04.11.53.06 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:53:06 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.51 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.51; Received: by mail-wg0-f51.google.com with SMTP id z12so13124542wgg.18 for ; Tue, 04 Feb 2014 11:53:06 -0800 (PST) X-Received: by 10.180.7.130 with SMTP id j2mr11785314wia.25.1391543586367; Tue, 04 Feb 2014 11:53:06 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.53.04 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:53:05 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 07/10] ARM: ux500: move AB8500 EXTCPENA from board file to DT Date: Tue, 4 Feb 2014 20:52:23 +0100 Message-Id: <1391543546-11158-7-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.172 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 configuration of the AB8500 EXTCPENA pin 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 | 17 +++++++++++++++-- arch/arm/mach-ux500/board-mop500-pins.c | 7 ------- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 6222b8e951c2..beb59f99eff8 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -36,7 +36,8 @@ <&pwm_default_mode>, <&adi1_default_mode>, <&usbuicc_default_mode>, - <&dmic_default_mode>; + <&dmic_default_mode>, + <&extcpena_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -340,7 +341,19 @@ }; }; }; - + extcpena { + extcpena_default_mode: extcpena_default { + default_mux { + ste,function = "extcpena"; + ste,pins = "extcpena_d_1"; + }; + default_cfg { + ste,pins = "GPIO34_R17"; + 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 851f530e6e16..bbd5bc56f7f0 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -57,13 +57,6 @@ static struct pinctrl_map __initdata ab8500_pinmap[] = { AB8500_PIN_STATE("GPIO3_U9", in_pd, "regulator.36", PINCTRL_STATE_SLEEP), /* - * pins 34 is muxed in EXTCPENA - * configured INPUT PULL DOWN - */ - AB8500_MUX_HOG("extcpena_d_1", "extcpena"), - AB8500_PIN_HOG("GPIO34_R17", in_pd), - - /* * pins 40 and 41 are muxed in MODCSLSDA * configured INPUT PULL DOWN */