From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756192AbdKCQzo (ORCPT ); Fri, 3 Nov 2017 12:55:44 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:64045 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754653AbdKCQzl (ORCPT ); Fri, 3 Nov 2017 12:55:41 -0400 DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20171103165540epoutp04633691c6ed5247979e1876defbdcf863~zob6l4oJ41088910889epoutp04E X-AuditID: b6c32a37-ef3ff70000001049-d5-59fc9f8b99ca From: Sylwester Nawrocki To: krzk@kernel.org Cc: kgene@kernel.org, mihailescu2m@gmail.com, m.szyprowski@samsung.com, b.zolnierkie@samsung.com, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Sylwester Nawrocki Subject: [PATCH v2 1/2] ARM: dts: exynos: Switch to dedicated Odroid-XU3 sound card binding Date: Fri, 03 Nov 2017 17:54:45 +0100 Message-id: <20171103165446.15438-2-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 In-reply-to: <20171103165446.15438-1-s.nawrocki@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrMIsWRmVeSWpSXmKPExsWy7bCmnm73/D+RBq33TSw2zljPajH/yDlW i/7Hr5ktzp/fwG6x6fE1VovLu+awWcw4v4/JYu2Ru+wW66f9ZLU4/Kad1YHLY+esu+wem1Z1 snlsXlLv0bdlFaPH501yAaxRXDYpqTmZZalF+nYJXBknT09iLvguX3Gz/wJLA+NZyS5GTg4J AROJv92bGbsYuTiEBHYwStx7+ZoFwvnOKHFy5wtGmKppz59BVW1glHh0cz2U84tR4vai/WBV bAKGEr1H+8BsEQFhiXtLl7ODFDELTGOSWDX1IAtIQlggVmLZ4SmsIDaLgKrElKs/mUBsXgFr ie7WTywQ6+Ql3i+4DzaIU8BGYvres2DbJAQWsElsvH8X6iYXietLdrFD2MISr45vAbI5gGxp iUtHbSHq+xklTqxphmqewShxp30CE0SDtcTh4xfBrmAW4JN497WHFaKZV6KjTQiixENiw8le Noiwo8S9Wc4QHwPNvPJlM/MERqkFjAyrGMVSC4pz01OLDQuM9YoTc4tL89L1kvNzNzGCo1bL fAfjhnM+hxgFOBiVeHg3TPgdKcSaWFZcmXuIUYKDWUmE92XRn0gh3pTEyqrUovz4otKc1OJD jNIcLErivGLrr0UICaQnlqRmp6YWpBbBZJk4OKUaGNtzqqtSdn+6e1bo7HnJp36fzarMEoKm Xzq8flOepGDqNZWZVokzPGt6X9z5xHty55PL071u3V73/wzntr7Xjck/NR++X2JdY7zxjtyf 5zuXyXUJFBTcfmkSILvgunDT648nd6zu4ctpKGbV5bwtvKWryCPfe4IVn/oh+Y5Jd2+eqKmz 27Tsg5QSS3FGoqEWc1FxIgC8Vwkh1gIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprNLMWRmVeSWpSXmKPExsVy+t9jQd3u+X8iDTbfUbHYOGM9q8X8I+dY Lfofv2a2OH9+A7vFpsfXWC0u75rDZjHj/D4mi7VH7rJbrJ/2k9Xi8Jt2Vgcuj52z7rJ7bFrV yeaxeUm9R9+WVYwenzfJBbBGcdmkpOZklqUW6dslcGWcPD2JueC7fMXN/gssDYxnJbsYOTkk BEwkpj1/xtjFyMUhJLCOUeLGo2PMEM4vRokXOx+wgVSxCRhK9B7tYwSxRQSEJe4tXc4OUsQs MI1J4tbka2AJYYFYidtTvzGB2CwCqhJTrv4Es3kFrCW6Wz+xQKyTl3i/4D5YPaeAjcT0vWfB bCGgmqcv1jJPYORZwMiwilEytaA4Nz232KjAMC+1XK84Mbe4NC9dLzk/dxMjMMi2Hdbq28F4 f0n8IUYBDkYlHl6Oyb8jhVgTy4orcw8xSnAwK4nwviz6EynEm5JYWZValB9fVJqTWnyIUZqD RUmc93besUghgfTEktTs1NSC1CKYLBMHp1QD48RlizfGZZpkud3afHTNxuC8n0fSE2PXJb3U S+m4sMr1zLvHjzNq9vNtrlN4kBS061PNVL4bv91qajteqsTdb7/O4DH/QrbJMqnIQM3AiNy0 U6JcH9c/czEu1Nmln/Rwik1R1n5dI9ejffEFPTyJF1kt+vbvW15bpPOGuWjqrcjn0jP2iC2P VWIpzkg01GIuKk4EAM6oV80uAgAA X-CMS-MailID: 20171103165539epcas1p48cc87811574dace9dfe91d8e9ec6f7ca X-Msg-Generator: CA CMS-TYPE: 101P X-CMS-RootMailID: 20171103165539epcas1p48cc87811574dace9dfe91d8e9ec6f7ca X-RootMTR: 20171103165539epcas1p48cc87811574dace9dfe91d8e9ec6f7ca References: <20171103165446.15438-1-s.nawrocki@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The new sound card DT binding is used for Odroid XU3 in order to properly support the HDMI audio path. Clocks configuration is changed so the I2S controller is now the bit and the frame clock master with EPLL as the root clock source. Signed-off-by: Sylwester Nawrocki --- arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos5420.dtsi | 1 + arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi | 60 ++++++++++++++--------- 3 files changed, 40 insertions(+), 22 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 5739389f5bb8..f82647c0adb1 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -755,6 +755,7 @@ phy = <&hdmi_i2c_phy>; power-domains = <&pd_tv>; samsung,syscon-phandle = <&pmu_system_controller>; + #sound-dai-cells = <0>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 88e5d6d3f901..6f0414cce854 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi @@ -618,6 +618,7 @@ samsung,syscon-phandle = <&pmu_system_controller>; status = "disabled"; power-domains = <&disp_pd>; + #sound-dai-cells = <0>; }; hdmiphy: hdmiphy@145D0000 { diff --git a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi index da3141a307d5..fe4d8ef094d0 100644 --- a/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi +++ b/arch/arm/boot/dts/exynos5422-odroidxu3-audio.dtsi @@ -1,5 +1,5 @@ /* - * Hardkernel Odroid XU3 Audio Codec device tree source + * Hardkernel Odroid XU3 audio subsystem device tree source * * Copyright (c) 2015 Krzysztof Kozlowski * Copyright (c) 2014 Collabora Ltd. @@ -15,13 +15,13 @@ / { sound: sound { - compatible = "simple-audio-card"; + compatible = "samsung,odroid-xu3-audio"; + model = "Odroid-XU3"; - simple-audio-card,name = "Odroid-XU3"; - simple-audio-card,widgets = + samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - simple-audio-card,routing = + samsung,audio-routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", "Headphone Jack", "MICBIAS", @@ -29,31 +29,47 @@ "Speakers", "SPKL", "Speakers", "SPKR"; - simple-audio-card,format = "i2s"; - simple-audio-card,bitclock-master = <&link0_codec>; - simple-audio-card,frame-master = <&link0_codec>; + assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>, + <&clock CLK_MOUT_EPLL>, + <&clock CLK_MOUT_MAU_EPLL>, + <&clock CLK_MOUT_USER_MAU_EPLL>, + <&clock_audss EXYNOS_MOUT_AUDSS>, + <&clock_audss EXYNOS_MOUT_I2S>, + <&clock_audss EXYNOS_DOUT_SRP>, + <&clock_audss EXYNOS_DOUT_AUD_BUS>, + <&clock_audss EXYNOS_DOUT_I2S>; - simple-audio-card,cpu { + assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>, + <&clock CLK_FOUT_EPLL>, + <&clock CLK_MOUT_EPLL>, + <&clock CLK_MOUT_MAU_EPLL>, + <&clock CLK_MAU_EPLL>, + <&clock_audss EXYNOS_MOUT_AUDSS>; + + assigned-clock-rates = <0>, + <0>, + <0>, + <0>, + <0>, + <0>, + <196608001>, + <(196608002 / 2)>, + <196608000>; + + cpu { sound-dai = <&i2s0 0>; - system-clock-frequency = <19200000>; }; - - link0_codec: simple-audio-card,codec { - sound-dai = <&max98090>; - clocks = <&i2s0 CLK_I2S_CDCLK>; + codec { + sound-dai = <&hdmi>, <&max98090>; }; }; }; &clock_audss { - assigned-clocks = <&clock_audss EXYNOS_MOUT_AUDSS>, - <&clock_audss EXYNOS_MOUT_I2S>, - <&clock_audss EXYNOS_DOUT_AUD_BUS>; - assigned-clock-parents = <&clock CLK_FIN_PLL>, - <&clock_audss EXYNOS_MOUT_AUDSS>; - assigned-clock-rates = <0>, - <0>, - <19200000>; + assigned-clocks = <&clock_audss EXYNOS_DOUT_SRP>, + <&clock CLK_FOUT_EPLL>; + assigned-clock-rates = <(196608000 / 256)>, + <196608000>; }; &hsi2c_5 { -- 2.14.2