From patchwork Fri May 11 08:09: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: 10393567 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 B7F65601A0 for ; Fri, 11 May 2018 08:10:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9FAF52015F for ; Fri, 11 May 2018 08:10:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 92DBE28E22; Fri, 11 May 2018 08:10:58 +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=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=unavailable 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 022AB2015F for ; Fri, 11 May 2018 08:10:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752675AbeEKIKj (ORCPT ); Fri, 11 May 2018 04:10:39 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:50796 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752663AbeEKIKe (ORCPT ); Fri, 11 May 2018 04:10:34 -0400 Received: from epcas2p4.samsung.com (unknown [182.195.41.56]) by mailout1.samsung.com (KnoxPortal) with ESMTP id 20180511081032epoutp0130c34873df7e1aa56ec53782a6209ead~tiMYA2Q3y0922009220epoutp01F; Fri, 11 May 2018 08:10:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.samsung.com 20180511081032epoutp0130c34873df7e1aa56ec53782a6209ead~tiMYA2Q3y0922009220epoutp01F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1526026232; bh=KOHfGvrh0dS25XvTMtcCNGpV0yStaCYjefiQjd5KVfU=; h=From:To:Cc:Subject:Date:References:From; b=Y06G+bCFPNdluTyAfPvI1kerWPO4y/lzfwM9GsF3JHV8fjLFkAoZMaLQy15fHKuk0 cEAc2//z+ttc4CU0kngndwj5CsV0nDzawQGpK6IQgbIwFN5OP47URVCRUzWgF84s/1 mz6W3MbLO1DVBPhal1qp04yvf5Z1XeuZfVQd3iB0= Received: from epsmges2p3.samsung.com (unknown [182.195.42.71]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20180511081032epcas2p1d31f71692beb8880184ac5b4367867fd~tiMXseEVP2498524985epcas2p1A; Fri, 11 May 2018 08:10:32 +0000 (GMT) Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p3.samsung.com (Symantec Messaging Gateway) with SMTP id 4B.87.04113.8FF45FA5; Fri, 11 May 2018 17:10:32 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20180511081032epcas2p30f381cf699cb7524d9a143390e9c74b5~tiMXU82Tk0546905469epcas2p3O; Fri, 11 May 2018 08:10:32 +0000 (GMT) X-AuditID: b6c32a47-bdfff70000001011-7c-5af54ff8eec3 Received: from epmmp1.local.host ( [203.254.227.16]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id DA.61.03817.7FF45FA5; Fri, 11 May 2018 17:10:31 +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 <0P8K002VB1CERS30@mmp1.samsung.com>; Fri, 11 May 2018 17:10:31 +0900 (KST) From: Sylwester Nawrocki To: krzk@kernel.org Cc: robh+dt@kernel.org, devicetree@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH] ARM: dts: exynos: Use dedicated DT bindings for Odroid X/X2, U3 Date: Fri, 11 May 2018 10:09:47 +0200 Message-id: <20180511080947.3057-1-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrDIsWRmVeSWpSXmKPExsWy7bCmue4P/69RBucWiltsnLGe1WL+kXOs FufPb2C32PT4GqvF5V1z2CxmnN/HZLH2yF12i9a9R9gtDr9pZ3Xg9Ni0qpPNY/OSeo++LasY PT5vkgtgieKySUnNySxLLdK3S+DKOLMqsOCddMXt/jlMDYzd4l2MnBwSAiYSJzesZuli5OIQ EtjBKHGw8SU7hPOdUeLztGtsMFW7Hp5khUjsZpQ49PoaVNUvRom5W14wgVSxCRhK9B7tYwSx RQSEJe4tXQ5WxCzQwCTx78EusCJhgSCJ92fmgtksAqoSK95NYAGxeQWsJL5f2scEsU5e4v2C +4wgzRICX1klrt1bAJVwkVjRP50VwhaWeHV8CzuELS3xbNVGRgi7WqKzrYsdormFUeLPtEtQ T1hLHD5+EayZWYBPouPwX6AiDqA4r0RHmxBEiYfElJ1dUDMdJWZuvAC2V0ggVmLmy6tsExgl FzAyrGIUSy0ozk1PLTYqMNYrTswtLs1L10vOz93ECI5DLfcdjNvO+RxiFOBgVOLhlYj5EiXE mlhWXJl7iFGCg1lJhHffCqAQb0piZVVqUX58UWlOavEhRmkOFiVx3jVKX6OEBNITS1KzU1ML UotgskwcnFINjDN3btPxXnKNo6Dq9mUr81nnnz96sWWDRNjKwiur5Xb/j/4b9kPQ1l9A3GW6 4Owbj7+JLeiRMExYHfjTZwb33nkTd8v9UeNQtzh0ZAnjC3d+y7Af7UHq2wQeGFRmGcr5x3eu PL/z3uqa3eEFy5iuMm9YzjtrAs+vB02iMQ4TxdednPO9Joxr2VwlluKMREMt5qLiRADbKF4U vwIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOJMWRmVeSWpSXmKPExsVy+t9jAd3v/l+jDOYsN7PYOGM9q8X8I+dY Lc6f38BusenxNVaLy7vmsFnMOL+PyWLtkbvsFq17j7BbHH7TzurA6bFpVSebx+Yl9R59W1Yx enzeJBfAEsVlk5Kak1mWWqRvl8CVcWZVYME76Yrb/XOYGhi7xbsYOTkkBEwkdj08yQpiCwns ZJTobtftYuQCsn8xSly/t4EZJMEmYCjRe7SPEcQWERCWuLd0OTtIEbNAA5PE20Nf2UASwgIB ErMO32MHsVkEVCVWvJvAAmLzClhJfL+0jwlim7zE+wX3GScwci1gZFjFKJlaUJybnltsVGCU l1quV5yYW1yal66XnJ+7iREYHNsOa/XvYHy8JP4QowAHoxIPb0POlygh1sSy4srcQ4wSHMxK Irz7VgCFeFMSK6tSi/Lji0pzUosPMUpzsCiJ8/LnH4sUEkhPLEnNTk0tSC2CyTJxcEo1MBoc NixLmV3cOD/tGKtqeJBBgPuZaVOfLTAstXY5sF9foHGTQN0UL1cOgTVSAWr2j9/8aJKSlnBu vqLfklf/Qbvh4eKFXywaJsgsiQn79r7TsvPXDKUtSWd3dB84zlIdzLv89utFrJIb3E+msVcd d/+5eobPo1Uz5lX+Tm77eKiZSyO8523xTSWW4oxEQy3mouJEAL8eyWoKAgAA X-CMS-MailID: 20180511081032epcas2p30f381cf699cb7524d9a143390e9c74b5 X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20180511081032epcas2p30f381cf699cb7524d9a143390e9c74b5 X-RootMTR: 20180511081032epcas2p30f381cf699cb7524d9a143390e9c74b5 References: 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 Use dedicated Odroid audio subsystem DT bindings instead of the simple-card. This adds support for audio on the HDMI interface. Signed-off-by: Sylwester Nawrocki --- arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 33 ++++++++++++++----------- arch/arm/boot/dts/exynos4412-odroidu3.dts | 7 +++--- arch/arm/boot/dts/exynos4412-odroidx.dts | 7 +++--- 3 files changed, 27 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi index d7ad07fd48f9..bad08e70358a 100644 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi @@ -37,20 +37,12 @@ }; sound: sound { - compatible = "simple-audio-card"; - - simple-audio-card,format = "i2s"; - simple-audio-card,bitclock-master = <&link0_codec>; - simple-audio-card,frame-master = <&link0_codec>; - - simple-audio-card,cpu { + 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>; }; }; @@ -142,14 +134,25 @@ pinctrl-0 = <>; }; +&clock { + assigned-clocks = <&clock CLK_FOUT_EPLL>; + assigned-clock-rates = <45158401>; +}; + &clock_audss { assigned-clocks = <&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_AUD_BUS>, + <&clock_audss EXYNOS_DOUT_I2S>; + assigned-clock-parents = <&clock CLK_FOUT_EPLL>, - <&clock_audss EXYNOS_MOUT_AUDSS>; - assigned-clock-rates = <0>, <0>, <192000000>, <19200000>; + <&clock_audss EXYNOS_MOUT_AUDSS>; + + assigned-clock-rates = <0>, <0>, + <196608001>, + <(196608001 / 2)>, + <(196608001 / 8)>; }; &cpu0 { @@ -498,6 +501,8 @@ pinctrl-0 = <&i2s0_bus>; pinctrl-names = "default"; status = "okay"; + assigned-clocks = <&i2s0 CLK_I2S_RCLK_SRC>; + assigned-clock-parents = <&clock_audss EXYNOS_SCLK_I2S>; }; &mixer { diff --git a/arch/arm/boot/dts/exynos4412-odroidu3.dts b/arch/arm/boot/dts/exynos4412-odroidu3.dts index bdcd4523cc1c..7a94a423097d 100644 --- a/arch/arm/boot/dts/exynos4412-odroidu3.dts +++ b/arch/arm/boot/dts/exynos4412-odroidu3.dts @@ -113,11 +113,12 @@ }; &sound { - simple-audio-card,name = "Odroid-U3"; - simple-audio-card,widgets = + compatible = "hardkernel,odroid-xu4-audio"; + model = "Odroid-U3"; + samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - simple-audio-card,routing = + samsung,audio-routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", "Headphone Jack", "MICBIAS", diff --git a/arch/arm/boot/dts/exynos4412-odroidx.dts b/arch/arm/boot/dts/exynos4412-odroidx.dts index 2dff129bc2ad..f0d5037f3a5d 100644 --- a/arch/arm/boot/dts/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/exynos4412-odroidx.dts @@ -97,12 +97,13 @@ }; &sound { - simple-audio-card,name = "Odroid-X"; - simple-audio-card,widgets = + compatible = "hardkernel,odroid-xu4-audio"; + model = "Odroid-X"; + samsung,audio-widgets = "Headphone", "Headphone Jack", "Microphone", "Mic Jack", "Microphone", "DMIC"; - simple-audio-card,routing = + samsung,audio-routing = "Headphone Jack", "HPL", "Headphone Jack", "HPR", "IN1", "Mic Jack",