From patchwork Wed Jul 31 12:38:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philippe Schenker X-Patchwork-Id: 11067719 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 514ED174A for ; Wed, 31 Jul 2019 12:41:26 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 370021FF13 for ; Wed, 31 Jul 2019 12:41:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 32CBB28671; Wed, 31 Jul 2019 12:41:26 +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 8644F1FF13 for ; Wed, 31 Jul 2019 12:41:25 +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=5bHpEi9BnltKv+5eECcVRANV49+u9QWTYvBF/Z7pGvE=; b=RBj91mKbQ7NrHS fCTGyZZP6/dFDulIyI5OWaEX1n9KYleJr/JjZQZ3837rqanLJPk0IrM7plQqFQqXDvYZu+H6Img6F z5TKuC3nNVHa8imw7pcsKHlDircMQSkxRpfGh3+DCBh3kkxvCdT/lK0RkHgoTjMr16fRjRRQNJ7yG 4Lj+zAOzgFUjYgd2NzkN6YVrZnPbP9AdKj0gLR+qfs96NTaBwTAnHwqNiqUDWPU47OpfQ47D6uqY0 SVO+kF0AJUCruv8VPNciZ1wQXPleiY4dFHmUZFlQHrVK/kLWeiliXJB8khsd/jU3P+2u7ZX1K3k8W jwL6yB8Tpx+Tv1z2IEzw==; 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 1hsnv2-0002Dk-Vz; Wed, 31 Jul 2019 12:41:25 +0000 Received: from mail-ve1eur03on0724.outbound.protection.outlook.com ([2a01:111:f400:fe09::724] helo=EUR03-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hsnsF-0006Le-Sy for linux-arm-kernel@lists.infradead.org; Wed, 31 Jul 2019 12:38:33 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ra+51s60x9+gTvh78wk8ZCrRm+HAOHQDOo8FA2UhBTMazi+OTeevJxyXSqHAhW1DFPmQuI0ijAHALT3Nppq9N3IfgTPt1+SMkCp7LkWggUYuqd1auIPg1BAHude9yn2Bxm+WvMU2e+E/fo6AwvCgqApUd2NlVZ6CMv/HfJUWxsAXsJYptwM+iZMC50EBjShnNqtvAJ86r4rMIMXzEdaU5qJQamQDQZfxwBC8zai8CWB6z7xJimxf3Yf7J6f1ymL4TDcL02B2DdAYjApdbp3B6ChNx4agQy6vX5d7DcZV04cpl+IN1tkRh89nncBIo12bdVqWyu709EYCde94RHsOEQ== 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=+bwSD+wY4a265VWU//ee3Zp4L/nCN6MCP5iXPU2twpA=; b=g64u9JPWRiueNBlJ5UEJjz/41eNBo8S/jO+azGMR3EU/g5TmgZd9H/0pBhKovMW9sj5bUwjBO5R1lAjbEszLvQEkYDweRop8CBZPCeWXTtWntbfxwKJDqZ1P2+wH4OCYpyEwefESyORR8OxlyMtuywcodrscsl85BgjYcc/OIV20Q4SYAKRKXdO4ncY85h3KKdTtjOOaUrU1sQ5KEQ2Ll7ZbFJWtwlzHtNlBC9M/90jpwUuuTtOVmsN17chEjgHKLsf3Ltj2Z3CC22LCbdqm83I4pEQtU8Sxiibf/oxSS8QFWB/i+fMdziQ0l5yeBPvz/BzmL/TLp70JVgJ0R+8Acg== 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=+bwSD+wY4a265VWU//ee3Zp4L/nCN6MCP5iXPU2twpA=; b=uDEwUuguKBapAZflhycIy8SqRKS7jZnu6NUReHfjS4KWKOdw8j3pSKSPqnT3W/iSF64Lp7QcHydB4LRZkurIveV/LSUOkaYAq1xulj+NWoUbNVEr7SKjCv5s/seHfMC2pOCLRBuZdbA/DHuUG1C7hq3DPMhiz3HJ9y8LCVvzBek= Received: from VI1PR0502MB3965.eurprd05.prod.outlook.com (52.134.17.157) by VI1PR0502MB3615.eurprd05.prod.outlook.com (52.134.7.26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Wed, 31 Jul 2019 12:38:21 +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.2115.005; Wed, 31 Jul 2019 12:38:21 +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 v2 12/20] ARM: dts: imx6: Add touchscreens used on Toradex eval boards Thread-Topic: [PATCH v2 12/20] ARM: dts: imx6: Add touchscreens used on Toradex eval boards Thread-Index: AQHVR5zWHQexF8AVwkue7T0eNPpvww== Date: Wed, 31 Jul 2019 12:38:21 +0000 Message-ID: <20190731123750.25670-13-philippe.schenker@toradex.com> References: <20190731123750.25670-1-philippe.schenker@toradex.com> In-Reply-To: <20190731123750.25670-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: AM0PR02CA0012.eurprd02.prod.outlook.com (2603:10a6:208:3e::25) 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: 6cedddbd-49e1-454c-9dcd-08d715b3f8ed x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600148)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:VI1PR0502MB3615; x-ms-traffictypediagnostic: VI1PR0502MB3615: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:469; x-forefront-prvs: 011579F31F x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(4636009)(39850400004)(376002)(136003)(396003)(366004)(346002)(199004)(189003)(66946007)(52116002)(66446008)(64756008)(66556008)(66476007)(76176011)(99286004)(53936002)(6512007)(6436002)(5660300002)(4326008)(7416002)(66066001)(6486002)(25786009)(478600001)(14454004)(7736002)(305945005)(71190400001)(71200400001)(3846002)(6116002)(36756003)(2501003)(68736007)(2906002)(2201001)(44832011)(486006)(476003)(86362001)(446003)(2616005)(14444005)(11346002)(256004)(186003)(81166006)(81156014)(26005)(102836004)(50226002)(8936002)(8676002)(6506007)(386003)(316002)(54906003)(110136005)(1076003); DIR:OUT; SFP:1102; SCL:1; SRVR:VI1PR0502MB3615; 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: JLFe872mINd4VQbVag6DY92kNOdzMYtIYJpOpkNM7CwbIcL8z2TZb/QXxiifDpz24LAXL5Kh0C837N0UBicK5tWLATI7DsnlZo6XrPb2T+n+TePab/rIUZKflSA9FnHDEiHIXTjcDSp8tGI1D0fkX4lBRTL+LBVVUhgLEEzKXZfCi98knWpRZD4g6ZB6sIvWdLwsLyvTu3tZrWaGWXQpxJqpKBpBFvv97NoyurYlLpdKmjynYFjKU2AZaLkW1VBGQPZhVTc8/13E8vyYX9ofktAWp3Ep3U09K+a5kXey882dl1czgvOZB09jUJzYAgHR179T2rwfiTjWTIS80LBXdVy1JODVhPvJymzy561wx290npLZKzZwcI8W0uexGMDnVSBNFSImDLMSEg2sJO+fy/hrTpD2XrOkuQdeF52vA3o= MIME-Version: 1.0 X-OriginatorOrg: toradex.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6cedddbd-49e1-454c-9dcd-08d715b3f8ed X-MS-Exchange-CrossTenant-originalarrivaltime: 31 Jul 2019 12:38:21.7824 (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: philippe.schenker@toradex.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0502MB3615 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190731_053831_959053_50DE888E X-CRM114-Status: GOOD ( 11.88 ) 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 --- 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>;