From patchwork Mon Feb 5 17:21:10 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Sylwester Nawrocki/Kernel \\(PLT\\) /SRPOL/Staff Engineer/Samsung Electronics" X-Patchwork-Id: 10200987 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 CC6FB602CA for ; Mon, 5 Feb 2018 17:22:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id BAB9F28702 for ; Mon, 5 Feb 2018 17:22:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id ADFC52871F; Mon, 5 Feb 2018 17:22:22 +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=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, 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 34D0F28702 for ; Mon, 5 Feb 2018 17:22:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753170AbeBERWV (ORCPT ); Mon, 5 Feb 2018 12:22:21 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:29958 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753155AbeBERWU (ORCPT ); Mon, 5 Feb 2018 12:22:20 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout2.samsung.com (KnoxPortal) with ESMTP id 20180205172218epoutp0281f6e183a4c174d12ea3ae77621a6436~QfcAZg89m1537415374epoutp02Z; Mon, 5 Feb 2018 17:22:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout2.samsung.com 20180205172218epoutp0281f6e183a4c174d12ea3ae77621a6436~QfcAZg89m1537415374epoutp02Z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1517851338; bh=UeWfDSTWxwI089FRRfxvJverCXUlFn63aXKqfkANu4g=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=TUjsenDaW+h6+NIsYNAmmlOlZXNKV3REtyZd45JQpu1rv6VPethsJfcRUtAnOlgAY 37JhynVKaGPOtmI8jpa7UbEmrq4qDrELfYBPLoBhyzA456ZCVGe3gB/zoruZRY6PlF aX2mAqWI75pG7YaMJ/j/ozRSpBnY+OcZQEK+y6OE= Received: from epsmges2p2.samsung.com (unknown [182.195.42.70]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20180205172217epcas2p176d3a3e75998fa5dfa51201f4a5b5dea~Qfb-dZTZF1135611356epcas2p15; Mon, 5 Feb 2018 17:22:17 +0000 (GMT) Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p2.samsung.com (Symantec Messaging Gateway) with SMTP id A7.D1.04137.9C2987A5; Tue, 6 Feb 2018 02:22:17 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20180205172216epcas2p3be603e84df81b28ee4c04c9b1c1c551f~Qfb_mBswK0046600466epcas2p36; Mon, 5 Feb 2018 17:22:16 +0000 (GMT) X-AuditID: b6c32a46-3c1ff70000001029-fe-5a7892c914a0 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 7E.B2.03890.8C2987A5; Tue, 6 Feb 2018 02:22:16 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P3O009BCTJO7YC0@mmp2.samsung.com>; Tue, 06 Feb 2018 02:22:16 +0900 (KST) From: Sylwester Nawrocki To: krzk@kernel.org Cc: kgene@kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, jcsing.lee@samsung.com, linux-arm-kernel@lists.infradead.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH 2/2] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Date: Mon, 05 Feb 2018 18:21:10 +0100 Message-id: <20180205172110.9897-2-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20180205172110.9897-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrOIsWRmVeSWpSXmKPExsWy7bCmue7JSRVRBv9eSFhsnLGe1WL+kXOs Fm/3dzNb9D9+zWxx/vwGdotNj6+xWsw4v4/JYu2Ru+wWh9+0szpwemxa1cnmsXlJvUffllWM Hp83yQWwRHHZpKTmZJalFunbJXBlbNvxgKlgo2zF/qV/WBoY74t3MXJySAiYSMzd28TexcjF ISSwg1Fi3vPlrBDOd0aJJ1vXssBUzZt6C6pqA6PEjfMfmEASQgK/GCW27+QEsdkEDCV6j/Yx gtgiAsIS95YuB2tgFvjBKLHry3RWkISwQKjE5v1rwKayCKhKXD1+HWwQr4CVxMc1c1ghtslL vF9wH2gQBwengLXE81MCEOEZbBL7vrpC2C4Sl87MgyoXlnh1fAs7hC0t8WzVRkaQvRIC/YwS J9Y0QzkzGCXutE9ggqiyljh8/CJYN7MAn0TH4b/sIMskBHglOtqEIEo8JK5v2c8EEXaUaP8r B/F8H6PEylmb2ScwSi1gZFjFKJZaUJybnlpsVGCkV5yYW1yal66XnJ+7iREcnVpuOxiXnPM5 xCjAwajEwyuQURElxJpYVlyZe4hRgoNZSYTX6Xp5lBBvSmJlVWpRfnxRaU5q8SFGaQ4WJXHe 1gCXKCGB9MSS1OzU1ILUIpgsEwenVAOjw4I/rcqFWpMMIos7f4vPePjkAFesZALnKZ0dJas2 zF/sLN6hOPNV/Cb9let2hzT9+9fR80hjyqKlZtLXD6gf+ycZ6Vsyf9KsbaqiChJLbtmXyLpY rf7iJZ+/jVcrZLGpedypz++9eFYVnbvhc7lB6V997T+ZSocpK2VuqVy6kKMa9IYzNWydEktx RqKhFnNRcSIAMr5rIcoCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprALMWRmVeSWpSXmKPExsVy+t9jQd0TkyqiDNYtlLbYOGM9q8X8I+dY Ld7u72a26H/8mtni/PkN7BabHl9jtZhxfh+Txdojd9ktDr9pZ3Xg9Ni0qpPNY/OSeo++LasY PT5vkgtgieKySUnNySxLLdK3S+DK2LbjAVPBRtmK/Uv/sDQw3hfvYuTkkBAwkZg39RZ7FyMX h5DAOkaJ57feMEE4vxglNl/uYwOpYhMwlOg92scIYosICEvcW7ocrINZ4AejxOddG8ESwgKh Epv3r2EBsVkEVCWuHr/OBGLzClhJfFwzhxVinbzE+wX3geo5ODgFrCWenxIACQsBldy++Jxt AiPPAkaGVYySqQXFuem5xUYFRnmp5XrFibnFpXnpesn5uZsYgeG07bBW/w7Gx0viDzEKcDAq 8fAKZFRECbEmlhVX5h5ilOBgVhLhdbpeHiXEm5JYWZValB9fVJqTWnyIUZqDRUmclz//WKSQ QHpiSWp2ampBahFMlomDU6qB0cE09h63jfu5XdLF9bMnR0c6z1zT3Fmk/OKby+l1a/3unpk2 k//hS9G46XKXy1neum/qkQ6f/2bK/7VbWCYd3btMj/vZnxvbrxisOcumx9195F54v6BDU9v0 u3K9VlPUr7KHPNG5L79H7Orl7fMdRdeId/HHLlI40DLn4zft+umcf1RqBD+7RiqxFGckGmox FxUnAgDJCS9QIwIAAA== X-CMS-MailID: 20180205172216epcas2p3be603e84df81b28ee4c04c9b1c1c551f X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20180205172216epcas2p3be603e84df81b28ee4c04c9b1c1c551f X-RootMTR: 20180205172216epcas2p3be603e84df81b28ee4c04c9b1c1c551f References: <20180205172110.9897-1-s.nawrocki@samsung.com> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch updates the sound node of the exynos5433-tm2 board and adds clock tree configuration in order to support HDMI sound. Signed-off-by: Sylwester Nawrocki --- .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 67 ++++++++++++++++++++-- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 + 2 files changed, 64 insertions(+), 4 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi index a77462da4a36..37fb477a2d23 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2-common.dtsi @@ -14,6 +14,7 @@ #include #include #include +#include / { aliases { @@ -112,8 +113,8 @@ sound { compatible = "samsung,tm2-audio"; - audio-codec = <&wm5110>; - i2s-controller = <&i2s0>; + audio-codec = <&wm5110>, <&hdmi>; + i2s-controller = <&i2s0 0>, <&i2s1 0>; audio-amplifier = <&max98504>; mic-bias-gpios = <&gpr3 2 GPIO_ACTIVE_HIGH>; model = "wm5110"; @@ -216,9 +217,63 @@ status = "okay"; }; +&cmu_top { + assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>; + assigned-clock-rates = <(196608009 + 1)>; +}; + &cmu_aud { - assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>; - assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>; + assigned-clocks = <&cmu_aud CLK_MOUT_AUD_PLL_USER>, + <&cmu_aud CLK_MOUT_SCLK_AUD_I2S>, + <&cmu_aud CLK_MOUT_SCLK_AUD_PCM>, + <&cmu_top CLK_MOUT_AUD_PLL>, + + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>, + <&cmu_top CLK_MOUT_SCLK_AUDIO0>, + <&cmu_top CLK_MOUT_SCLK_AUDIO1>, + <&cmu_top CLK_MOUT_SCLK_SPDIF>, + + <&cmu_aud CLK_DIV_AUD_CA5>, + <&cmu_aud CLK_DIV_ACLK_AUD>, + <&cmu_aud CLK_DIV_PCLK_DBG_AUD>, + <&cmu_aud CLK_DIV_SCLK_AUD_I2S>, + <&cmu_aud CLK_DIV_SCLK_AUD_PCM>, + <&cmu_aud CLK_DIV_SCLK_AUD_SLIMBUS>, + <&cmu_aud CLK_DIV_SCLK_AUD_UART>, + + <&cmu_top CLK_DIV_SCLK_AUDIO0>, + <&cmu_top CLK_DIV_SCLK_AUDIO1>, + <&cmu_top CLK_DIV_SCLK_PCM1>, + <&cmu_top CLK_DIV_SCLK_I2S1>; + + assigned-clock-parents = <&cmu_top CLK_FOUT_AUD_PLL>, + <&cmu_aud CLK_MOUT_AUD_PLL_USER>, + <&cmu_aud CLK_MOUT_AUD_PLL_USER>, + <&cmu_top CLK_FOUT_AUD_PLL>, + + <&cmu_top CLK_MOUT_AUD_PLL>, + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>, + <&cmu_top CLK_MOUT_AUD_PLL_USER_T>, + <&cmu_top CLK_SCLK_AUDIO0>; + + assigned-clock-rates = <0>, <0>, <0>, <0>, <0>, <0>, <0>, <0>, + <(196608009 + 1)>, + <((196608009 / 3) + 1)>, + <((196608009 / 6) + 1)>, + <((196608009 / 4) + 1)>, + <((196608009 / 96) + 1)>, + <((196608009 / 8) + 1)>, + <(196608010 + 1)>, + + <((196608009 / 8) + 1)>, + <((196608009 / 2) + 1)>, + <((196608009 / 96) + 1)>, + <((196608009 / 4) + 1)>; +}; + +&i2s1 { + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>; + assigned-clock-parents = <&cmu_peric CLK_SCLK_I2S1>; }; &cmu_fsys { @@ -838,6 +893,10 @@ status = "okay"; }; +&i2s1 { + status = "okay"; +}; + &mshc_0 { status = "okay"; mmc-hs200-1_8v; diff --git a/arch/arm64/boot/dts/exynos/exynos5433.dtsi b/arch/arm64/boot/dts/exynos/exynos5433.dtsi index 2b73bd86bc56..c0231d077fa6 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433.dtsi @@ -969,6 +969,7 @@ ddc = <&hsi2c_11>; samsung,syscon-phandle = <&pmu_system_controller>; samsung,sysreg-phandle = <&syscon_disp>; + #sound-dai-cells = <0>; status = "disabled"; };