From patchwork Tue Feb 4 19:52:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 24131 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f72.google.com (mail-pa0-f72.google.com [209.85.220.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4DD00202FA for ; Tue, 4 Feb 2014 19:52:58 +0000 (UTC) Received: by mail-pa0-f72.google.com with SMTP id rd3sf23816246pab.7 for ; Tue, 04 Feb 2014 11:52:57 -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=CGfSxxvTcSKdo4D7iSBSyqA5SX6G15gDOCpMC7XKnyY=; b=bmF2qQtMRNTsCS+cnusKhqIViHcLs8y5xVdYnT4UhfFAl6STd2uUXtnSLpUlY3giah KvuaPDJUrUhwpp6Dr6gV64NlnO1rVhhPr9pvGv0LdLt46p8GGulXPklMjJFKxYCPqAgE VypJGtfmfJTCDsyGiEd0vz+ln7tRUVZZRJGg3+AVNC30WilCq7Vrww6EZsP5h9V8aiqK 4W0LTYblyTa9nCh5TW5CCfcoEVEuC8AiyXI/NiDKmtk2FKlCH6k4qiAYG5zvljvFCPJN Z/Ewc9XxkfT5OOXlPzJ9Uw3MnGS5WJEANxxUH1CE8fL/bjFATGO1/lMTPl9wUWJdJIVG iiHA== X-Gm-Message-State: ALoCoQlw9wooWDlANPANAukHvFJy6NcQqUgxiRZfjLoBW3GcyNGagOlIlssxYjwQAJgPb898Nikg X-Received: by 10.66.221.137 with SMTP id qe9mr15257932pac.4.1391543577525; Tue, 04 Feb 2014 11:52:57 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.31.72 with SMTP id e66ls2431316qge.67.gmail; Tue, 04 Feb 2014 11:52:57 -0800 (PST) X-Received: by 10.220.103.141 with SMTP id k13mr7285198vco.25.1391543577379; Tue, 04 Feb 2014 11:52:57 -0800 (PST) Received: from mail-vb0-f48.google.com (mail-vb0-f48.google.com [209.85.212.48]) by mx.google.com with ESMTPS id a8si3598570vej.93.2014.02.04.11.52.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:52:57 -0800 (PST) Received-SPF: neutral (google.com: 209.85.212.48 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.48; Received: by mail-vb0-f48.google.com with SMTP id q16so6006894vbe.7 for ; Tue, 04 Feb 2014 11:52:57 -0800 (PST) X-Received: by 10.58.94.195 with SMTP id de3mr1297594veb.39.1391543577300; Tue, 04 Feb 2014 11:52:57 -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 u4csp270671vcz; Tue, 4 Feb 2014 11:52:56 -0800 (PST) X-Received: by 10.180.37.178 with SMTP id z18mr14132504wij.46.1391543576362; Tue, 04 Feb 2014 11:52:56 -0800 (PST) Received: from mail-we0-f172.google.com (mail-we0-f172.google.com [74.125.82.172]) by mx.google.com with ESMTPS id bv8si13174214wjb.146.2014.02.04.11.52.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 04 Feb 2014 11:52:56 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.172 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.172; Received: by mail-we0-f172.google.com with SMTP id p61so4740784wes.17 for ; Tue, 04 Feb 2014 11:52:56 -0800 (PST) X-Received: by 10.180.73.141 with SMTP id l13mr13901954wiv.60.1391543575923; Tue, 04 Feb 2014 11:52:55 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fb8sm38716314wic.3.2014.02.04.11.52.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Feb 2014 11:52:55 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Linus Walleij , Patrice Chotard , Lee Jones Subject: [PATCH 03/10] ARM: ux500: move AB8500 PWM out settings to device tree Date: Tue, 4 Feb 2014 20:52:19 +0100 Message-Id: <1391543546-11158-3-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.48 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 muxing and biasing of the AB8500 PWM output pins over to the device tree for affected platforms. Cc: Patrice Chotard Cc: Lee Jones Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-ab8500.dtsi | 18 +++++++++++++++++- arch/arm/mach-ux500/board-mop500-pins.c | 10 ---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi index 2b548e90878e..cdf2b3fd22dc 100644 --- a/arch/arm/boot/dts/ste-href-ab8500.dtsi +++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi @@ -32,7 +32,8 @@ <&gpio42_default_mode>, <&gpio26_default_mode>, <&gpio35_default_mode>, - <&ycbcr_default_mode>; + <&ycbcr_default_mode>, + <&pwm_default_mode>; /* * Pins 2, 4, 10, 11, 12, 13, 16, 24, 25, 36, 37, 38, 39 and 42 @@ -267,6 +268,21 @@ }; }; }; + /* This sets up the PWM pins 14 and 15 */ + pwm { + pwm_default_mode: pwm_default { + default_mux { + ste,function = "pwmout"; + ste,pins = "pwmout1_d_1", "pwmout2_d_1"; + }; + default_cfg { + ste,pins = "GPIO14_F14", + "GPIO15_B17"; + 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 d58513b08a6d..b75089faf956 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 14,15 are muxed in PWM1 and PWM2 - * configured in INPUT PULL DOWN - */ - AB8500_MUX_HOG("pwmout1_d_1", "pwmout"), - AB8500_PIN_HOG("GPIO14_F14", in_pd), - - AB8500_MUX_HOG("pwmout2_d_1", "pwmout"), - AB8500_PIN_HOG("GPIO15_B17", in_pd), - - /* * pins 17,18,19 and 20 are muxed in AUDIO interface 1 * configured in INPUT PULL DOWN */