From patchwork Sun Nov 17 11:03:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 21561 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 246DC20299 for ; Sun, 17 Nov 2013 11:04:41 +0000 (UTC) Received: by mail-pa0-f69.google.com with SMTP id hz1sf4830046pad.0 for ; Sun, 17 Nov 2013 03:04:40 -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=ZlV9jHkz1oZPktmMYurqKr5OxdgPAriYepv0ItojZjg=; b=NWaMphn73/ksnS5WgiLRSg6SpLlwIgm9+BLV21AA/I2PhK7jaBSkz9OGgBtAchd56D pMcVUPqrgFjj4hsnpTx7mqinMJ6yCGdqbiPI83/7DnU46bhz063gz9SCkXjL8+InlB9G NHYrjjGVTHXxV/flmchIErH4NrkJX0/lGtcwscrRM+Xxw0dbQ5oCAjmcPcxYjlGicnrz 9eMEcQxIPwQefPkEIjxcrapf5Uq9KjM8JrH1LpwXjjIeD57t6FKHSbBo//a9SukRbahI /vgMBKLKIZx/7R+JqMgsN4VEPJXjQZAsmR2q4RsrXP2dI9WNzUnD4g4FURUyu/LsP8Vt cJFA== X-Gm-Message-State: ALoCoQm/TKJFsl6UpWVaJ4EDcLD7yfh9OvhHq92DDk6KoDn1t9B4cYbLIN67GXnF3E3GL2fuaCwz X-Received: by 10.66.252.170 with SMTP id zt10mr6338259pac.34.1384686280182; Sun, 17 Nov 2013 03:04:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.132.132 with SMTP id ou4ls2294613qeb.20.gmail; Sun, 17 Nov 2013 03:04:40 -0800 (PST) X-Received: by 10.52.65.136 with SMTP id x8mr8327617vds.23.1384686280049; Sun, 17 Nov 2013 03:04:40 -0800 (PST) Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mx.google.com with ESMTPS id y5si5571583vck.77.2013.11.17.03.04.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:04:40 -0800 (PST) Received-SPF: neutral (google.com: 209.85.128.176 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.176; Received: by mail-ve0-f176.google.com with SMTP id c14so4144465vea.7 for ; Sun, 17 Nov 2013 03:04:40 -0800 (PST) X-Received: by 10.52.168.106 with SMTP id zv10mr5768164vdb.21.1384686279954; Sun, 17 Nov 2013 03:04:39 -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 u4csp140365vcz; Sun, 17 Nov 2013 03:04:39 -0800 (PST) X-Received: by 10.180.12.12 with SMTP id u12mr12925321wib.48.1384686279071; Sun, 17 Nov 2013 03:04:39 -0800 (PST) Received: from mail-we0-f171.google.com (mail-we0-f171.google.com [74.125.82.171]) by mx.google.com with ESMTPS id k7si4608470wjz.160.2013.11.17.03.04.38 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sun, 17 Nov 2013 03:04:39 -0800 (PST) Received-SPF: neutral (google.com: 74.125.82.171 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.82.171; Received: by mail-we0-f171.google.com with SMTP id t61so5204451wes.30 for ; Sun, 17 Nov 2013 03:04:38 -0800 (PST) X-Received: by 10.180.187.175 with SMTP id ft15mr13153404wic.20.1384686278643; Sun, 17 Nov 2013 03:04:38 -0800 (PST) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id fu1sm13156973wib.8.2013.11.17.03.04.37 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 17 Nov 2013 03:04:38 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Lee Jones Cc: devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 05/21] ARM: ux500: move GPIO217/218 config to device tree Date: Sun, 17 Nov 2013 12:03:54 +0100 Message-Id: <1384686250-10542-6-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1384686250-10542-1-git-send-email-linus.walleij@linaro.org> References: <1384686250-10542-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.176 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 input-pulled-up setting for GPIO217 as used on the HREFs prior to v60 from the boardfile to the device tree. GPIO218 is only used with the TVK UIB so move it to that .dtsi file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-tvk1281618.dtsi | 13 +++++++++++++ arch/arm/boot/dts/ste-hrefprev60.dtsi | 10 ++++++++++ arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi | 5 +++++ arch/arm/mach-ux500/board-mop500-pins.c | 7 ------- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi index 61b180ea92ca..3f31f9206fb3 100644 --- a/arch/arm/boot/dts/ste-href-tvk1281618.dtsi +++ b/arch/arm/boot/dts/ste-href-tvk1281618.dtsi @@ -22,6 +22,8 @@ reg = <0x44>; interrupt-parent = <&gpio6>; interrupts = <26 IRQ_TYPE_EDGE_RISING>; + pinctrl-names = "default"; + pinctrl-0 = <&tc35893_tvk_mode>; interrupt-controller; #interrupt-cells = <1>; @@ -64,5 +66,16 @@ }; }; }; + pinctrl { + /* Pull up this GPIO pin */ + tc35893 { + tc35893_tvk_mode: tc35893_tvk { + tvk_cfg { + ste,pins = "GPIO218_AH11"; + ste,config = <&gpio_in_pu>; + }; + }; + }; + }; }; }; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index cfd7ef306d49..6fc94ea65ab9 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -33,6 +33,8 @@ reg = <0x42>; interrupt-parent = <&gpio6>; interrupts = <25 IRQ_TYPE_EDGE_RISING>; + pinctrl-names = "default"; + pinctrl-0 = <&tc35892_hrefprev60_mode>; interrupt-controller; #interrupt-cells = <1>; @@ -71,6 +73,14 @@ }; }; + tc35892 { + tc35892_hrefprev60_mode: tc35892_hrefprev60 { + hrefprev60_cfg { + ste,pins = "GPIO217_AH12"; + ste,config = <&gpio_in_pu>; + }; + }; + }; }; }; }; diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi index f213222cf220..9aea983e78b5 100644 --- a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi +++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi @@ -31,6 +31,11 @@ ste,output = ; }; + gpio_in_pu: gpio_input_pull_up { + ste,gpio = ; + ste,input = ; + }; + gpio_out_lo: gpio_output_low { ste,gpio = ; ste,output = ; diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index f7034cbdc630..c032392294a0 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -340,11 +340,6 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { DB8500_MUX_HOG("lcdvsi0_a_1", "lcd"), DB8500_PIN_HOG("GPIO68_E1", in_pu), DB8500_PIN_HOG("GPIO84_C2", gpio_in_pu), - /* - * STMPE1601/tc35893 keypad IRQ GPIO 218 - * TODO: set for snowball and HREF really?? - */ - DB8500_PIN_HOG("GPIO218_AH11", gpio_in_pu), /* Mux in LCD data lines 8 thru 11 and LCDA CLK for MCDE TVOUT */ DB8500_MUX("lcd_d8_d11_a_1", "lcd", "mcde-tvout"), DB8500_MUX("lcdaclk_b_1", "lcda", "mcde-tvout"), @@ -625,8 +620,6 @@ static struct pinctrl_map __initdata mop500_pinmap[] = { DB8500_MUX_HOG("ipgpio1_c_1", "ipgpio"), DB8500_PIN_HOG("GPIO6_AF6", in_pu), DB8500_PIN_HOG("GPIO7_AG5", in_pu), - /* TC35892 IRQ, pull up the line, let the driver mux in the pin */ - DB8500_PIN_HOG("GPIO217_AH12", gpio_in_pu), /* * Runtime stuff: make it possible to mux in the SKE keypad * and bias the pins