From patchwork Mon Sep 18 11:28:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 9956535 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 E130B601E9 for ; Mon, 18 Sep 2017 11:37:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0D2B28B4C for ; Mon, 18 Sep 2017 11:37:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C5D4428C17; Mon, 18 Sep 2017 11:37:06 +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 609E528B4C for ; Mon, 18 Sep 2017 11:37:06 +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=JLJLFG9igoQAlXEg5Axvj9hEasHeKWmmDJBPpk5bwu8=; b=LRIU6yB02vElP+5L/ZPPOmTvJM Wsbl8GCpowloqAPt85NqahRYA+KhDBBxOKE5hsI48YaVtD7YLQZAjVxL5IoWNbPgLDhNjiNNV926r zBVli5IwJhmDaghTrpeTsbwt3czM3p///h92iIhIy4B0uGR+YjwuLf5WDbPo1maPvxVNwdQ2H4IDx a1WlozQ9oAA7TO7uOkDk8NID6GeHhH//nKGDuFSY2DRlXafKELk3oFQU5+7VwoYbkRUrFeh/f9dMV iI0M5Ft4EiGG9TjF1SjYCvq6/j5bSM1/IdKpVgEbYRfNL+qQ5FuVi8FPBJHnSBvTiUDhCk5LlwP2C oaehJFsg==; 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 1dtuMF-00072J-Jq; Mon, 18 Sep 2017 11:36:59 +0000 Received: from mail-pg0-x241.google.com ([2607:f8b0:400e:c05::241]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dtuLn-0006dI-6s for linux-arm-kernel@lists.infradead.org; Mon, 18 Sep 2017 11:36:37 +0000 Received: by mail-pg0-x241.google.com with SMTP id m30so93502pgn.5 for ; Mon, 18 Sep 2017 04:36:11 -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=if4Bjb1LsQmIyQkbzifaB3JHLgsbbw7NdPbiSFdtnWg=; b=lyKBulCxY5GrVAmTC1PDn+ddnAfxAH3rTCJgFmq+O9aTatycU5+BheM7V4XFLHMTcP TmUJJ6QCx6/QN7jY6y3I2vBdoTOFHOqyz4iJ3hJOwkqjchURNsAMNfkQ3tEKkTKFLXH5 Ph5SUhdqdjdRVbIdg5pvtuKbiMHpx0j+vA7DxFIUJZ+iHsMcQCBGQm60kxCD5XMx7zD3 nCAds+BT5bwEaojULP4kjaHJW4lLPeftx4ja+VOFL3TJT+fF48onpOZeprHyMPx/WbhW 6LlXq5dsmDNZg51itvoiFTlkJKKX0MAj3Iq1uEQBFnl965u+4Jrgp15XsaeBvp1YxGmS QHcw== 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=if4Bjb1LsQmIyQkbzifaB3JHLgsbbw7NdPbiSFdtnWg=; b=rO/iVw2rInRoJoeCNKuCbUhgJcWgHfSjsdGbSqW2IAzRUg0sDrhBKT70tkO4wiJyo1 HmG79NbqVqU1Xhsn9eDFbzdc49Bvmyz7HkdF5lveqOfKsARi+GgK4Ilk513sy72hZwXJ X8kIWeNUZ3O5P5Y2ADvOp5YSqvu9uIpz4j7eWFkdfIsfitPH6qruAFuUMZ0r8TD26Akf PDlkOh1hD9P8dJl7YSRjk77vMH/7QaHknEygBWsEQ4/xWiQf8MedJFYfqSBfn8CD4wAP M9QVK2WWKYFZAEfWabeXaEJjnDErXDTz9m8K/OAlQWVSbYCheWFOq/lF1wBMh3RldbZj EDtQ== X-Gm-Message-State: AHPjjUj47++msA6/TmsVotUiV0umIQa8nd7lDzoCeaxJ1FJNfk7UW6t0 n4cNoOgSyV4rH7eq X-Google-Smtp-Source: ADKCNb4scodc/K2rLIPARk6cYj12N9Ev+z7zu3jqvC5vRfE40BMXMrCpszolNoITU8B2kEbu7GCmIQ== X-Received: by 10.99.114.17 with SMTP id n17mr32702383pgc.43.1505734570643; Mon, 18 Sep 2017 04:36:10 -0700 (PDT) Received: from localhost.localdomain ([115.97.191.18]) by smtp.gmail.com with ESMTPSA id z22sm13517562pfi.166.2017.09.18.04.36.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Sep 2017 04:36:09 -0700 (PDT) From: Jagan Teki X-Google-Original-From: Jagan Teki To: Shawn Guo Subject: [PATCH v5 2/5] ARM: dts: imx6qdl-icore-rqs: Move Sound nodes to dtsi Date: Mon, 18 Sep 2017 16:58:30 +0530 Message-Id: <1505734113-9708-2-git-send-email-jteki@openedev.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1505734113-9708-1-git-send-email-jteki@openedev.com> References: <1505734113-9708-1-git-send-email-jteki@openedev.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170918_043631_497364_8DD5E9AC X-CRM114-Status: UNSURE ( 9.51 ) 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, v5: - None Changes for v3: - 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 {