From patchwork Mon Aug 7 07:22:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9884587 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 34BF2602CC for ; Mon, 7 Aug 2017 07:41:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 276A7200E7 for ; Mon, 7 Aug 2017 07:41:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1C4FF285B7; Mon, 7 Aug 2017 07:41:40 +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=-1.9 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.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 88C1A200E7 for ; Mon, 7 Aug 2017 07:41:39 +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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To: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=ZU0RHZoeJcXPdHyEnY4OQRBdBmNmjRctcFfXuPoNaLk=; b=IveMpuoK+OF9vmq2D7JFqHfnS6 Ec+iEa2PV9qkIUIxVeeTyWcIb8H+T6ghr4Bybcy0fcXGRvFaFGF3gtM6xpnY04UgRAAhmfDm7paEj ZMcCaR7OUDkuP7ajsTpgjesWNCOwmIaUXVxPPvBJkAySmtu3bPZ4QHXjJ7V/EwB630XKKMMPkS7Ea Fbq/G6dptj8J0c8m8vie3ojUuoh3hEx8vTlGhEo02k/MOZYXoUnRNdf0fCHre2RZXgeZDm2jFtf6T Qc7vv6Hl9jqtNl4gpu7Ltsusl17STOx2T9bZ/Kt2Ns2IBtQ/Rr9jLHOjOuEQwgGwgsZ58QCGG/GM5 ZJ9rp7CA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1decfI-0002op-Mf; Mon, 07 Aug 2017 07:41:28 +0000 Received: from mail-pg0-x243.google.com ([2607:f8b0:400e:c05::243]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1decOM-0007iR-Qx for linux-arm-kernel@lists.infradead.org; Mon, 07 Aug 2017 07:24:06 +0000 Received: by mail-pg0-x243.google.com with SMTP id 123so7991873pga.5 for ; Mon, 07 Aug 2017 00:23:42 -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 :in-reply-to:references; bh=kOyaJdX5vmbetX+JKRNfHi7yIKgr453B9AKSukVWWCU=; b=lSttw4ahY4QtDIlaDjD4IQE3U0muj64ozipq64jdZxfPjmPDSWrP6DLp3UolwKPDWw 17NAU6Gvox67YrlwgxnG433few2vyDezenixG/yBkcA4mM04qnAzKjNTd75B+1hn0ReA UgEiNhEyskI3pI8R1Qm5YSX3SC03DFIeVFa5E1VMzTTedZWahudXHiKXj3yv2REfo4pI XhPj0y4qIHvZb16DdLTnk2CScrG7bekzRnO4p5rLnvwXgYt2v5Qr+kDnUB34Xi6Ng/7h xlXr+7kQtO0pBsJBst2VJ5ZxXMPYzoKSDqZEeBSaDJqMs9gY/h4YuhExfoRkYykDEoBk ZSUQ== 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:in-reply-to:references; bh=kOyaJdX5vmbetX+JKRNfHi7yIKgr453B9AKSukVWWCU=; b=ZNNsS0Dm6nBzwYyKpvr/wIEGrsly0avrWljbmcA5srWq17xXK3cmqa+vj9CKmFlqOu jdquSiM+7TZuPHWOG52Sboc2n11kRuAZaeaE3QZsp4kCF9V5XVZvGWYn1H/9sLQoMepM pQ3vBwaZqHWVYuPkkxz2/GCvcRQ2as5svMxx0uuRXIAU1oc1d0XXTAqFX96T6C/0LWSs ihUhYsG5fKaHth2N+ZZsouemYVI+KCPsueFegNhmJk4zt6VwAXBfeRioQhKQK41QjEQy CdpQJ5lTz68kveeLUEyXbX5bq9fYjOR7erap7x55e7zZO6VcQzxDdff/ciCG24h3+Rq3 3ZzA== X-Gm-Message-State: AIVw113M/mg+R2J8ZgQdUpu/DKSGP/doGKDGiTjy4fs+n4lfr31MvWkX Q6Q2YCy7qIs1KA== X-Received: by 10.101.87.205 with SMTP id q13mr11035274pgr.359.1502090621311; Mon, 07 Aug 2017 00:23:41 -0700 (PDT) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id i4sm2839753pfg.51.2017.08.07.00.23.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Aug 2017 00:23:40 -0700 (PDT) From: Sanchayan Maity To: shawnguo@kernel.org Subject: [PATCH 08/10] ARM: dts: imx6qdl-apalis: imx6q-apalis-ixora: use i2c from dwc hdmi Date: Mon, 7 Aug 2017 12:52:40 +0530 Message-Id: <3f1aa78a25f8f2973a58ba160252cefa2f27aef8.1502087184.git.maitysanchayan@gmail.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: References: In-Reply-To: References: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170807_002359_431375_3A6272AD X-CRM114-Status: GOOD ( 10.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: marcel.ziswiler@toradex.com, maitysanchayan@gmail.com, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org MIME-Version: 1.0 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 From: Marcel Ziswiler Migrate to using functionally-reduced I2C master contained in the DWC HDMI. Therefore drop the GPIO bitbanging based i2cddc definition and modify resp. pinctrl. While at it re-order the I2C aliases to start with the generic, followed by the camera and concluded by the power I2C one. Signed-off-by: Marcel Ziswiler --- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 10 ++-------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 25 +++++++++---------------- 2 files changed, 11 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 73c1ec883ff5..60d33e99de76 100644 --- a/arch/arm/boot/dts/imx6q-apalis-ixora.dts +++ b/arch/arm/boot/dts/imx6q-apalis-ixora.dts @@ -55,10 +55,9 @@ "fsl,imx6q"; aliases { - i2c0 = &i2cddc; - i2c1 = &i2c1; + i2c0 = &i2c1; + i2c1 = &i2c3; i2c2 = &i2c2; - i2c3 = &i2c3; rtc0 = &rtc_i2c; rtc1 = &snvs_rtc; }; @@ -161,11 +160,6 @@ }; &hdmi { - ddc-i2c-bus = <&i2cddc>; - status = "okay"; -}; - -&i2cddc { status = "okay"; }; diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi index 6658c659b7d7..ea339fa58f4a 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -56,18 +56,6 @@ status = "disabled"; }; - /* DDC_I2C: I2C2_SDA/SCL on MXM3 205/207 */ - i2cddc: i2c@0 { - compatible = "i2c-gpio"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_i2c_ddc>; - gpios = <&gpio3 16 GPIO_ACTIVE_HIGH /* sda */ - &gpio2 30 GPIO_ACTIVE_HIGH /* scl */ - >; - i2c-gpio,delay-us = <2>; /* ~100 kHz */ - status = "disabled"; - }; - reg_1p8v: regulator-1p8v { compatible = "regulator-fixed"; regulator-name = "1P8V"; @@ -210,6 +198,12 @@ }; }; +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_ddc>; + status = "disabled"; +}; + /* I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier board) */ &i2c1 { clock-frequency = <100000>; @@ -638,11 +632,10 @@ >; }; - pinctrl_i2c_ddc: gpioi2cddcgrp { + pinctrl_hdmi_ddc: hdmiddcgrp { fsl,pins = < - /* DDC bitbang */ - MX6QDL_PAD_EIM_EB2__GPIO2_IO30 0x1b0b0 - MX6QDL_PAD_EIM_D16__GPIO3_IO16 0x1b0b0 + MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1 + MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1 >; };