From patchwork Mon Aug 12 14:21:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 11089951 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0A910746 for ; Mon, 12 Aug 2019 14:25:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id ECD7D2833E for ; Mon, 12 Aug 2019 14:25:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E090527F98; Mon, 12 Aug 2019 14:25:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5BF7B27F93 for ; Mon, 12 Aug 2019 14:25:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:In-Reply-To:References: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Mpfc52lIHINBaAsd/jOHq73WYxJsIMdoEU/OHco1Z70=; b=pbNN4M45wQCfqz ceIiZyKqwxcb1uzgjGgGEebLObI3FKbbWxSvFKiqBmGaREcUMURmQs5xlVXR9vMCFBWZTjScz0+mE lf1O5jLA5rXHJv56QosX2x3QzhprQaj1OMH3GFcAdexECcFfDag9GUecsg84hFgoyY84cYcvF1Ew6 RMKwuT3r+G9eV9oGeMdmTCeOcqxvNeLlEjAVEhF8jxoFvPJw7IQag6wAi6wAlkE5uLmHOLTGoj77g GbZThoK4fgQP5Sd1IcT1jap9Cbcs0BedBVj9wTctXKhuTXKy0hlW1RZqyZN44iMzI0SlwDtCw99sX pVwNylJe7PBu1clb4alg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hxBGX-0005wY-EI; Mon, 12 Aug 2019 14:25:41 +0000 Received: from mail-ve1eur01on0711.outbound.protection.outlook.com ([2a01:111:f400:fe1f::711] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hxBCf-0001e3-PV for linux-arm-kernel@lists.infradead.org; Mon, 12 Aug 2019 14:21:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YLCVMnyFe3nRb7+gJ7erbudHA7WFbRIlCfOLyFygKhezHiC27quUvXRKW/+TA6H+e/EhcEPXbP3Ni3/J6dEi4CNcf1JpRircfCnYBHdBKriENjTc9wLjOgKHCJPpDcJwhLon46IHo5catCnkI3V7O5GKMQ/CgHSOV2dA4I/R3d2ykZ3xy7bm3cde2zV3N6a3oil5DgSDE3AwTQYdfcv0GiN9YxbN+Ybgy8iGUYP44MmeV9NAF2Jrl77V+rquM0vJnBkf42/13IyH2qoGXFDelWw4zlc+wGyFzWTU8pjWp2JlEICXYRYZewd8OorJuSiAsmvqgD9fz1gngK5w57xgdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ati69vc/IEtW6C7qm9hgCH0JoiIhxhuPHUQVbzz099M=; b=bVt5NVrqFJB+IzhhZ/26z7+x4jNU/m3WoJpF5+vyElQkFCIK4Oz49oPTxUGsNdWrwHSqcR8HDFgzqC4PKvM/5lPImqty5uoM3zmM4BllwR5g5QiZnMLSJiI4ygrhmrklaWEw8a69ZnmYkVcL6FnrY7pMhupfDz5sWgh1m2+PJHzLRz6rb3/LWXJSVlvDGSO6KWe/CbYzHU0CGydfrPINnB183+4D53+JPARaIt2WkfyFYmBS7UJ5wsfniAG4lL/h+Q9YuIsyp+U5gN6Vid46XrBn6AdJHNYoasdGWsZxww5m3l3/MjrOrtcnhkUftthAPwrplJkwSDDmiIBlDxlCuQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=toradex.com; dmarc=pass action=none header.from=toradex.com; dkim=pass header.d=toradex.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=toradex.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ati69vc/IEtW6C7qm9hgCH0JoiIhxhuPHUQVbzz099M=; b=FCzhPMANAvqmrBv7jvuCieKTSNaK5wpn2iTApdf0r5X52zmnfY8Vj5TTsDCh79n+rb3etUl+oibbZIzRRxyaPOHsFT5E7mcC6loKGSBlwfavgoXFi9y/OfTpk4r5tVGxNTEU8yCRNcgj+hSO0ZoSZ65BJIH6tAzG1C0G5wn/nTM= Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com (52.134.17.157) by VI1PR0502MB2942.eurprd05.prod.outlook.com (10.175.26.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2157.21; Mon, 12 Aug 2019 14:21:33 +0000 Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::8405:5b51:b25d:39a2]) by VI1PR0502MB3965.eurprd05.prod.outlook.com ([fe80::8405:5b51:b25d:39a2%6]) with mapi id 15.20.2157.022; Mon, 12 Aug 2019 14:21:33 +0000 From: Philippe Schenker To: Marcel Ziswiler , Max Krummenacher , "stefan@agner.ch" , "devicetree@vger.kernel.org" , Rob Herring , Shawn Guo , Mark Rutland , =?iso-8859-2?q?Michal_Vok=E1=E8?= , Fabio Estevam Subject: [PATCH v4 12/21] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Thread-Topic: [PATCH v4 12/21] ARM: dts: imx6-apalis: Add touchscreens used on Toradex eval boards Thread-Index: AQHVURk9KiEmkulJgEy0xZA4FCn/Tw== Date: Mon, 12 Aug 2019 14:21:33 +0000 Message-ID: <20190812142105.1995-13-philippe.schenker@toradex.com> References: <20190812142105.1995-1-philippe.schenker@toradex.com> In-Reply-To: <20190812142105.1995-1-philippe.schenker@toradex.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: VI1P194CA0055.EURP194.PROD.OUTLOOK.COM (2603:10a6:803:3c::44) To VI1PR0502MB3965.eurprd05.prod.outlook.com (2603:10a6:803:23::29) authentication-results: spf=none (sender IP is ) smtp.mailfrom=philippe.schenker@toradex.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.22.0 x-originating-ip: [46.140.72.82] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 743f2c4f-ee74-4799-49b9-08d71f306031 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:VI1PR0502MB2942; x-ms-traffictypediagnostic: VI1PR0502MB2942: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:741; x-forefront-prvs: 012792EC17 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(376002)(136003)(39850400004)(346002)(366004)(396003)(199004)(189003)(5660300002)(54906003)(110136005)(316002)(478600001)(6486002)(86362001)(2201001)(66066001)(53936002)(6116002)(1076003)(3846002)(2906002)(4326008)(25786009)(66446008)(64756008)(66556008)(66946007)(66476007)(6436002)(8676002)(11346002)(476003)(2616005)(446003)(256004)(81166006)(81156014)(2501003)(44832011)(6512007)(14444005)(486006)(50226002)(71200400001)(71190400001)(7416002)(8936002)(36756003)(52116002)(7736002)(305945005)(99286004)(102836004)(386003)(14454004)(76176011)(186003)(6506007)(26005); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0502MB2942; H:VI1PR0502MB3965.eurprd05.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: toradex.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: VyXoJXteNxvCL8P/kMSsN+hgQhSjCCUr17zrn6pwpaG2e/Zc4iKW+eMNz7rxbjxVgMeCoRPLVNeIeg9673ll4WoEFzq2ZPGN0y/JFJorqTtCc9zGrpTtDtz5SOfYl4rAnbhLVJXuz3g1H6RrJZh2+x9Tx4YcIlfilF1xBcpMs1fZMMYdqzTbonjfEIRfQEhwOVNCInRL7bViNLRvKBcyiPhNO58+wvAorx93I43yVDC4Rj4/rCRuM2yRPI58Lk6y8mSf5H3+3azDzeGZl3UusJ+NJ6BdWjPCpH84UOAZt2NCvNul/6faUAa+ELBxipv4gpQfm3K3yP5MdV/vr6Aqwt6ZDDXxGj/CRYFkC79eqR+oONqZA85/SKw5KpRgRS+Aigx1bxUsamXP/3e+O+P6vulsOkH2MEmt6z03eG+KCRg= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 743f2c4f-ee74-4799-49b9-08d71f306031 X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Aug 2019 14:21:33.1127 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: d9995866-0d9b-4251-8315-093f062abab4 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: stiPfjP7xqrnTJmCUEqOsZgK4VCzwmvk/q9JyxAQYh2EJi88LAoWPOwur4oZbNT9J19ULL65DyT0NhNwGq/UI/RYP1JdY2ojV2WxdE8GbYI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB2942 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190812_072142_455119_4E65D517 X-CRM114-Status: GOOD ( 12.06 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Sascha Hauer , "linux-kernel@vger.kernel.org" , Philippe Schenker , NXP Linux Team , Pengutronix Kernel Team , "linux-arm-kernel@lists.infradead.org" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP This commit adds the touchscreens from Toradex so one can enable it. Signed-off-by: Philippe Schenker Acked-by: Marcel Ziswiler Reviewed-by: Oleksandr Suvorov --- Changes in v4: - Add Marcel Ziswiler's Ack Changes in v3: - Fix commit title to "...imx6-apalis:..." Changes in v2: - Deleted touchrevolution downstream stuff - Use generic node name - Put a better comment in there arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 31 +++++++++++++++++++ arch/arm/boot/dts/imx6q-apalis-eval.dts | 13 ++++++++ arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts | 13 ++++++++ arch/arm/boot/dts/imx6q-apalis-ixora.dts | 13 ++++++++ 4 files changed, 70 insertions(+) diff --git a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts index 9a5d6c94cca4..763fb5e90bd3 100644 --- a/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts +++ b/arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts @@ -168,6 +168,21 @@ &i2c3 { status = "okay"; + /* + * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, + * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms + */ + touchscreen@4a { + compatible = "atmel,maxtouch"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_pcap_1>; + reg = <0x4a>; + interrupt-parent = <&gpio1>; + interrupts = <9 IRQ_TYPE_EDGE_FALLING>; /* SODIMM 28 */ + reset-gpios = <&gpio2 10 GPIO_ACTIVE_HIGH>; /* SODIMM 30 */ + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; @@ -175,6 +190,22 @@ }; }; +&iomuxc { + pinctrl_pcap_1: pcap-1 { + fsl,pins = < + MX6QDL_PAD_GPIO_9__GPIO1_IO09 0x1b0b0 /* SODIMM 28 */ + MX6QDL_PAD_SD4_DAT2__GPIO2_IO10 0x1b0b0 /* SODIMM 30 */ + >; + }; + + pinctrl_mxt_ts: mxt-ts { + fsl,pins = < + MX6QDL_PAD_EIM_CS1__GPIO2_IO24 0x130b0 /* SODIMM 107 */ + MX6QDL_PAD_SD2_DAT1__GPIO1_IO14 0x130b0 /* SODIMM 106 */ + >; + }; +}; + &ipu1_di0_disp0 { remote-endpoint = <&lcd_display_in>; }; diff --git a/arch/arm/boot/dts/imx6q-apalis-eval.dts b/arch/arm/boot/dts/imx6q-apalis-eval.dts index 0edd3043d9c1..4665e15b196d 100644 --- a/arch/arm/boot/dts/imx6q-apalis-eval.dts +++ b/arch/arm/boot/dts/imx6q-apalis-eval.dts @@ -167,6 +167,19 @@ &i2c1 { status = "okay"; + /* + * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, + * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms + */ + touchscreen@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + pcie-switch@58 { compatible = "plx,pex8605"; reg = <0x58>; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts index b94bb687be6b..a3fa04a97d81 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora-v1.1.dts @@ -172,6 +172,19 @@ &i2c1 { status = "okay"; + /* + * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, + * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms + */ + touchscreen@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + /* M41T0M6 real time clock on carrier board */ rtc_i2c: rtc@68 { compatible = "st,m41t0"; diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 302fd6adc8a7..5ba49d0f4880 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -171,6 +171,19 @@ &i2c1 { status = "okay"; + /* + * Touchscreen is using SODIMM 28/30, also used for PWM, PWM, + * aka pwm2, pwm3. so if you enable touchscreen, disable the pwms + */ + touchscreen@4a { + compatible = "atmel,maxtouch"; + reg = <0x4a>; + interrupt-parent = <&gpio6>; + interrupts = <10 IRQ_TYPE_EDGE_FALLING>; + reset-gpios = <&gpio6 9 GPIO_ACTIVE_HIGH>; /* SODIMM 13 */ + status = "disabled"; + }; + eeprom@50 { compatible = "atmel,24c02"; reg = <0x50>;