From patchwork Thu Oct 3 11:31:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20780 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f197.google.com (mail-ve0-f197.google.com [209.85.128.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AC194266EC for ; Thu, 3 Oct 2013 11:31:37 +0000 (UTC) Received: by mail-ve0-f197.google.com with SMTP id jy13sf5113648veb.0 for ; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=rT2li1pHKz2QbYNSHiqw7UatCrKHfh/Ko0y6uFXCh20=; b=jJY1YWoeouWv7rXjtFL8IihGEF9EabltMM5LBtjFiy6kyfvvUWR+x9WjZz1ZaBybGn aLwdNTjEGDrqaUpPxK0sHtFKYbN5MT/YdbFpzcLqgysdaqVvXW8B9HJetnDEovYc0fSo 1o8pRly8Wrj94qZshmQIuP+7U02uK1bjhQpE/oPx9zwMp4MHwXzgqZhJMkgWhUxH/sng uS+mMAoeJ47tBl3nn2CYDjSNb6nYHiAx0wEiGUUFdKtySyM0iwUmIQUKFbAoYios+z0v 8gA2XOSgU2kIxDUw+dCkrXlKo66jJIPTbUGCkVgkFcc7ZS+n5rNZMWQ3okIa98jyEBca ckXA== X-Received: by 10.236.145.34 with SMTP id o22mr6751069yhj.22.1380799897526; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.1.65 with SMTP id 1ls872910qek.72.gmail; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) X-Received: by 10.220.11.7 with SMTP id r7mr6989478vcr.12.1380799897408; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) Received: from mail-vb0-f52.google.com (mail-vb0-f52.google.com [209.85.212.52]) by mx.google.com with ESMTPS id oh2si1617006vcb.10.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:31:37 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.52 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.52; Received: by mail-vb0-f52.google.com with SMTP id f12so1411453vbg.39 for ; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) X-Gm-Message-State: ALoCoQkl2brImEkt5M441LvBevadCUiX+w/17Tli+lo+8ylRfi71zY/L7Z5WpcwvTkDXEzcHZ76B X-Received: by 10.220.181.136 with SMTP id by8mr7077497vcb.11.1380799897302; Thu, 03 Oct 2013 04:31:37 -0700 (PDT) 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 u4csp170467vcz; Thu, 3 Oct 2013 04:31:36 -0700 (PDT) X-Received: by 10.14.180.73 with SMTP id i49mr2807270eem.55.1380799896099; Thu, 03 Oct 2013 04:31:36 -0700 (PDT) Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by mx.google.com with ESMTPS id c49si5463202eeg.357.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:31:36 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.41 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=74.125.83.41; Received: by mail-ee0-f41.google.com with SMTP id d17so1027535eek.0 for ; Thu, 03 Oct 2013 04:31:35 -0700 (PDT) X-Received: by 10.14.181.194 with SMTP id l42mr2350861eem.63.1380799895545; Thu, 03 Oct 2013 04:31:35 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id z12sm14710270eev.6.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 03 Oct 2013 04:31:34 -0700 (PDT) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org Cc: Lee Jones , devicetree@vger.kernel.org, Linus Walleij Subject: [PATCH 10/10] ARM: ux500: move BU21013 touchpad GPIOs into top-level DTS Date: Thu, 3 Oct 2013 13:31:31 +0200 Message-Id: <1380799891-26087-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 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.52 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: , The BU21013 touchscreen GPIOs have been pretty confused, correct them per board, and move the GPIO assignments up to the top level DTS file so we can control it from there, and avoid defining the GPIO assignments for non-ST UIB equipped boards. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-stuib.dtsi | 2 -- arch/arm/boot/dts/ste-hrefprev60-stuib.dts | 6 ++++++ arch/arm/boot/dts/ste-hrefprev60.dtsi | 6 ------ arch/arm/boot/dts/ste-hrefv60plus-stuib.dts | 10 ++++++++-- arch/arm/boot/dts/ste-hrefv60plus.dtsi | 6 ------ 5 files changed, 14 insertions(+), 16 deletions(-) diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi index 524e332..76704ec 100644 --- a/arch/arm/boot/dts/ste-href-stuib.dtsi +++ b/arch/arm/boot/dts/ste-href-stuib.dtsi @@ -57,7 +57,6 @@ bu21013_tp@5c { compatible = "rohm,bu21013_tp"; reg = <0x5c>; - touch-gpio = <&gpio2 20 0x4>; avdd-supply = <&ab8500_ldo_aux1_reg>; rohm,touch-max-x = <384>; @@ -68,7 +67,6 @@ bu21013_tp@5d { compatible = "rohm,bu21013_tp"; reg = <0x5d>; - touch-gpio = <&gpio2 20 0x4>; avdd-supply = <&ab8500_ldo_aux1_reg>; rohm,touch-max-x = <384>; diff --git a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts index 3e1b974..2b1cb5b 100644 --- a/arch/arm/boot/dts/ste-hrefprev60-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefprev60-stuib.dts @@ -20,7 +20,13 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { + /* Only one of these will be used */ bu21013_tp@5c { + touch-gpio = <&gpio2 12 0x4>; + reset-gpio = <&tc3589x_gpio 13 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 12 0x4>; reset-gpio = <&tc3589x_gpio 13 0x4>; }; }; diff --git a/arch/arm/boot/dts/ste-hrefprev60.dtsi b/arch/arm/boot/dts/ste-hrefprev60.dtsi index de6b0a0..b2cd7bc 100644 --- a/arch/arm/boot/dts/ste-hrefprev60.dtsi +++ b/arch/arm/boot/dts/ste-hrefprev60.dtsi @@ -49,12 +49,6 @@ }; }; - i2c@80110000 { - bu21013_tp@5c { - reset-gpio = <&tc3589x_gpio 13 0x4>; - }; - }; - vmmci: regulator-gpio { gpios = <&tc3589x_gpio 18 0x4>; enable-gpio = <&tc3589x_gpio 17 0x4>; diff --git a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts index 4da49e7..8c6a2de 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts +++ b/arch/arm/boot/dts/ste-hrefv60plus-stuib.dts @@ -22,8 +22,14 @@ soc { /* Reset line for the BU21013 touchscreen */ i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; + /* Only one of these will be used */ + bu21013_tp@5c { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; + }; + bu21013_tp@5d { + touch-gpio = <&gpio2 20 0x4>; + reset-gpio = <&gpio4 17 0x4>; }; }; }; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index d0f1165..aed511b 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -23,12 +23,6 @@ }; soc { - i2c@80110000 { - bu21013_tp@0x5c { - reset-gpio = <&gpio4 15 0x4>; - }; - }; - // External Micro SD slot sdi0_per1@80126000 { arm,primecell-periphid = <0x10480180>;