From patchwork Mon Sep 19 05:11:51 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sanchayan X-Patchwork-Id: 9338531 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 0C031607D0 for ; Mon, 19 Sep 2016 05:22:27 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id F34C828E46 for ; Mon, 19 Sep 2016 05:22:26 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E77B428F23; Mon, 19 Sep 2016 05:22: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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7142828E46 for ; Mon, 19 Sep 2016 05:22:24 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1blr0G-0004Ff-7d; Mon, 19 Sep 2016 05:20:28 +0000 Received: from mail-pa0-x243.google.com ([2607:f8b0:400e:c03::243]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1blr0C-0003Em-Ci for linux-arm-kernel@lists.infradead.org; Mon, 19 Sep 2016 05:20:25 +0000 Received: by mail-pa0-x243.google.com with SMTP id vz6so6427409pab.1 for ; Sun, 18 Sep 2016 22:20:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=148TRf1hENKa+0ALHrP3T4y5S1ZFfs5dZEA2S8WUf7k=; b=S6A75LEtGsPKVwONOPhL7m7x6Gz9TZyJfsMNrGNyoL4nPamd+zKtJtRsI3gZeMpqlz 6ZI32byZjDzAbwza0KwICrfpayNR94/e9Fl2BvTAlyk+yYlp+5x4/Nm1yLZC6nlfeTBP pkzPIXQkNcxlGUI4Ms3Awc+/K3ItDW8z8GBjIddhxs+2x2+U2yPyr+DvkYVq5Jx4uagZ 69+PTF6EcCnU8lA0v5y4XQgg86fflVuLYJ9BOTrwpBO/IUzDB7YjaMy427W2SiOLWM21 cXp685WU25FcPo0LOpLeh9ZAy9gRMTwU0oJYJMnJmahMNtNYP2S1GbpPHTf/eaonXnKA aZbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=148TRf1hENKa+0ALHrP3T4y5S1ZFfs5dZEA2S8WUf7k=; b=mh444LRJXKaHHBGpYlElu3ADeDf2r5ETF1aBIRMGJnOiYsBGuA0TeLQdNNQkoNx9qy fHExb4HQdP4BDI0vaevZs/hFePYS36nHI3PVg1oe/dVkr7DfY9eLIm/aN0mxnvRC8AjO 0yikQeL+GOKtjIUpu9ZlZw5dqHUOrz1XIMP4QOPp57iLrV0nHQO2xcKejm4+MGiBd0G/ LRXStAQiTu63ymgLV34/kJdmWRYYyrTWCy2vExlyqP9EfK8JAcPIRnP4gqexC2SGgSU4 TNXQ/A1AVwfhpUB2QXkpW3+OQIcQNjhL1ofdeNVQnZPfaNCVcp1yyG9bvHUuJtGr5vsh xf5A== X-Gm-Message-State: AE9vXwNbddIHdqQgbLdmLG/XovejpuVhlF2rOyIi95psUvBl4wofa7kfJj+tyelklcXprg== X-Received: by 10.67.7.70 with SMTP id da6mr43914784pad.111.1474262402282; Sun, 18 Sep 2016 22:20:02 -0700 (PDT) Received: from localhost ([115.115.243.34]) by smtp.gmail.com with ESMTPSA id f16sm63543038pfd.84.2016.09.18.22.20.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 18 Sep 2016 22:20:01 -0700 (PDT) From: Sanchayan Maity To: shawnguo@kernel.org Subject: [PATCH v2 1/3] ARM: dts: imx6qdl-apalis: Do not rely on DDC I2C bus bitbang for HDMI Date: Mon, 19 Sep 2016 10:41:51 +0530 Message-Id: <2263d508999ada9476268138b2922702eb50131f.1474260360.git.maitysanchayan@gmail.com> X-Mailer: git-send-email 2.10.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160918_222024_525215_AF6DFEDF X-CRM114-Status: GOOD ( 11.52 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, marcel.ziswiler@toradex.com, linux-kernel@vger.kernel.org, stefan@agner.ch, Sanchayan Maity , linux-arm-kernel@lists.infradead.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 Remove the use of DDC I2C bus bitbang to support reading of EDID and rely on support from internal HDMI I2C master controller instead. As a result remove the device tree property ddc-i2c-bus. Signed-off-by: Sanchayan Maity Acked-by: Marcel Ziswiler --- Changes since v1: Change the ranking in i2c aliases v1: https://lkml.org/lkml/2016/9/14/55 --- arch/arm/boot/dts/imx6q-apalis-ixora.dts | 12 +++--------- arch/arm/boot/dts/imx6qdl-apalis.dtsi | 25 +++++++++---------------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-apalis-ixora.dts b/arch/arm/boot/dts/imx6q-apalis-ixora.dts index 207b85b..82b81e0 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; - i2c2 = &i2c2; - i2c3 = &i2c3; + i2c0 = &i2c1; + i2c1 = &i2c2; + i2c2 = &i2c3; }; aliases { @@ -186,11 +185,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 99e323b..8c67dd8 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -53,18 +53,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"; @@ -209,6 +197,12 @@ }; }; +&hdmi { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_hdmi_ddc>; + status = "disabled"; +}; + /* * GEN1_I2C: I2C1_SDA/SCL on MXM3 209/211 (e.g. RTC on carrier * board) @@ -633,11 +627,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 >; };