From patchwork Tue Mar 13 16:46:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Craig Tatlor X-Patchwork-Id: 10280095 X-Patchwork-Delegate: agross@codeaurora.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 59878602C2 for ; Tue, 13 Mar 2018 16:47:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 49D3D28473 for ; Tue, 13 Mar 2018 16:47:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EA64284F1; Tue, 13 Mar 2018 16:47:48 +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=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DC19528473 for ; Tue, 13 Mar 2018 16:47:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752892AbeCMQrC (ORCPT ); Tue, 13 Mar 2018 12:47:02 -0400 Received: from mail-wr0-f195.google.com ([209.85.128.195]:33036 "EHLO mail-wr0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752475AbeCMQrB (ORCPT ); Tue, 13 Mar 2018 12:47:01 -0400 Received: by mail-wr0-f195.google.com with SMTP id r8so801344wrg.0; Tue, 13 Mar 2018 09:47:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=b8xo0UsWt7SOHIBPfnrEtcm7Q1QdVgH30WAzsF2yv2c=; b=ZHCA1iKCr0ZV8RAzAlV4oAihfiEl1QTev1CQCV8oOunjcyvzsafX4EVvSOoCc0JOVg ggONLMvgD7AARsji8QDXbe/adlyRYDoZwypm7c+D50D3MsEzI3nE8+4DDkZ/MbMgXRJa wda+y+1L1vmxPEywNzSpNQzXPXPdoD8PIJMRxbayZJkJcHdYDlqnHgQ5phZWKIqbaaXc yIweIckVx2xVAifoHMa3Jn72LjnbNO9sHRWsI9RtRUXj85whEFby1wwu4QH0TZhqlQ7R KgBH3lWAx4uPutO2Js1r+oCP/dHwQz3ArdeVmQDTYkdq8unBb5TdYPF1w0WyaAVo0XlS +69g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=b8xo0UsWt7SOHIBPfnrEtcm7Q1QdVgH30WAzsF2yv2c=; b=SG1j41dY1UkjdC5Pp7cuJUKi+ET9RrWnDimpzv2uY3hiq1VW+7Eun/BUEklhvRnZZX k+Oq9kpPgLAUU4RPbsmdD9/1xX72x83j8KgAugt5uB5QuEgvlSPR5bYmKDw7iBBWYWeo Ad6sBGaFSjswo3/6VNBCX1xAkL3vCaz3JDC/3gDeYv3HrjxMFh6DkHNpDEi/KUPLAkGU 1c9oLBMQdO+w+2uNsiUQf9af+APh1Wge5QwHo4EVqUILY2RsV/Z8dboo/vf1UT9PF7+x OIzv/yd4faiKh7OEKhgq4NK2r1xenS06Le29Cx40M4NvXphPplmOZwzo4PhcIgoGd/31 ba5A== X-Gm-Message-State: AElRT7EyBCILI/Skh5sI2HHEEEADrX1TEI+hB79OphXRgs6DpabwcnNt Zjx0Zg59qusukGv7gy+mLA== X-Google-Smtp-Source: AG47ELsyOg2al20FtmSlCkPM45KuPXM+5en4D9zQp0o8WZ7TYIeDU1o5V4TazYDOnl1mwej4Zxersw== X-Received: by 10.223.129.80 with SMTP id 74mr1108355wrm.190.1520959619426; Tue, 13 Mar 2018 09:46:59 -0700 (PDT) Received: from arch.home (host86-159-239-72.range86-159.btcentralplus.com. [86.159.239.72]) by smtp.googlemail.com with ESMTPSA id t91sm926311wrc.21.2018.03.13.09.46.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Mar 2018 09:46:58 -0700 (PDT) From: Craig Tatlor Cc: ctatlor97@gmail.com, Andy Gross , David Brown , Rob Herring , Mark Rutland , Russell King , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH v2] ARM: dts: msm8974: castor: Fix typo and add startup delay in touchscreen node Date: Tue, 13 Mar 2018 16:46:38 +0000 Message-Id: <20180313164638.7211-1-ctatlor97@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180312160734.5606-1-ctatlor97@gmail.com> References: <20180312160734.5606-1-ctatlor97@gmail.com> To: unlisted-recipients:; (no To-header on input) Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The compatible string was mistakenly pulled from the downstream tree and the startup delay property is needed to prevent io errors on initial page select. Signed-off-by: Craig Tatlor --- arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts index e87f2c99060d..701b396719c7 100644 --- a/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts +++ b/arch/arm/boot/dts/qcom-msm8974-sony-xperia-castor.dts @@ -491,7 +491,7 @@ pinctrl-0 = <&i2c8_pins>; synaptics@2c { - compatible = "syna,rmi-i2c"; + compatible = "syna,rmi4-i2c"; reg = <0x2c>; interrupt-parent = <&msmgpio>; @@ -506,6 +506,8 @@ pinctrl-names = "default"; pinctrl-0 = <&ts_int_pin>; + syna,startup-delay-ms = <10>; + rmi-f01@1 { reg = <0x1>; syna,nosleep = <1>;