From patchwork Mon Feb 12 16:31:47 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: 10213523 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 8161760236 for ; Mon, 12 Feb 2018 16:32:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7290828A4C for ; Mon, 12 Feb 2018 16:32:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 673E428AF8; Mon, 12 Feb 2018 16:32:17 +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 E0D3B28A4C for ; Mon, 12 Feb 2018 16:32:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964922AbeBLQcQ (ORCPT ); Mon, 12 Feb 2018 11:32:16 -0500 Received: from mailout3.samsung.com ([203.254.224.33]:15264 "EHLO mailout3.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S964902AbeBLQcO (ORCPT ); Mon, 12 Feb 2018 11:32:14 -0500 Received: from epcas2p3.samsung.com (unknown [182.195.41.55]) by mailout3.samsung.com (KnoxPortal) with ESMTP id 20180212163213epoutp0398449b6fdc21408e7e70fe69daadad01~SoRRsoctg3213332133epoutp03h; Mon, 12 Feb 2018 16:32:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout3.samsung.com 20180212163213epoutp0398449b6fdc21408e7e70fe69daadad01~SoRRsoctg3213332133epoutp03h DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1518453133; bh=DrqIXDInwpL6Z43EcHRk6PNgx3k6QVW7uvjEH2/81zc=; h=From:To:Cc:Subject:Date:In-reply-to:References:From; b=UmgnkhUUfWBf7kvJvO/1m+p1PwGMLdAWL+Mv/XIOkCFQRRT+3/BDaLvrgjDf4K/F+ mhLPRGf+xhIkjrAkbUXGjAuergsQaRWAV4f9nytIDB05wmo1YvT9sAbGjuVgbESw3A sJmDDJvgiQcXxSA60i3IUyPtm9oP8X02iz1Wwsxw= Received: from epsmges2p4.samsung.com (unknown [182.195.42.72]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20180212163212epcas2p3a64ef5d3aef92dc3fc5b2ff2a47b7f0a~SoRRDUfhW2148021480epcas2p37; Mon, 12 Feb 2018 16:32:12 +0000 (GMT) Received: from epcas2p1.samsung.com ( [182.195.41.53]) by epsmges2p4.samsung.com (Symantec Messaging Gateway) with SMTP id 88.2F.04080.C81C18A5; Tue, 13 Feb 2018 01:32:12 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20180212163212epcas2p15a43c33e24b6c800544637ca0b030cb6~SoRQyfttF2265322653epcas2p1s; Mon, 12 Feb 2018 16:32:12 +0000 (GMT) X-AuditID: b6c32a48-9adff70000000ff0-b1-5a81c18ca2ec Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id FD.A3.03890.C81C18A5; Tue, 13 Feb 2018 01:32:12 +0900 (KST) Received: from AMDC3061.digital.local ([106.116.147.40]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0P4100BZYPX67T90@mmp1.samsung.com>; Tue, 13 Feb 2018 01:32:12 +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 v3 3/3] ARM: dts: exynos: Add support for HDMI audio on exynos5433-tm2 Date: Mon, 12 Feb 2018 17:31:47 +0100 Message-id: <20180212163147.11561-3-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20180212163147.11561-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsWy7bCmqW7PwcYog22/dCw2zljPajH/yDlW i7f7u5kt+h+/ZrY4f34Du8Wmx9dYLWac38dksfbIXXaLw2/aWR04PTat6mTz2Lyk3qNvyypG j8+b5AJYorhsUlJzMstSi/TtErgydh3+yFowXa7ix+TzjA2MUyW7GDk5JARMJBZeO8TUxcjF ISSwg1Hi157prBDOd0aJ5T/essBUffw/iREisZtRYvGy5SwQzi9GiWedC8Gq2AQMJXqP9jGC 2CICwhL3li5nByliFvjBKLHrC8hcTg5hgQiJ2Qu2MIPYLAKqEuv3TwNr4BWwlmifdIYZYp28 xPsF98HinAI2Eg0rtoANkhCYwCbxvfET1E0uEs8W/WKEsIUlXh0HKQKxpSWerdrICNHQzyjx 8fh+FghnNaPE62+7WCGqrCUOH78IZjML8El0HP4L1M0BFOeV6GgTgijxkJg64yMThO0o8eDc fXaIn4GGrp31jXkCo9QCRoZVjGKpBcW56anFRgUmesWJucWleel6yfm5mxjBUarlsYPxwDmf Q4wCHIxKPLwdsxujhFgTy4orcw8xSnAwK4nw/mkGCvGmJFZWpRblxxeV5qQWH2KU5mBREudt C3CJEhJITyxJzU5NLUgtgskycXBKNTBKb/jyluGIw4IO5ge/9s77rLb1ueOJ/PQoRoFZrvzP F5/9fvjtuVBlqd7/Qf85Ps0O2PNM47/MrFNHP5y8/UvxQI7qUvMFhcxaVrMi2ZZ+bPl+Tet+ kY/CtP8LtO6f1z113OhSrcT0C49fLmH6uCGo9NbsK7IiCsE7HXjbPc4wu1SusI86MX1roxJL cUaioRZzUXEiAIitfbjOAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprALMWRmVeSWpSXmKPExsVy+t9jAd2eg41RBuvWS1lsnLGe1WL+kXOs Fm/3dzNb9D9+zWxx/vwGdotNj6+xWsw4v4/JYu2Ru+wWh9+0szpwemxa1cnmsXlJvUffllWM Hp83yQWwRHHZpKTmZJalFunbJXBl7Dr8kbVgulzFj8nnGRsYp0p2MXJySAiYSHz8P4kRxBYS 2MkoseiGTxcjF5D9i1Fi25KL7CAJNgFDid6jfWBFIgLCEveWLmcHKWIW+MEo8XnXRrCEsECE xOwFW5hBbBYBVYn1+6eBxXkFrCXaJ51hhtgmL/F+wX2wOKeAjUTDii3sEJutJda+Pcc8gZFn ASPDKkbJ1ILi3PTcYqMCo7zUcr3ixNzi0rx0veT83E2MwHDadlirfwfj4yXxhxgFOBiVeHg7 ZjdGCbEmlhVX5h5ilOBgVhLh/dMMFOJNSaysSi3Kjy8qzUktPsQozcGiJM7Ln38sUkggPbEk NTs1tSC1CCbLxMEp1cCY7WXkdnDBg9k9bOs4105ev+CHtclXu/trxDb9a94YUXy4+vXvg3tF HDrDcvUfmNW8OfWxR/1znZ0H26dohcWG7JWZQdvmFj29l/9ryS+luX2zt8spMn0+7nk8RGF6 2ayre4pfaDBpxcg13K5yk4yaHXZFy425NOXl6oa3uj1v5Qz0LazKEkuUWIozEg21mIuKEwFh 6Gk0IwIAAA== X-CMS-MailID: 20180212163212epcas2p15a43c33e24b6c800544637ca0b030cb6 X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20180212163212epcas2p15a43c33e24b6c800544637ca0b030cb6 X-RootMTR: 20180212163212epcas2p15a43c33e24b6c800544637ca0b030cb6 References: <20180212163147.11561-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 --- Changes since v2: - nodes sorted alphabetically, changed the assigned clock frequencies. Changes since v1: - dropped unnecessary assigned-clock* properties for AUD PLL in cmu_top node, - changed default AUD PLL frequency so it is within recommended 252...400 MHz range. --- .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 52 ++++++++++++++++++++-- arch/arm64/boot/dts/exynos/exynos5433.dtsi | 1 + 2 files changed, 49 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..b73c389e1a8b 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"; @@ -217,8 +218,40 @@ }; &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>, + <196608001>, <65536001>, <32768001>, <49152001>, + <2048001>, <24576001>, <196608001>, + <24576001>, <98304001>, <2048001>, <49152001>; }; &cmu_fsys { @@ -267,6 +300,11 @@ <&cmu_top CLK_MOUT_BUS_PLL_USER>; }; +&cmu_top { + assigned-clocks = <&cmu_top CLK_FOUT_AUD_PLL>; + assigned-clock-rates = <196608001>; +}; + &cpu0 { cpu-supply = <&buck3_reg>; }; @@ -838,6 +876,12 @@ status = "okay"; }; +&i2s1 { + assigned-clocks = <&i2s1 CLK_I2S_RCLK_SRC>; + assigned-clock-parents = <&cmu_peric CLK_SCLK_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"; };