Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932633AbbDJVhw (ORCPT ); Fri, 10 Apr 2015 17:37:52 -0400 Received: from mout.perfora.net ([74.208.4.197]:54079 "EHLO mout.perfora.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753814AbbDJVhp (ORCPT ); Fri, 10 Apr 2015 17:37:45 -0400 From: Marcel Ziswiler To: linux-tegra@vger.kernel.org Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Mikko Perttunen , Mark Brown , "Rafael J. Wysocki" , Matt Porter , Paul Walmsley , Eduardo Valentin , Takashi Iwai , Dylan Reid , Stephen Boyd , Mike Turquette , Prashant Gaikwad , Peter De Schrijver , Russell King , Alexandre Courbot , Thierry Reding , Stephen Warren , Kumar Gala , Ian Campbell , Mark Rutland , Pawel Moll , Rob Herring , Marcel Ziswiler Subject: [PATCH 8/9] ARM: tegra: colibri t30: activate stmpe811 touch controller Date: Fri, 10 Apr 2015 23:36:03 +0200 Message-Id: X-Mailer: git-send-email 1.9.3 In-Reply-To: References: X-Provags-ID: V03:K0:Zo7wgwXsN4hyIuxgnD714qDmjry65jVtDG0EJFIuXUHdvNIQoHD cQPxnw+xzhzVRuARWWvNPaxvywDw4scr5/X+IrO+xh+y8xumKDjY/wu6C6SfJp0WzCz/W1Y jZtB4VIzOVG3BwUVM5t7Oblbkbzur4743dUagQgyustGmqiD9fUzf83gUwlVqZ908HcXlOv vagfz5Um5uloZgjs0rOnA== X-UI-Out-Filterresults: notjunk:1; Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3218 Lines: 117 From: Marcel Ziswiler Activate STMPE811 touch controller as found on Colibri T30 modules. While at it change order of HDMI sub nodes as well to be more in line with Apalis T30. While at it also update comment about supported module hardware versions. Signed-off-by: Marcel Ziswiler coli --- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 4 +-- arch/arm/boot/dts/tegra30-colibri.dtsi | 44 +++++++++++++++++++++++++-- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts index 4d3ddc5..d42c400 100644 --- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts @@ -55,7 +55,7 @@ /* M41T0M6 real time clock on carrier board */ rtc@68 { - compatible = "stm,m41t00"; + compatible = "st,m41t00"; reg = <0x68>; }; }; @@ -84,7 +84,7 @@ }; }; - sdhci@78000200 { + sdmmc: sdhci@78000200 { status = "okay"; bus-width = <4>; cd-gpios = <&gpio TEGRA_GPIO(C, 7) GPIO_ACTIVE_LOW>; diff --git a/arch/arm/boot/dts/tegra30-colibri.dtsi b/arch/arm/boot/dts/tegra30-colibri.dtsi index c4ed1be..5f7f4a0 100644 --- a/arch/arm/boot/dts/tegra30-colibri.dtsi +++ b/arch/arm/boot/dts/tegra30-colibri.dtsi @@ -3,7 +3,7 @@ /* * Toradex Colibri T30 Device Tree - * Compatible for Revisions 1.1B/1.1C/1.1D + * Compatible for Revisions V1.1B, V1.1C, V1.1D, V1.1E; IT: V1.1A */ / { model = "Toradex Colibri T30"; @@ -18,9 +18,9 @@ vdd-supply = <&sys_3v3_reg>; pll-supply = <&vio_reg>; + nvidia,ddc-i2c-bus = <&hdmiddc>; nvidia,hpd-gpio = <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>; - nvidia,ddc-i2c-bus = <&hdmiddc>; }; }; @@ -295,6 +295,46 @@ }; }; + /* STMPE811 touch screen controller */ + stmpe811@41 { + compatible = "st,stmpe811"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x41>; + interrupts = ; + interrupt-parent = <&gpio>; + interrupt-controller; + id = <0>; + blocks = <0x5>; + irq-trigger = <0x1>; + + stmpe_touchscreen { + compatible = "st,stmpe-ts"; + reg = <0>; + /* 3.25 MHz ADC clock speed */ + st,adc-freq = <1>; + /* 8 sample average control */ + st,ave-ctrl = <3>; + /* 7 length fractional part in z */ + st,fraction-z = <7>; + /* + * 50 mA typical 80 mA max touchscreen drivers + * current limit value + */ + st,i-drive = <1>; + /* 12-bit ADC */ + st,mod-12b = <1>; + /* internal ADC reference */ + st,ref-sel = <0>; + /* ADC converstion time: 80 clocks */ + st,sample-time = <4>; + /* 1 ms panel driver settling time */ + st,settling = <3>; + /* 5 ms touch detect interrupt delay */ + st,touch-det-delay = <5>; + }; + }; + /* * LM95245 temperature sensor * Note: OVERT_N directly connected to PMIC PWRDN -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/