From patchwork Mon May 7 00:56:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Ford X-Patchwork-Id: 10383105 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 044086037F for ; Mon, 7 May 2018 00:56:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E97E828AB4 for ; Mon, 7 May 2018 00:56:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DDE3E28ABB; Mon, 7 May 2018 00:56:50 +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=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, 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 77BC528AB4 for ; Mon, 7 May 2018 00:56:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751884AbeEGA4t (ORCPT ); Sun, 6 May 2018 20:56:49 -0400 Received: from mail-io0-f196.google.com ([209.85.223.196]:44990 "EHLO mail-io0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752175AbeEGA4l (ORCPT ); Sun, 6 May 2018 20:56:41 -0400 Received: by mail-io0-f196.google.com with SMTP id d11-v6so31706834iof.11 for ; Sun, 06 May 2018 17:56:41 -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; bh=y4yBTu8AOIDEgBcTMGjZWHv85PFpFhYgpB5/F2ydSb8=; b=PSeRQSSLaPqeEUBla1YR2lRIJDMFIjOINSCvueWlj7BcmxoZ5tye9JThOqW3Qaghmb AF0rHo2RtUyAojuTW53ANg69qeNnpuU/8228tnMpNsZuLdhS8sHU2SdfUhnROtgs8GCt jQU+GQ8NlKHtSFbuf+d6gSjRqNRBBdFcaLniaFu1TN5UBhrj9DVXSzwVzb4aJlJSMnBJ LgLJVXZg6jh9bmNPxy8irURk/DOuPrwCObWVuljG1g/be90Uzf29Xom7E+uN46Qj9b0W AeuBCw41Vb4z13Mc5YO1+DQ+ROlCjIYhWmrrcAKae2a0g347VCh5vGBhd8C/TYoML0Zp rPWA== 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; bh=y4yBTu8AOIDEgBcTMGjZWHv85PFpFhYgpB5/F2ydSb8=; b=HSjbgAjrvEDlIwHfD94sKH5TO0RfMm30ODfbd/Iv9/hjD/1rQaS/lOVu+8CCtSa1vT gFHzx2zwXkDlkKb1hpu8Q9asNaIbj2E0OFrwQZBf46tH9CZ7/swAR8DN96Ab7AF91eVx 1PMk44pcO0svJhkDicfEu2AdENL/CpXAUmyskFPnk/Gy/7JKE5J3+k+eIGV6ofeZObwn w/nDMjb0BwtVLNGt/mLTuueH7shAz81DE7qJdibRO0Lg9rw+uweKjSPw7p9v0u505ch4 ccz0hoL8xOH9LLeZznfJav4bbTRRrCsF22kqt7KZHOPBGQGbjoGeMp4gyfeXbAwGlzl9 yl7w== X-Gm-Message-State: ALQs6tAEu1TT0yGkxyTGiHgww/KPcAMwxnuJhQKROkyQ8eY3QzLIwkkg 7KNY9jS/qw5d7IJkbmksCLUf7g== X-Google-Smtp-Source: AB8JxZosaNkSs8BozgmYGJuX0zqXgKLU9tFlGHRRF9zG6B3BAsERHWEc+K7MUwgovhstDSabGQF07g== X-Received: by 2002:a6b:ac85:: with SMTP id v127-v6mr24010090ioe.286.1525654600991; Sun, 06 May 2018 17:56:40 -0700 (PDT) Received: from localhost.localdomain (c-73-65-120-235.hsd1.mn.comcast.net. [73.65.120.235]) by smtp.gmail.com with ESMTPSA id e133-v6sm9217846iof.28.2018.05.06.17.56.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 06 May 2018 17:56:40 -0700 (PDT) From: Adam Ford To: linux-omap@vger.kernel.org Cc: Adam Ford Subject: [PATCH] ARM: dts: logicpd-som-lv: Fix Touchscreen controller Date: Sun, 6 May 2018 19:56:29 -0500 Message-Id: <20180507005629.4931-1-aford173@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The touchscreen patch did not apply to this branch correctly and inadvertently got placed onto I2C2 when it should be on I2C3. This fixes the issue. Fixes: 121685b14624 ("ARM: dts: logicpd-som-lv: Enable Touchscreen controller") Signed-off-by: Adam Ford diff --git a/arch/arm/boot/dts/logicpd-som-lv.dtsi b/arch/arm/boot/dts/logicpd-som-lv.dtsi index 5957943a8645..5c31c80c5d58 100644 --- a/arch/arm/boot/dts/logicpd-som-lv.dtsi +++ b/arch/arm/boot/dts/logicpd-som-lv.dtsi @@ -91,6 +91,12 @@ pinctrl-names = "default"; pinctrl-0 = <&i2c2_pins>; clock-frequency = <400000>; +}; + +&i2c3 { + pinctrl-names = "default"; + pinctrl-0 = <&i2c3_pins>; + clock-frequency = <400000>; touchscreen: tsc2004@48 { compatible = "ti,tsc2004"; @@ -112,12 +118,6 @@ }; }; -&i2c3 { - pinctrl-names = "default"; - pinctrl-0 = <&i2c3_pins>; - clock-frequency = <400000>; -}; - &mmc3 { interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; pinctrl-0 = <&mmc3_pins &wl127x_gpio>;