From patchwork Mon Sep 11 09:12:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 9946963 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 401DC602C9 for ; Mon, 11 Sep 2017 09:18:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2E79128B55 for ; Mon, 11 Sep 2017 09:18:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2348928B67; Mon, 11 Sep 2017 09:18:51 +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.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=unavailable 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 C0D1228B55 for ; Mon, 11 Sep 2017 09:18:50 +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=D3Ppmd/RJwg7hMEhFA1xHVC+g49O13sGvynSUNWwujQ=; b=PmvUqZ23Bb5p0qsrTrVnLS6qTS sGE8COBRt23/mrGl0DXoAHQVpRexfQHcMjZ0xMOqFxbHo8AfsuoE2MFT6ujjiSFzjggnkVn7sWsQ2 b6xjFKyM5df2ry9mU5xjtBvZlKksohU5MbbFNLeM8RXhoAxQPcFr1w4hTEPXDRKybmh+glWJPi4eS 923sq7TwRWRstzeu8Vh1aO+Xr/ERecygR+I68C2cSN+mudzYKexV5jOi6QTgcXViWKlK9DUzbZX3f BuON3tWyXn60SyGkDXZCD6UGMY6W3nqshHURYSq97sO7m8wA0uaxJRaCCo7I4CUDpwHYt31sy/RqQ fHjWUhHA==; 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 1drKrd-0004QQ-TQ; Mon, 11 Sep 2017 09:18:45 +0000 Received: from mail-pf0-x241.google.com ([2607:f8b0:400e:c00::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1drKrJ-0003w2-N8 for linux-arm-kernel@lists.infradead.org; Mon, 11 Sep 2017 09:18:27 +0000 Received: by mail-pf0-x241.google.com with SMTP id g65so4435844pfe.1 for ; Mon, 11 Sep 2017 02:18:05 -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=xGBdWNoO488jOnwKtatywfxcvewMizX6v8lLe3oz8mg=; b=IuvWZS31O1mEaIgON8IY4r2peVhPAc/oCSfH76nRbRWEGgBwv8MyRsR9TxEtXu3ddc jUf3ej5a+f8hepDJCabWS5ZyQjZkNE0NIbxRdM7imXRvLXPxf+5sD3C4uAD7pvWCwbpX Pn/y/PLs0OHLGpd1ndvVegM+PedB34noR5cB3t+sFO+iPe7pMV7GbI6XLrN+BjCBhg5b +TxZxhN6r4ob23F7QEzZtLKTLRJJoLuKni6oWPdT9Xlecgg9aYopmCs+tDtPanVJftAt 3FC8eXfzXT0pA3e7pVzOHs/3G5bLbvOkVe01KxSO/jXzLotyCD1dg7+9SIX6xsFl3zM+ EUCA== 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=xGBdWNoO488jOnwKtatywfxcvewMizX6v8lLe3oz8mg=; b=b0c5+8fcYH0Z43N9hbcpUehmUQcCuA8qP8XmGBVI0OByUBcD0yQh41NQrJdCDw0VWu pVqSp6ijtZA310zR5CCY5apBBcsRUM6SQND6+/nXPLezOcISvvCwJk6rtLsPeNAnL+Kp aBROskO7fuB+BrjYdBBWo8CNmnEyzQSuUabI996jd1yRHcHRWLEZWo3084Ba8jBjCGo4 lyYl7REqy63L1knlawbIVFnFeaW6de6APnm00B5nSDzB5zgkTXe7Co9+NPKhKbT4ooth Bwp6/4WzHSQoAhN/+OWS3cKb9uT/QEe8U0r7DFpWlU7/Y0SckcWpI7RRgQulLO20o0kQ eJmA== X-Gm-Message-State: AHPjjUgGHMRvL+mbIvGP79suR7rypH3otESLBJIqwj1X5h/aj5GF2mv4 H/NAN50c/VcidA== X-Google-Smtp-Source: ADKCNb7Se+q9t7TrUQzqTbQw46kka2wXLciQKnQdk31eUMGeUK8H9JE4+KHx6VqnthDuoDbbFE2MVA== X-Received: by 10.84.236.76 with SMTP id h12mr13171412pln.181.1505121485220; Mon, 11 Sep 2017 02:18:05 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id a78sm16550835pfl.39.2017.09.11.02.18.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 11 Sep 2017 02:18:04 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Shawn Guo Subject: [PATCH v4 2/6] ARM: dts: imx6qdl-icore-rqs: Move Sound nodes to dtsi Date: Mon, 11 Sep 2017 14:42:21 +0530 Message-Id: <1505121145-9507-2-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505121145-9507-1-git-send-email-jteki@openedev.com> References: <1505121145-9507-1-git-send-email-jteki@openedev.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170911_021825_929297_15530BAB X-CRM114-Status: UNSURE ( 9.35 ) X-CRM114-Notice: Please train this message. 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: devicetree@vger.kernel.org, Matteo Lisi , linux-kernel@vger.kernel.org, Jagan Teki , Sascha Hauer , Fabio Estevam , Michael Trimarchi , 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 From: Jagan Teki imx6q, imx6dl icore-rqs modules share common sound nodes, so move the sound nodes from imx6q-icore-rqs into dtsi so-that both can share the common node details. And also replace codec: sgtl5000@0a => sgtl5000: codec@a on imx6q-icore-rqs.dts to [label:] node-name[@unit-address] according to devicetree specification from ePAPER v1.1 Cc: Shawn Guo Cc: Matteo Lisi Cc: Michael Trimarchi Signed-off-by: Jagan Teki --- Changes for v4: - New patch arch/arm/boot/dts/imx6q-icore-rqs.dts | 24 ------------------------ arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 24 deletions(-) diff --git a/arch/arm/boot/dts/imx6q-icore-rqs.dts b/arch/arm/boot/dts/imx6q-icore-rqs.dts index e451b4c..b81f48c 100644 --- a/arch/arm/boot/dts/imx6q-icore-rqs.dts +++ b/arch/arm/boot/dts/imx6q-icore-rqs.dts @@ -47,30 +47,6 @@ / { model = "Engicam i.CoreM6 Quad/Dual RQS Starter Kit"; compatible = "engicam,imx6-icore-rqs", "fsl,imx6q"; - - sound { - compatible = "fsl,imx-audio-sgtl5000"; - model = "imx-audio-sgtl5000"; - ssi-controller = <&ssi1>; - audio-codec = <&codec>; - audio-routing = - "MIC_IN", "Mic Jack", - "Mic Jack", "Mic Bias", - "Headphone Jack", "HP_OUT"; - mux-int-port = <1>; - mux-ext-port = <4>; - }; -}; - -&i2c3 { - codec: sgtl5000@0a { - compatible = "fsl,sgtl5000"; - reg = <0x0a>; - clocks = <&clks IMX6QDL_CLK_CKO>; - VDDA-supply = <®_2p5v>; - VDDIO-supply = <®_3p3v>; - VDDD-supply = <®_1p8v>; - }; }; &sata { diff --git a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi index 7ca291e..e196d1b 100644 --- a/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi +++ b/arch/arm/boot/dts/imx6qdl-icore-rqs.dtsi @@ -118,6 +118,19 @@ clocks = <&clks IMX6QDL_CLK_LVDS2_GATE>; clock-names = "refclk"; }; + + sound { + compatible = "fsl,imx-audio-sgtl5000"; + model = "imx-audio-sgtl5000"; + ssi-controller = <&ssi1>; + audio-codec = <&sgtl5000>; + audio-routing = + "MIC_IN", "Mic Jack", + "Mic Jack", "Mic Bias", + "Headphone Jack", "HP_OUT"; + mux-int-port = <1>; + mux-ext-port = <4>; + }; }; &clks { @@ -174,6 +187,15 @@ pinctrl-names = "default"; pinctrl-0 = <&pinctrl_i2c3>; status = "okay"; + + sgtl5000: codec@a { + compatible = "fsl,sgtl5000"; + reg = <0x0a>; + clocks = <&clks IMX6QDL_CLK_CKO>; + VDDA-supply = <®_2p5v>; + VDDIO-supply = <®_3p3v>; + VDDD-supply = <®_1p8v>; + }; }; &pcie {