From patchwork Thu Dec 1 11:59:09 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Rosin X-Patchwork-Id: 9455911 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 432A160585 for ; Thu, 1 Dec 2016 12:04:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 350AA27FAD for ; Thu, 1 Dec 2016 12:04:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2814A284CB; Thu, 1 Dec 2016 12:04:09 +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=-4.1 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9AF9327FAD for ; Thu, 1 Dec 2016 12:04:08 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCQ2P-0002ij-G8; Thu, 01 Dec 2016 12:00:29 +0000 Received: from mail-ve1eur01on0123.outbound.protection.outlook.com ([104.47.1.123] helo=EUR01-VE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cCQ1o-0001C7-IV for linux-arm-kernel@lists.infradead.org; Thu, 01 Dec 2016 11:59:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axentiatech.onmicrosoft.com; s=selector1-axentia-se; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=6LBkQd2dEDHSrWvkMap0UC5hIuxZPsro/2tGtUcUj5I=; b=wDneHK8iBPVFQxan/N9DrZYsDg6v4pNhd/OhglrQh3o05LaMxObWbYvLwG2l2Ly3FdgqhPePgO4DbpKkqKrTUYlv0XdK2iKBPhqOLsJFPTc/Gg00zxuBIpEghAeYMgr3XthoaBb25PHaEFWVf5IDvrBnEgnLQXEmQLPVvbGvxaI= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=peda@axentia.se; Received: from localhost.localdomain (217.210.101.82) by HE1PR0201MB2315.eurprd02.prod.outlook.com (10.168.145.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.747.13; Thu, 1 Dec 2016 11:59:30 +0000 From: Peter Rosin To: Subject: [PATCH 2/2] ASoC: atmel: tse850: rely on the ssc to register as a cpu dai by itself Date: Thu, 1 Dec 2016 12:59:09 +0100 Message-ID: <1480593549-6464-3-git-send-email-peda@axentia.se> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1480593549-6464-1-git-send-email-peda@axentia.se> References: <1480593549-6464-1-git-send-email-peda@axentia.se> MIME-Version: 1.0 X-Originating-IP: [217.210.101.82] X-ClientProxiedBy: DB5PR03CA0081.eurprd03.prod.outlook.com (10.164.34.49) To HE1PR0201MB2315.eurprd02.prod.outlook.com (10.168.145.150) X-MS-Office365-Filtering-Correlation-Id: a1b9e03e-e673-453f-25ed-08d419e18366 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:HE1PR0201MB2315; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2315; 3:9xAu08x5fnVS8CQ34EjOWLyg4PAcI7aGDKWPMQQX9HPSPssiY1tFQiRPrRbnQfp8gzTDQtddFVl3kQBSHQ4+Xtx+Fj6Lcw2Ir6//aMEByCFG/EkV3UaLEd1zMIG0GZpBMs/nQJvQ7g23wk/LrKw1qRu6oULCJ2mszFNjVuOcS/MKCymsjCPx+30ivnBBD2DvacrsLy0f52ZVi+BAlT9Uc3CZke5Up06EVcsBPd7jX1LZsXrCKfhNIRj3qpVAyso04ihjtp6GCg5gA+oFdHUwhw==; 25:n7UZNctGzR+Wq7Vn5qfeqe2S03cQWeMEKd8MoBvrsBrc2vCyokJK6+xUI5FxCUGSCyuEeorgaNxQtPe4+Cn2ZRB+gtpNkPYxCio6UysQsZTkKFO+OhyFjLxIi4WTvQ7h9pos/FSd2KT0NNDPAGmDXeuuVAX0NpYGVRRsy74MFQ7eHU8EVyaws132N76qzIleicTQNjt/b5sekMSDy6rqbz7eonWGBy0qQrvKd/KyinYAM5lGmMJmo5X0/Zuu9xQJJR08lGblUbVFL8MMxlH/p3b53hlw5PyqGqo12UoOABSBAOcpSqDnQ+bSUy6J+eXQPIat1tFilvU6UsMnYTFqLQJCdMd3YcGF3OAnpFt/ktjCvMvoa+N8yA7DaqlcL7on+oJxUh5502s8Bd7GQvmlrU9m6Hr6FbY7ko/H+mt8zqY4NBOuTocr+DhOipaMxUv2TPRz7oe6DGvnVjUtrBVDfg== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2315; 31:XypjQLrVbpoUcRlXNobxBGtyrHUIhc6wnLdSuhqhCHEYFV6NnUrqOLOewIHxZqqupTLpPUFZKTqwsIrIA4QZW9D0pqi7fxebkuX7GU3jmiSkGD/GwJtCRwsgX6sdeY2Ep3IrLYoCvgi86LyvX7k/iKepHF60NQ4Z1U8ifiv8j6B88jXq2du56j9CKDk5gFnYy5j1wLSFMNe9Rqz2HnROpkzFJmMDmbAbGUechV2letKMkJPy2p3Rgc1hzhGezftlrPTYtOFbzkyokrpdnjt6fA==; 4:jN32f1aOYSN6Or6GXI4I2CjphCa6+0jHdMxmqgsLsRmzomZo/OJ+Vx6PSF9A0k65C1PLkBBu3Ygm3bMr5T8rUl+hmziTwHihk/bqn9SOWICJsNnO2ML8u6kijNg/KMHVjB9PB2WJWc530pI9JL8er7V902vLH8wH3obJ8AfCbtOv2ikgqqymvoq/41T+ANFRCwwiIfHBLYx/ogn/XkPQUKXnQHd3Hl44UzVVY1tOKxYGlD9gLf9ZV50l5J+1LOiZ0fR6RuSvtfcMcRFkzaj55154PODqzx5oe/iuizjbnHpkBKhI+8paNiPN3psE3tRdDLNYRCd0KwrktSf7zpJryWmYUkyOHV7QbjNzeccep+XJw77mDgSr25kp+8XKC7+aFnNLCTWWDIpboeLVWOhEU9iI0+df9SFyWJA0wJzn8R0ufqV424XMFY5hwDtgPvlE6C5rYtNGN1tKoO34xTs0BgQo2fpnIQnXyxvqfxqwGqeUMbPqs3yJYw/YA6WVnEhoBlRVR0PcyZJd7PPMAxoyAAozRJpOO3fcX1EwpjuxC9LwTW6kVveYnl/Kcmgs9fIzJy7TFjBV0QElJ2MlPv4VASt+MHDnR/+i8LlVIR9suNUqzxYLmUP6LfrkR3YonLhA X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6041248)(2016111802025)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6043046)(6072148); SRVR:HE1PR0201MB2315; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0201MB2315; X-Forefront-PRVS: 014304E855 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6069001)(6009001)(7916002)(189002)(199003)(6666003)(39060400001)(2950100002)(2351001)(38730400001)(39410400001)(48376002)(39450400002)(2906002)(4326007)(97736004)(6486002)(36756003)(6916009)(8676002)(6116002)(733004)(50466002)(50226002)(92566002)(81156014)(81166006)(7416002)(74482002)(5003940100001)(189998001)(101416001)(33646002)(110136003)(105586002)(305945005)(5660300001)(47776003)(7846002)(66066001)(106356001)(3846002)(7736002)(42186005)(86362001)(50986999)(76176999)(68736007)(42262002); DIR:OUT; SFP:1102; SCL:1; SRVR:HE1PR0201MB2315; H:localhost.localdomain; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: axentia.se does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HE1PR0201MB2315; 23:H9kJgdcyeZ8W3v6djquZ/KjD5zDKLCwQ+T9Y+2z?= =?us-ascii?Q?kCwo4YyfdFm5jX+VTWqKnbIhp+6teKPYOPzxD5aVbJqAoIxBZpuo7LFt891r?= =?us-ascii?Q?xXCu4XtVAowIhD16RifN3DSI05nFJDz9xwLpaePBI4IEE008bpdGENN+IPo2?= =?us-ascii?Q?YAvT08HnWfEe6KEgsOvswpQ1nhfujiH8+BwZxXAbZDT8fjZqFSJikL5hOVCr?= =?us-ascii?Q?koZRXcMZct/XXdwRbk2792KCT6tDelZgAkeZ1zYeHTugcGGH4ozE2mSZQPlO?= =?us-ascii?Q?6aWFno9zHPsqV0Ney8IjIRlKIyK8Je8d0Tj2L/XJxz06XKMwFDuMk8Qg7QYP?= =?us-ascii?Q?/9KT8AxxrOuaNV4Ywz24kgEJrFKjovzKeahqC2qpQVBNrvHzvEasUjGZR8dq?= =?us-ascii?Q?QJQx8C7w7ECIcUEZqgTT0C5rP2DLFV8mA/rvqzJGoTFC5KWxEr+tF6Ct10mD?= =?us-ascii?Q?hZ8rzcIkMcNuHkUA81pC7Wl68ATykKs11lDKIMQHfYFv0/P6Ow3hF4709hvk?= =?us-ascii?Q?b/JWCJ+wRir/TuiF4WeNCMGaoFvVXfa+0DZ94cYeQbm7fLODj0CzAVEX6MX8?= =?us-ascii?Q?y8UjKopDo7Ics8n+czWxaV0FnOaDPDT4RPJnbtkA6ogDWR59z9HWRQ671JFH?= =?us-ascii?Q?Slvw5rCdNfpBpSvhMaFexxhPvpAw0lwTL1Wj+fztuDOnEJTZhWQwrWgakFme?= =?us-ascii?Q?Nzeu1nEtg+Jrqri2sD55Wwb2/BjkOCpNDW1GtdpEmmvehFen6grKqKHqkKQw?= =?us-ascii?Q?JRkVEIHeulI0FyxtPiOu35JRXDEIu8Ep/qLbk5vntwqV1cU63KWpRzPGGpRe?= =?us-ascii?Q?PWG7nqx3dkYIMtkdZ6DtQ/PqGY+QKi+rr1f0dRC07juE24u5y5a1z1yThcNu?= =?us-ascii?Q?rLwpLCjkIuBba8aK69RVA9kwK2u3anqmyczdeIOaIMWnxfMY350WPyXn4t8W?= =?us-ascii?Q?+kdyJdU8UlR/ExMh//nQcwxf7C8UMH/xwb22PDNfnILYEAp/fM/SegPkXhU5?= =?us-ascii?Q?f2UybH+B7bcY/z74lJNCPyqpB/4ZwVhgna1/X7+xN/FVwDFpc0T2iLVijU7l?= =?us-ascii?Q?X8TjLp4oYPBh+1KwV0VowWwwW16VbvdmWBnlNdmrF69TKDS5Wk41TXqUVytB?= =?us-ascii?Q?yATHVUnmqmz/ZfjIFjTF/8tv0BgXyhdVUKNoqMdLelGyNIh6XB7blUS+fypI?= =?us-ascii?Q?vivMSdV0SIadKZ7wEORtDJBzEvKsW4jXZ3iG4?= X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2315; 6:Cp23UM0fKMLkGD6BZn95IABcKNf/dfXJcA/vokDKuO3KDE+w1+QoRjLRiGfenDOzCjQckUJmVZvPO3zlOa2nH83P7AUOpFBMLa3u6iqYyoBMtBlJxrEB2G2aL1To1dEXXrhsSb2RKRbkD8oxyZGup9k5KJHePndRD+FJYxKhmPlIbYNnKa0nmH+dCA8Yul/3a3w55I7nudGEUiBXQ7VO1Z6JheHujeRPQWsF/Lmj4s4FvHufk0r7k9PRZCdZHcGimPV7C1REIGfcJsx7sQEdlUwXZaGc7CJmQ3aTwevUZmcL4pr8OKgCZ1M/e+aXBypWwmbPSAp9PRexfikTMwcR0vD5iQmufaXW0TYMxyuOkN7h4vN033LhuCOuLG6Uc8D4UNQ0V0YNtwLm8vf0En/tfXesR0lRn7p47wPGMqB6gEKz6HcpDONP3s+/kG2kfY1WHq1RXgkaGS+9CLi1da7aoWS41sQXxYBDQVpX8MeRLJw=; 5:vmar9gd8mT5oofq2Qo/Z/J00HR3aQPYrBMtxjum4/s1Y9AS1U+kEsXrF09TRRReeFWIWjP93otmbZcO3k6qzaEoROmyVE+mjQxMCG0xEPonuGpXc9vmHDYO5WxCrY30V9t/oGnMKhnCNz1bK86EBM3raD3njnZKfa/EWifhadvQ=; 24:evF0f07EaasDfwpK8TLchfvWTEsobzCWg0CWjXp6MldxpFg4q30GuZ8jNFyUoQEx6QUS2+olQLSknGp2V416GZFCsfzUGvpAZRJ2OEJIVGU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HE1PR0201MB2315; 7:wa5a5xudrEwJecKQ4GEY8Wvug8aUoH2cK2EyLL/p4f7IDHxcddXgkhZIEq/PrsNZ4WnmriKFFWiqxSFMA3ps38M6kpTbRFxpErfkajRF2NqZ67MutHeYj/5HA5lTdtfqeRuT+FBU4ibABNfxs49WLUOPYkpYs25tnaX2fMRWMfgCYhrb+VH9fRQ13WjezMy4ssycIRsfBs0f6CZJm79jqlwCmOoYwaCnArdjHmitMV59GcXPo8CNqvDSLC0LDaVoTg5TeljMmYqSsCrO9FdEjE6fdV+Y/f08rnG9yXXcUchiiJN0TG+bcX3TRiqgZclGutqOOiRTEmJFHcuCeIPpxGvdWnwOe89FaqtBvECDDy+cSKN04I2E+5SRVEjboeGIzr+ZDlW0Fi8Wjce6h3SG1ncj7uzVKhgLxu1K/lgxdbwNmfvSDB0MaHwe9SAFHPCZssLxibZIMqPI8JMzAl5EDQ== X-OriginatorOrg: axentia.se X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Dec 2016 11:59:30.5728 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0201MB2315 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161201_035952_900978_5921C422 X-CRM114-Status: GOOD ( 11.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, alsa-devel@alsa-project.org, Arnd Bergmann , Greg Kroah-Hartman , Takashi Iwai , Nicolas Ferre , Liam Girdwood , Rob Herring , Jaroslav Kysela , Mark Brown , netdev@vger.kernel.org, Peter Rosin , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Peter Rosin --- .../bindings/sound/axentia,tse850-pcm5142.txt | 5 ++--- sound/soc/atmel/tse850-pcm5142.c | 23 +++------------------- 2 files changed, 5 insertions(+), 23 deletions(-) diff --git a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt index 5b9b38f578bb..fd12ecb35b5c 100644 --- a/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt +++ b/Documentation/devicetree/bindings/sound/axentia,tse850-pcm5142.txt @@ -2,8 +2,7 @@ Devicetree bindings for the Axentia TSE-850 audio complex Required properties: - compatible: "axentia,tse850-pcm5142" - - axentia,ssc-controller: The phandle of the atmel SSC controller used as - cpu dai. + - axentia,cpu-dai: The phandle of the cpu dai. - axentia,audio-codec: The phandle of the PCM5142 codec. - axentia,add-gpios: gpio specifier that controls the mixer. - axentia,loop1-gpios: gpio specifier that controls loop relays on channel 1. @@ -77,7 +76,7 @@ Example: sound { compatible = "axentia,tse850-pcm5142"; - axentia,ssc-controller = <&ssc0>; + axentia,cpu-dai = <&ssc0>; axentia,audio-codec = <&codec>; axentia,add-gpios = <&pioA 8 GPIO_ACTIVE_LOW>; diff --git a/sound/soc/atmel/tse850-pcm5142.c b/sound/soc/atmel/tse850-pcm5142.c index ac6a814c8ecf..a72c7d642026 100644 --- a/sound/soc/atmel/tse850-pcm5142.c +++ b/sound/soc/atmel/tse850-pcm5142.c @@ -51,11 +51,7 @@ #include #include -#include "atmel_ssc_dai.h" - struct tse850_priv { - int ssc_id; - struct gpio_desc *add; struct gpio_desc *loop1; struct gpio_desc *loop2; @@ -329,23 +325,20 @@ static int tse850_dt_init(struct platform_device *pdev) { struct device_node *np = pdev->dev.of_node; struct device_node *codec_np, *cpu_np; - struct snd_soc_card *card = &tse850_card; struct snd_soc_dai_link *dailink = &tse850_dailink; - struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card); if (!np) { dev_err(&pdev->dev, "only device tree supported\n"); return -EINVAL; } - cpu_np = of_parse_phandle(np, "axentia,ssc-controller", 0); + cpu_np = of_parse_phandle(np, "axentia,cpu-dai", 0); if (!cpu_np) { - dev_err(&pdev->dev, "failed to get dai and pcm info\n"); + dev_err(&pdev->dev, "failed to get cpu dai\n"); return -EINVAL; } dailink->cpu_of_node = cpu_np; dailink->platform_of_node = cpu_np; - tse850->ssc_id = of_alias_get_id(cpu_np, "ssc"); of_node_put(cpu_np); codec_np = of_parse_phandle(np, "axentia,audio-codec", 0); @@ -415,23 +408,14 @@ static int tse850_probe(struct platform_device *pdev) return ret; } - ret = atmel_ssc_set_audio(tse850->ssc_id); - if (ret != 0) { - dev_err(dev, - "failed to set SSC %d for audio\n", tse850->ssc_id); - goto err_disable_ana; - } - ret = snd_soc_register_card(card); if (ret) { dev_err(dev, "snd_soc_register_card failed\n"); - goto err_put_audio; + goto err_disable_ana; } return 0; -err_put_audio: - atmel_ssc_put_audio(tse850->ssc_id); err_disable_ana: regulator_disable(tse850->ana); return ret; @@ -443,7 +427,6 @@ static int tse850_remove(struct platform_device *pdev) struct tse850_priv *tse850 = snd_soc_card_get_drvdata(card); snd_soc_unregister_card(card); - atmel_ssc_put_audio(tse850->ssc_id); regulator_disable(tse850->ana); return 0;