From patchwork Wed Mar 7 17:46:25 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: 10264621 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 843E76055B for ; Wed, 7 Mar 2018 17:46:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 700AB28C17 for ; Wed, 7 Mar 2018 17:46:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 612012934C; Wed, 7 Mar 2018 17:46:45 +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 441D028C17 for ; Wed, 7 Mar 2018 17:46:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753168AbeCGRqn (ORCPT ); Wed, 7 Mar 2018 12:46:43 -0500 Received: from mailout4.samsung.com ([203.254.224.34]:44298 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751220AbeCGRqm (ORCPT ); Wed, 7 Mar 2018 12:46:42 -0500 Received: from epcas2p2.samsung.com (unknown [182.195.41.54]) by mailout4.samsung.com (KnoxPortal) with ESMTP id 20180307174640epoutp046c9b3512ec1bb4ca02d9f69268ebc21c~ZtH2Q_4x91167511675epoutp04g; Wed, 7 Mar 2018 17:46:40 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout4.samsung.com 20180307174640epoutp046c9b3512ec1bb4ca02d9f69268ebc21c~ZtH2Q_4x91167511675epoutp04g DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1520444800; bh=oz6V6TVo+/BzewIU5Iy1rD10y7MjzZTvMHylnAxhCak=; h=From:To:Cc:Subject:Date:References:From; b=iHHD1OR/VRAx0dmuy3EN3idIFeB9PSEDEVRW0Pq3NyBtF82WY0EPA0A5ZmHj1a443 Fj07GfrSLxsQk6O9VB7+/5iXAnBJZLoGkNKFTWv1kQLFfRcClvlbI2/OnOxTpdcSrL 38UZuWKK3EhQ8M6O4s+W0+kQzGzjbXBt8SWu2yo8= Received: from epsmges2p1.samsung.com (unknown [182.195.42.69]) by epcas2p1.samsung.com (KnoxPortal) with ESMTP id 20180307174639epcas2p1cc935cb44032d94ff2d48f4830d41c6d~ZtH06UuA42349623496epcas2p1C; Wed, 7 Mar 2018 17:46:39 +0000 (GMT) Received: from epcas2p3.samsung.com ( [182.195.41.55]) by epsmges2p1.samsung.com (Symantec Messaging Gateway) with SMTP id 49.D3.04131.F7520AA5; Thu, 8 Mar 2018 02:46:39 +0900 (KST) Received: from epsmgms2p2new.samsung.com (unknown [182.195.42.143]) by epcas2p3.samsung.com (KnoxPortal) with ESMTP id 20180307174638epcas2p33f071928807ccaa40ad07922c15be31c~ZtH0ZmNyo2224122241epcas2p3y; Wed, 7 Mar 2018 17:46:38 +0000 (GMT) X-AuditID: b6c32a45-403ff70000001023-7d-5aa0257f6638 Received: from epmmp2 ( [203.254.227.17]) by epsmgms2p2new.samsung.com (Symantec Messaging Gateway) with SMTP id 3D.F7.03890.E7520AA5; Thu, 8 Mar 2018 02:46:38 +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 <0P5800EYFEPGRD10@mmp2.samsung.com>; Thu, 08 Mar 2018 02:46:38 +0900 (KST) From: Sylwester Nawrocki To: broonie@kernel.org Cc: lgirdwood@gmail.com, alsa-devel@alsa-project.org, devicetree@vger.kernel.org, robh+dt@kernel.org, linux-samsung-soc@vger.kernel.org, b.zolnierkie@samsung.com, m.szyprowski@samsung.com, Sylwester Nawrocki Subject: [PATCH] ASoC: Use proper DT compatible string for Hardkernel Odroid boards Date: Wed, 07 Mar 2018 18:46:25 +0100 Message-id: <20180307174625.16597-1-s.nawrocki@samsung.com> X-Mailer: git-send-email 2.14.2 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrMIsWRmVeSWpSXmKPExsWy7bCmuW696oIog2Ob2SyuXDzEZLFxxnpW i6kPn7BZzD9yjtXi25UOJosZ5/cxWaw9cpfdonXvEXaLw2/aWR04PTZ8bmLz2DnrLrvHplWd bB59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVMW3fabaC5YIVCzdcZ25gPMTXxcjJISFgIrH/ 6FvmLkYuDiGBHYwSEw4uZYVwvjNKtOxdxQZTtWrHWiaIxAZGickdM6BafjFKzNzcwQRSxSZg KNF7tI8RxBYREJO4PacTrIhZ4B2jxLa3T8GKhAVCJVbe3AVmswioSrz9uooZxOYVsJbYu/w+ E8Q6eYn3C+4zgjRLCDSySXSuO8kIkXCRmLTyK5QtLPHq+BZ2CFta4tmqjVDxaonOti52iOYW Rok/0y5BPWEtcfj4RVYQm1mAT6Lj8F+gIg6gOK9ER5sQRImHxIlph1kgbEeJh18Wg80UEoiV eH1oG8sERskFjAyrGMVSC4pz01OLjQoM9YoTc4tL89L1kvNzNzGCo1LLdQfjjHM+hxgFOBiV eHgl/syPEmJNLCuuzD3EKMHBrCTCayS/IEqINyWxsiq1KD++qDQntfgQozQHi5I4b1uAS5SQ QHpiSWp2ampBahFMlomDU6qB8cq75Mdzor/z7Vl32/rZ1l2N5060LbOo2njecmb2NU5usbau oxtOV13Z+ERBNNfx4OXN2g/bl7pssgnbddeEbXvYRrGbZ6qmnIh2fqKQH/vpukDZsfiq2RbB GTLHjzDO9jjgO1tZMyenO6LoR/KqpBVpub1zLxedcpWsURa/cvfav415yb73+pVYijMSDbWY i4oTAegl7jnGAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPJMWRmVeSWpSXmKPExsVy+t9jQd061QVRBuu7lCyuXDzEZLFxxnpW i6kPn7BZzD9yjtXi25UOJosZ5/cxWaw9cpfdonXvEXaLw2/aWR04PTZ8bmLz2DnrLrvHplWd bB59W1YxenzeJBfAGsVlk5Kak1mWWqRvl8CVMW3fabaC5YIVCzdcZ25gPMTXxcjJISFgIrFq x1qmLkYuDiGBdYwSx3deZYNwfjFK7N4/gQmkik3AUKL3aB8jiC0iICZxe04nM0gRs8A7Ronl t16zgiSEBUIlVt7cBdbAIqAq8fbrKmYQm1fAWmLv8vtMEOvkJd4vuM84gZFrASPDKkbJ1ILi 3PTcYqMCo7zUcr3ixNzi0rx0veT83E2MwGDZdlirfwfj4yXxhxgFOBiVeHgl/syPEmJNLCuu zD3EKMHBrCTCayS/IEqINyWxsiq1KD++qDQntfgQozQHi5I4L3/+sUghgfTEktTs1NSC1CKY LBMHp1QDY/KENW/9JtzOrq5bv5fHwvdUTcvrgg7Xy/NL3vzOKr7wcNJxs6vXPY/4tbicefqG QyL8659iIdX7vluXWhy3/BHUlfvoZstH3S0dpSmfbhaUexwuT1iyVTtb5H+DMFevbPwKB9+F zqf/bVgaFs8wJVlP9EuD9CERlQPHJ77Wqi3RPygfzXrOUYmlOCPRUIu5qDgRAAi2uZ4SAgAA X-CMS-MailID: 20180307174638epcas2p33f071928807ccaa40ad07922c15be31c X-Msg-Generator: CA CMS-TYPE: 102P X-CMS-RootMailID: 20180307174638epcas2p33f071928807ccaa40ad07922c15be31c X-RootMTR: 20180307174638epcas2p33f071928807ccaa40ad07922c15be31c 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 The Odroid boards are manufactured by Hardkernel, not Samsung. New compatible string entries are added, with "hardkernel," instead of "samsung," vendor prefix. Support for the old compatible strings is going to be removed after some time. Signed-off-by: Sylwester Nawrocki Reviewed-by: Rob Herring Acked-by: Mark Brown Acked-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/sound/samsung,odroid.txt | 6 +++--- sound/soc/samsung/odroid.c | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/samsung,odroid.txt b/Documentation/devicetree/bindings/sound/samsung,odroid.txt index 625b1b18fd02..f35a2694eb04 100644 --- a/Documentation/devicetree/bindings/sound/samsung,odroid.txt +++ b/Documentation/devicetree/bindings/sound/samsung,odroid.txt @@ -2,8 +2,8 @@ Samsung Exynos Odroid XU3/XU4 audio complex with MAX98090 codec Required properties: - - compatible - "samsung,odroidxu3-audio" - for Odroid XU3 board, - "samsung,odroidxu4-audio" - for Odroid XU4 board + - compatible - "hardkernel,odroid-xu3-audio" - for Odroid XU3 board, + "hardkernel,odroid-xu4-audio" - for Odroid XU4 board - model - the user-visible name of this sound complex - clocks - should contain entries matching clock names in the clock-names property @@ -35,7 +35,7 @@ Required sub-nodes: Example: sound { - compatible = "samsung,odroidxu3-audio"; + compatible = "hardkernel,odroid-xu3-audio"; model = "Odroid-XU3"; samsung,audio-routing = "Headphone Jack", "HPL", diff --git a/sound/soc/samsung/odroid.c b/sound/soc/samsung/odroid.c index 44b6de5a331a..92d750806d1d 100644 --- a/sound/soc/samsung/odroid.c +++ b/sound/soc/samsung/odroid.c @@ -213,8 +213,10 @@ static int odroid_audio_remove(struct platform_device *pdev) } static const struct of_device_id odroid_audio_of_match[] = { + { .compatible = "hardkernel,odroid-xu3-audio" }, + { .compatible = "hardkernel,odroid-xu4-audio" }, { .compatible = "samsung,odroid-xu3-audio" }, - { .compatible = "samsung,odroid-xu4-audio"}, + { .compatible = "samsung,odroid-xu4-audio" }, { }, }; MODULE_DEVICE_TABLE(of, odroid_audio_of_match);