From patchwork Tue Nov 3 14:27:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 55940 Delivered-To: patch@linaro.org Received: by 10.112.61.134 with SMTP id p6csp1866156lbr; Tue, 3 Nov 2015 06:28:46 -0800 (PST) X-Received: by 10.50.66.141 with SMTP id f13mr16162681igt.51.1446560926158; Tue, 03 Nov 2015 06:28:46 -0800 (PST) Return-Path: Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id g7si20859641iog.165.2015.11.03.06.28.45 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 06:28:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) client-ip=2001:1868:205::9; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org designates 2001:1868:205::9 as permitted sender) smtp.mailfrom=linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org; dkim=neutral (body hash did not verify) header.i=@linaro_org.20150623.gappssmtp.com Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtcYf-0006pu-JW; Tue, 03 Nov 2015 14:27:33 +0000 Received: from mail-lf0-x22b.google.com ([2a00:1450:4010:c07::22b]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZtcYb-0006kB-DV for linux-arm-kernel@lists.infradead.org; Tue, 03 Nov 2015 14:27:30 +0000 Received: by lfbf136 with SMTP id f136so19726355lfb.0 for ; Tue, 03 Nov 2015 06:27:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro_org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=Zbz67KwozOmlYq3aR2O8MYe4tIjSAh56YQb8p540Tc8=; b=M/wAGOaaFfvWW294/7cGegrwoeu0xcMkz6Js83XEK5V5mXHEoP6fcZIR3PvNGXm6w6 UqSF/j63D37HnPRcNzrx+QSwz/b9Hd64bBv8RlVc1iYsHUj9N3QYmn4SPzVWcaNK7kmp TE6wCUNH9+7fSWfs3ijbAeiYR54GH4omP9gZOJyVe4qjXZeiTN/uLBq+wCQD+UZyWcpt 3k8x5Q7KpkOJX8VDMhMlaurOh4r897y1KWsQvBGIPm1E+LJqhp/UEZjiJB963B2C1BdZ A90Y3pg12io6OOrCrKNNr1S/s5n01uLlsHpDPV+AEXmbujyNU9tSkDTyJnQfda+/SYrW 2GoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=Zbz67KwozOmlYq3aR2O8MYe4tIjSAh56YQb8p540Tc8=; b=IU2Uiv8P4fSfMWQpMT/FmullcYN07JZvhh084+4SEXmdzbp+HcFEo9SrIrTPt6jkXY 9+ork8T6SKoWXk03FxZQdow/PkesltnFVBrVn32UuV2EVXpgBi0TZxn1SD68Nld+ebM8 HrpWgYj+OdDg+n1mIO7MAibBA4fuj3p0klGptfyrQj/6mN6Qokqd4deyN2rMhUf69Zt5 0KQ+7dHxaENtge0fzPnWbYK7i+TfuwrECCVSRveF375YIXMTJmrusulLmrNtgTkEeoQ9 bQPfGcXx3CL5Fg9uHikRAP6+83qun7QsJye5LoHAp0MX5w3EqmFkpZtQFajGKlZvG81o fXEQ== X-Gm-Message-State: ALoCoQmp5veAs80E8phL1hlFDQsNXqGSmnHSsJvUdWSFfRLfKugjLkipUd2MGDqYn8LWQXTbi2kO X-Received: by 10.112.130.138 with SMTP id oe10mr7882264lbb.54.1446560826897; Tue, 03 Nov 2015 06:27:06 -0800 (PST) Received: from localhost.localdomain ([85.235.10.227]) by smtp.gmail.com with ESMTPSA id pm6sm4831402lbc.1.2015.11.03.06.27.05 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 03 Nov 2015 06:27:06 -0800 (PST) From: Linus Walleij To: linux-arm-kernel@lists.infradead.org, Ulf Hansson Subject: [PATCH] ARM: ux500: push down Rohm TS to STUIB Date: Tue, 3 Nov 2015 15:27:02 +0100 Message-Id: <1446560822-19442-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 2.4.3 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20151103_062729_644958_F7ABF900 X-CRM114-Status: GOOD ( 14.18 ) X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [2a00:1450:4010:c07:0:0:0:22b listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Linus Walleij MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org The Rohm touchscreen reset and IRQ lines were registered and configured at the HREF board level of the design, but it is an integral part of the UIB (User Interface Board). Fix this by pushing down the pin control node to the u8500 UIB file. Signed-off-by: Linus Walleij --- arch/arm/boot/dts/ste-href-stuib.dtsi | 23 +++++++++++++++++++++++ arch/arm/boot/dts/ste-hrefv60plus.dtsi | 18 ------------------ 2 files changed, 23 insertions(+), 18 deletions(-) -- 2.4.3 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel diff --git a/arch/arm/boot/dts/ste-href-stuib.dtsi b/arch/arm/boot/dts/ste-href-stuib.dtsi index 78b75256c638..c3987ad06d79 100644 --- a/arch/arm/boot/dts/ste-href-stuib.dtsi +++ b/arch/arm/boot/dts/ste-href-stuib.dtsi @@ -114,6 +114,8 @@ rohm,touch-max-x = <384>; rohm,touch-max-y = <704>; rohm,flip-y; + pinctrl-names = "default"; + pinctrl-0 = <&touch_rohm_mode>; }; bu21013_tp@5d { @@ -124,6 +126,8 @@ rohm,touch-max-x = <384>; rohm,touch-max-y = <704>; rohm,flip-y; + pinctrl-names = "default"; + pinctrl-0 = <&touch_rohm_mode>; }; }; @@ -166,6 +170,25 @@ }; }; }; + touch { + touch_rohm_mode: touch_rohm { + /* + * ROHM touch screen uses GPIO 143 for + * RST1, GPIO 146 for RST2 and + * GPIO 67 for interrupts. Pull-up + * the IRQ line and drive both + * reset signals low. + */ + stuib_cfg1 { + pins = "GPIO143_D12", "GPIO146_D13"; + ste,config = <&gpio_out_lo>; + }; + stuib_cfg2 { + pins = "GPIO67_G2"; + ste,config = <&gpio_in_pu>; + }; + }; + }; }; }; }; diff --git a/arch/arm/boot/dts/ste-hrefv60plus.dtsi b/arch/arm/boot/dts/ste-hrefv60plus.dtsi index 810cda743b6d..3d1ea1ecbd15 100644 --- a/arch/arm/boot/dts/ste-hrefv60plus.dtsi +++ b/arch/arm/boot/dts/ste-hrefv60plus.dtsi @@ -43,7 +43,6 @@ <&vaudio_hf_hrefv60_mode>, <&gbf_hrefv60_mode>, <&hdtv_hrefv60_mode>, - <&touch_hrefv60_mode>, <&gpios_hrefv60_mode>; sdi0 { @@ -190,23 +189,6 @@ }; }; }; - touch { - touch_hrefv60_mode: touch_hrefv60 { - /* - * Touch screen uses GPIO 143 for RST1, GPIO 146 for RST2 and - * GPIO 67 for interrupts. Pull-up the IRQ line and drive both - * reset signals low. - */ - hrefv60_cfg1 { - pins = "GPIO143_D12", "GPIO146_D13"; - ste,config = <&gpio_out_lo>; - }; - hrefv60_cfg2 { - pins = "GPIO67_G2"; - ste,config = <&gpio_in_pu>; - }; - }; - }; mcde { lcd_hrefv60_mode: lcd_hrefv60 { /*