From patchwork Fri Sep 3 14:53:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 506538 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp1069684jai; Fri, 3 Sep 2021 07:54:02 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxMnHy65EOLGLnSmVwrwMz1X0fewyu2CNs/80IxUGZjLrJUyunjWWNncL+bHt9SJ8HwR2W5 X-Received: by 2002:a17:906:f987:: with SMTP id li7mr4567593ejb.238.1630680842532; Fri, 03 Sep 2021 07:54:02 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1630680842; cv=pass; d=google.com; s=arc-20160816; b=IwN8DokTyC3L53gsIuQT1KRHwOmtuFLgRIvauWjpuIhFqzX2V2lmn3sQQ303HoOvFp u3u02IszkBOhVhLaTR54u++cKdGxrcs18C6rkviCt9nR2wiwlnu9ns2SRIJqKjQKZniI 4vsuqOqn+nsjjIdbaRRMis4lf03jvsDQGTPByhs/AiMjLDrkKvEkDVoHxlsyfAXuuYj7 dndPe5AFU9WOrINrf6re1oaSoS39ni+PwVww1hx6NPT/btxD/MQGP2uIcjeuPpDLC/Nq DdEZ9KS9Eoro9CB9+G5+tXgJgl76K44D8kJ3p19Zk9ENQEcAWsC11RrWuABmPCLx3mdN VgFA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=lxkVM+lIDeGVZ9KQ2SdnVmjtkLWXupqDq2NlzIAS/rY=; b=MMZBh48cjMzVMEl0YhYFPcVVQ3tZgCclVxbW8iJLaN3+fJNdxnlbqNp6W2lOvCpMMr VOhfbG/C6hXz1k6CWwoOl+k/WZEQyT8eFRyeu+AalDs6M2ipmuMkHPiYvt2nWjnuh737 TQHBFjzJfBQceru8ShIWvJgvDsX3puvUDbs6rq6AVe1z6x0YGNzZKceZ9QzlD7Tu5yVo sZWdEHO5fDhNdgqdvs/HfiAHzLeR7+yv++VYuLK350ULfCE+CAMu1j9FYXrngUSIg5R8 WPKzgnnYsJM/EzRHwDrTjpypWrNfAd3fKFKp2iVc51sys/b48efsItlBNvLuEVnRPQki e3TQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=PbKZLmxN; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h5si4813747ejj.144.2021.09.03.07.54.02; Fri, 03 Sep 2021 07:54:02 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=PbKZLmxN; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349058AbhICOzA (ORCPT + 6 others); Fri, 3 Sep 2021 10:55:00 -0400 Received: from mail-eopbgr150081.outbound.protection.outlook.com ([40.107.15.81]:11191 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1349217AbhICOy7 (ORCPT ); Fri, 3 Sep 2021 10:54:59 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kGgQ/eni/Chg89iOjOI4P/EW+1F1iXKcyrd9LnEVQS/qgJ37KkuWysm1gcHp9GhuEG6J0lyC3W8Grj2pPRk63594SzAwW6wjeQ4Ajw85aG7RuMOq/D2vWDhg2iGvKIkONE5/z+lsRFgLx9K4pKXrokR8DbEqCT2o5/8jExvm2HXpWmMyhalrU1CGUR4kck9IAz3lEF0Lr44fNCwBXkEBz3qFq7ExSDiP9mIx1nyhfS7nuRxc4qwCL0XD/DuOLwpkeH+aSvg20h3cTG75N7wEVCnVmu+wBQxrpk1Y5VPjwzmhYxGqzEItkVdiHjdoKMO9E76BUs3Cdf+38E7TPfuvAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=lxkVM+lIDeGVZ9KQ2SdnVmjtkLWXupqDq2NlzIAS/rY=; b=I3dfqy+I5Ph0eBl0QxiDaD5E6WEmkITPeYqEySijZdRglhuMocI3AFsBmRlEljvkdDIwKOjBeD5pVoG6JnHB9PeFd0cqYH90GJ7ZNJvuHMRRxNsKvYpc/fnilHTP/gd5ODjh0Ax+Y+l9tr3R6Z16/3xGAi000wG3TMSn4ZV6AzjDvff+/3pxxpdx9O8TUka9U3DcSflnGWW54oabaG2uQhk5/a0z6JRkybEpfbFpGAMVtIBDxhGJRNBAgEvAcBXvCtOK3HVpjWu7zeOlIKISPZ62FVM8k3jtz2D8hYx24ZpCp3C2sfYWMY8evr/Q5f7Mq2lqhjbRxBDY8PxO1Oq8aA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=lxkVM+lIDeGVZ9KQ2SdnVmjtkLWXupqDq2NlzIAS/rY=; b=PbKZLmxNn/r6KW1geUoFJeagI7AHsgWPAT8+NNkf1K5FnkwAonpsTeaOaQvhhkP0XSDxDpxs0hakI+C/1bSe3OgKFH3hxzZ76YOgtJWgqA9Q3jibPpMir7I1o3bqyGyiAZjCdziwx6x8cYwWEF+bNJa+2YGizxFOM+CfM2ZyGdI= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5151.eurprd04.prod.outlook.com (2603:10a6:803:61::28) by VI1PR0401MB2654.eurprd04.prod.outlook.com (2603:10a6:800:58::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Fri, 3 Sep 2021 14:53:55 +0000 Received: from VI1PR04MB5151.eurprd04.prod.outlook.com ([fe80::499b:ba92:db2e:3f28]) by VI1PR04MB5151.eurprd04.prod.outlook.com ([fe80::499b:ba92:db2e:3f28%7]) with mapi id 15.20.4457.026; Fri, 3 Sep 2021 14:53:55 +0000 From: Daniel Baluta To: broonie@kernel.org, pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com, robh+dt@kernel.org, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com Cc: devicetree@vger.kernel.org, shawnguo@kernel.org, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, peter.ujfalusi@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, s-anna@ti.com, Daniel Baluta Subject: [PATCH v2 1/2] ASoC: SOF: imx: Add code to manage DSP related clocks Date: Fri, 3 Sep 2021 17:53:39 +0300 Message-Id: <20210903145340.225511-2-daniel.baluta@oss.nxp.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210903145340.225511-1-daniel.baluta@oss.nxp.com> References: <20210903145340.225511-1-daniel.baluta@oss.nxp.com> X-ClientProxiedBy: VI1PR07CA0200.eurprd07.prod.outlook.com (2603:10a6:802:3f::24) To VI1PR04MB5151.eurprd04.prod.outlook.com (2603:10a6:803:61::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:2f08:5708:8600:fd8d:b9e7:97b5:dd4a) by VI1PR07CA0200.eurprd07.prod.outlook.com (2603:10a6:802:3f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.4 via Frontend Transport; Fri, 3 Sep 2021 14:53:54 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c5272852-651b-4dad-c925-08d96eeaa71e X-MS-TrafficTypeDiagnostic: VI1PR0401MB2654: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6108; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /JcwRlRHY9A+/xyXBPbAhIbn/7JLnyjfmQGM0A+SqohBrQQHeouP9co2vg2KvRu76MBV7hwhGoK6xWH9zn114s+Dc7rAi1gCtT+t0CQKNoVtrAh6xguzOUPNutvJS0S7q0WAiuBsghTXRGzsChvOJ3JRK4o2LvVS7iX0bniktQ5Gmxqxz3PvRt2nRWPSN9M9jw7JnpPzCZ0ayAVFUxq6XRGhC/WOdAKJcYSSMDOf78UVDwRi0TytNdyO8UXrQqvQMs/gbfjtNRclfpRGQqbACY+hDLYZqeifaCRiYJPi7my4nO8AIAIYFalvZzj9Zw4+f6obinAQdEk+9HuLbyfVYlgOPUtzSvOZBVG3TNOh7SLEAcKvYE6U2iuRb6/fKf5lmdDcHEbtNAqZOeIiae48UmY3F5TCYfDHAM6gnQegE8rPbftWSwpQHXp49FNBVo2dNtbXycfVMs9mi51TK5oSJ1CTsxCbhp3gyYFzip6G1zAVIPTOyJBqt/MLvkGlBocabTJp0MInkUAWHdudL8avcOp1KFjEP8M6fZ63QxStnwqU4TVstkJT/60m6w8MhSn11J47hkmJWPdzAodNN6C15/ERDO9/MxLqiUnymCS8NHsuJpejJ/dVgZNWAKrn958QlGrpS3xUvs0zrWFjkKBWng== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5151.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(38100700002)(66946007)(44832011)(52116002)(6506007)(86362001)(8676002)(6666004)(5660300002)(316002)(2906002)(66556008)(4326008)(6512007)(6486002)(66476007)(508600001)(2616005)(1076003)(83380400001)(8936002)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: AWs9qUU7i44nvULr7my5KJGwO3tBjZUvcgpJX4MiQai7/+f0zy2f7GAUEwyWTtIOucUWLelssUHI+OZcKwSTVAtBsPFvj4ObuNYXupKDb5GB5KCDQt+ACfg1hUEHrBOwDX8se4SUEUFitxsCESk8zMuGXDHuHxogfnAiPQFNNyJJqcpZBtj7Gx8Upr5fuF4IunDNcz12Y2XJmm3ro3PwSdrSahUWPofxDyWvdJWHhpmeX/VY0EtsDMBydQSkE0XejpFwSZH+KmqEb/SYZQO6xCVHNESk2Hgn9VWrkocXMinKxfFRJbvq8HKCKILnX/R4UIm6K1pyVOneAlFl3uKlVEWQqDqX9bQr0NlITrY4GGm7eJDoRHX+iE6iZdxtYioFVo2Vs2AIzhOiRxmwcFdbhnep3+DYBCErWCB3KzHksyougRpVH2zHd5P8FIJq05G2Ex4n/f7YRRQw0PBCpLbQUMWRjhpWzF0r2ebgc8ycSzywZXEsGVPVX/5UK+KkhWFhB44EAINdqd8i90f2qJJFi2RSmkii9N9oj9+f1XQ9H6bDn/pO9FCYL4Txnu5bzNgytiATMHPpN8+0S9o45SIeCsQeyPjHfTycT8LdTjNkQr+JIiqqC0Nze3lezgjFy5ZYHmPygx+g0v2D8C7IODkX9E5WcKWkQQpAL+6VQ6pA3L6xcYVkE9NSmxpI0EvT/8uq/OVomYd1MBvkbmcNJCyh6PhqnkD/q39WOewjZQHZbA2F8UdSDG1T0vSPfx3xK9+RluouZN2U5lWD5xzdEGGruQCJ/3m5gfyWdVvekoDJFw3Zs7mA2hdg37+PpE5oZyxKuKaUhlyBHYpFfCMsARYCjyo5EhlXls2jPRlclWgyQU96fOVYn2tuveRY5a7k4TPM1/1lzgmIdUS5vMDgp6qelyRO8LVwgHojtFeiWJjgOIUM1BxAwCrkMUmcQx172DzmSxPNp2k8bmBk8b3lt03+UtVhfLA3GhuwcfHegtE5ztQtxVlHZf7T1APsTqaH1u4Ezz0fD1JXMuRlbFRERwmEMsZjeGApCEhzJ2hVHzU+ECOaWB6VTnwCECsAm9h6T7W7/AL1th2HtPzt7hu/tOQ+GMknOjVd1tquLMkN8ybHw2QlfYvJGEbO9IzoSX14EpMhYrbdhRuw9/UmnNj/zd4zNie9vwXTSQX7DEQrbUHohR6WJt/Z5GvSJ6V1St8g5KvETPiH335BmjO1dR1g5Na6ShYkpX0Wo5jdsBMh6wyS/B0U3rYg9XVvRSyLw5YmnFn0FNrse5OxfeRAYqo/r/v89XiUM/8sXRQ5PJUoCZdiioRb3gQ6EM3vTgwmrNXtvoXCQA8f20yY5gJfHQdDySQudFkaKjSTGMhPJI+8UwKJ4spWJ93KqdCXgHscWhDkwR1N X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: c5272852-651b-4dad-c925-08d96eeaa71e X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5151.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 14:53:55.6750 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: ySxkXKfZG7lZOa2bZKT+zQyJA2QB7rmhgfC5OWCiKWaKxqCMPOo+6m+/4KQtE+gvcO4oJRDeHUr0Du09lTM5Yg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2654 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Daniel Baluta There are two types of clocks: * DSP IP clocks * DAI clocks This clocks are necessary in order to power up DSP and DAIs. We choose to enable DAI clocks here because of the way i.MX8/i.MX8X design handles resources (including clocks). All clocks are managed by a separate core (named SCU) which communicates with Linux managed ARM core via a well known API. We parse and enable the clocks in probe function and disable them in remove function. Future patches will introduce Power Management support so that we disable clocks while DSP is not used or system enters power save. Signed-off-by: Daniel Baluta --- sound/soc/sof/imx/imx-common.c | 44 ++++++++++++++++++++++++++++++++++ sound/soc/sof/imx/imx-common.h | 13 ++++++++++ sound/soc/sof/imx/imx8.c | 37 ++++++++++++++++++++++++++++ sound/soc/sof/imx/imx8m.c | 34 ++++++++++++++++++++++++++ 4 files changed, 128 insertions(+) -- 2.27.0 Reviewed-by: Pierre-Louis Bossart diff --git a/sound/soc/sof/imx/imx-common.c b/sound/soc/sof/imx/imx-common.c index 8826ef94f04a..f9d650ad3846 100644 --- a/sound/soc/sof/imx/imx-common.c +++ b/sound/soc/sof/imx/imx-common.c @@ -74,4 +74,48 @@ void imx8_dump(struct snd_sof_dev *sdev, u32 flags) } EXPORT_SYMBOL(imx8_dump); +int imx8_parse_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks) +{ + int ret; + + ret = devm_clk_bulk_get(sdev->dev, clks->num_dsp_clks, clks->dsp_clks); + if (ret) { + dev_err(sdev->dev, "Failed to request DSP clocks\n"); + return ret; + } + + ret = devm_clk_bulk_get_optional(sdev->dev, clks->num_dai_clks, clks->dai_clks); + if (ret) { + dev_err(sdev->dev, "Failed to request DAI clks\n"); + return ret; + } + + return 0; +} +EXPORT_SYMBOL(imx8_parse_clocks); + +int imx8_enable_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks) +{ + int ret; + + ret = clk_bulk_prepare_enable(clks->num_dsp_clks, clks->dsp_clks); + if (ret) + return ret; + ret = clk_bulk_prepare_enable(clks->num_dai_clks, clks->dai_clks); + if (ret) { + clk_bulk_disable_unprepare(clks->num_dsp_clks, clks->dsp_clks); + return ret; + } + + return 0; +} +EXPORT_SYMBOL(imx8_enable_clocks); + +void imx8_disable_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks) +{ + clk_bulk_disable_unprepare(clks->num_dsp_clks, clks->dsp_clks); + clk_bulk_disable_unprepare(clks->num_dai_clks, clks->dai_clks); +} +EXPORT_SYMBOL(imx8_disable_clocks); + MODULE_LICENSE("Dual BSD/GPL"); diff --git a/sound/soc/sof/imx/imx-common.h b/sound/soc/sof/imx/imx-common.h index 1cc7d6704182..54fba9fcd861 100644 --- a/sound/soc/sof/imx/imx-common.h +++ b/sound/soc/sof/imx/imx-common.h @@ -3,6 +3,8 @@ #ifndef __IMX_COMMON_H__ #define __IMX_COMMON_H__ +#include + #define EXCEPT_MAX_HDR_SIZE 0x400 #define IMX8_STACK_DUMP_SIZE 32 @@ -13,4 +15,15 @@ void imx8_get_registers(struct snd_sof_dev *sdev, void imx8_dump(struct snd_sof_dev *sdev, u32 flags); +struct imx_clocks { + struct clk_bulk_data *dsp_clks; + int num_dsp_clks; + struct clk_bulk_data *dai_clks; + int num_dai_clks; +}; + +int imx8_parse_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks); +int imx8_enable_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks); +void imx8_disable_clocks(struct snd_sof_dev *sdev, struct imx_clocks *clks); + #endif diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index fc1720c211a3..5370d34edd61 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -41,6 +41,25 @@ #define MBOX_OFFSET 0x800000 #define MBOX_SIZE 0x1000 +/* DSP clocks */ +struct clk_bulk_data imx8_dsp_clks[] = { + { .id = "ipg" }, + { .id = "ocram" }, + { .id = "core" }, +}; + +/* DAI clocks */ +struct clk_bulk_data imx8_dai_clks[] = { + { .id = "esai0_core" }, + { .id = "esai0_extal" }, + { .id = "esai0_spba" }, + { .id = "sai1_bus" }, + { .id = "sai1_mclk0" }, + { .id = "sai1_mclk1" }, + { .id = "sai1_mclk2" }, + { .id = "sai1_mclk3" }, +}; + struct imx8_priv { struct device *dev; struct snd_sof_dev *sdev; @@ -57,6 +76,7 @@ struct imx8_priv { struct device **pd_dev; struct device_link **link; + struct imx_clocks *clks; }; static void imx8_get_reply(struct snd_sof_dev *sdev) @@ -223,6 +243,10 @@ static int imx8_probe(struct snd_sof_dev *sdev) if (!priv) return -ENOMEM; + priv->clks = devm_kzalloc(&pdev->dev, sizeof(*priv->clks), GFP_KERNEL); + if (!priv->clks) + return -ENOMEM; + sdev->num_cores = 1; sdev->pdata->hw_pdata = priv; priv->dev = sdev->dev; @@ -336,6 +360,18 @@ static int imx8_probe(struct snd_sof_dev *sdev) /* set default mailbox offset for FW ready message */ sdev->dsp_box.offset = MBOX_OFFSET; + /* init clocks info */ + priv->clks->dsp_clks = imx8_dsp_clks; + priv->clks->num_dsp_clks = ARRAY_SIZE(imx8_dsp_clks); + priv->clks->dai_clks = imx8_dai_clks; + priv->clks->num_dai_clks = ARRAY_SIZE(imx8_dai_clks); + + ret = imx8_parse_clocks(sdev, priv->clks); + if (ret < 0) + goto exit_pdev_unregister; + + imx8_enable_clocks(sdev, priv->clks); + return 0; exit_pdev_unregister: @@ -354,6 +390,7 @@ static int imx8_remove(struct snd_sof_dev *sdev) struct imx8_priv *priv = sdev->pdata->hw_pdata; int i; + imx8_disable_clocks(sdev, priv->clks); platform_device_unregister(priv->ipc_dev); for (i = 0; i < priv->num_domains; i++) { diff --git a/sound/soc/sof/imx/imx8m.c b/sound/soc/sof/imx/imx8m.c index 30624fafc632..fea1b72bebaa 100644 --- a/sound/soc/sof/imx/imx8m.c +++ b/sound/soc/sof/imx/imx8m.c @@ -23,6 +23,21 @@ #define MBOX_OFFSET 0x800000 #define MBOX_SIZE 0x1000 +struct clk_bulk_data imx8m_dsp_clks[] = { + { .id = "ipg" }, + { .id = "ocram" }, + { .id = "core" }, +}; + +struct clk_bulk_data imx8m_dai_clks[] = { + { .id = "sai3_bus" }, + { .id = "sai3_mclk0" }, + { .id = "sai3_mclk1" }, + { .id = "sai3_mclk2" }, + { .id = "sai3_mclk3" }, + { .id = "sdma3_root" }, +}; + struct imx8m_priv { struct device *dev; struct snd_sof_dev *sdev; @@ -30,6 +45,8 @@ struct imx8m_priv { /* DSP IPC handler */ struct imx_dsp_ipc *dsp_ipc; struct platform_device *ipc_dev; + + struct imx_clocks *clks; }; static void imx8m_get_reply(struct snd_sof_dev *sdev) @@ -143,6 +160,10 @@ static int imx8m_probe(struct snd_sof_dev *sdev) if (!priv) return -ENOMEM; + priv->clks = devm_kzalloc(&pdev->dev, sizeof(*priv->clks), GFP_KERNEL); + if (!priv->clks) + return -ENOMEM; + sdev->num_cores = 1; sdev->pdata->hw_pdata = priv; priv->dev = sdev->dev; @@ -211,6 +232,18 @@ static int imx8m_probe(struct snd_sof_dev *sdev) /* set default mailbox offset for FW ready message */ sdev->dsp_box.offset = MBOX_OFFSET; + /* init clocks info */ + priv->clks->dsp_clks = imx8m_dsp_clks; + priv->clks->num_dsp_clks = ARRAY_SIZE(imx8m_dsp_clks); + priv->clks->dai_clks = imx8m_dai_clks; + priv->clks->num_dai_clks = ARRAY_SIZE(imx8m_dai_clks); + + ret = imx8_parse_clocks(sdev, priv->clks); + if (ret < 0) + goto exit_pdev_unregister; + + imx8_enable_clocks(sdev, priv->clks); + return 0; exit_pdev_unregister: @@ -222,6 +255,7 @@ static int imx8m_remove(struct snd_sof_dev *sdev) { struct imx8m_priv *priv = sdev->pdata->hw_pdata; + imx8_disable_clocks(sdev, priv->clks); platform_device_unregister(priv->ipc_dev); return 0; From patchwork Fri Sep 3 14:53:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Baluta X-Patchwork-Id: 506539 Delivered-To: patch@linaro.org Received: by 2002:a02:8629:0:0:0:0:0 with SMTP id e38csp1069694jai; Fri, 3 Sep 2021 07:54:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxsRGvB3nQJ0sCbf7dKpMhktpaF4+K2vj2Qam0+WOy1iYtQ6ujErSy4l1gD3dl8n15uIsho X-Received: by 2002:a05:6402:1395:: with SMTP id b21mr4403633edv.119.1630680843110; Fri, 03 Sep 2021 07:54:03 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1630680843; cv=pass; d=google.com; s=arc-20160816; b=wXrD0ZPbmahoR2ltsLoAvWT5nJujjFw+WsCr7V/vJAgbDHKodiY1zI9yAW68nQ1KI/ E3dAnhWzz0n/5mQ3A1WvITO+VK9WbhYMIGHAKfQrAF6LfeJlO8g8/7n9Pw7dakj5o0O1 86YqDjRKQIwRgyuwOMKD20d6SGdEKZVIc6Fp1QH4wMdkMzHtUfb+hr1a+dMbrvsxCL5S b412GKEvGVNxPZYuOXLM6eeDBDbABf8lxFothtwjSLTGH4Fyr0BMlkilwN/wnuKWZAnB xKiv/Sma6/FlGM8tKvBiwOY4GWNu9RiZUUB7CNWzPv43XEj4g5TgfbyUpORbA0DX+qxj ZU2Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:content-transfer-encoding :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=KmqZnWedP1AJSXsFtOa8M95+jajfkJOrqyR2j0dN1Gg=; b=wTG1Wp6pJChh9JPl/c9SN+XjPEDmojU5mNY//c9tvo8JUz84OeCwhsdWer0+2n93E7 adAQ3oLIrxi+tLj/N20fVl0CiF1dVgPif3mJjAOUXLs7WPNpG3T9S7PkSu/PNnvDkiOy 0f4pwSo3Uul1slcO6R4ibArMvskBmw5+7Iioil43FHrn/Wl7n/s6BqBfKIYvrN2+oewe WjvRhsePh0R48pjd8wbZwDX069ds682haicQY07+akEMuHnnpjiSPN2e/lR+/7y+BjL/ L50e9uqrLuqm1vNKWUVPoSv+vh+FtbQ2HxOd9OVVgig7UjgZNJ/sgjMYqQBKOUzs1Upz RNcw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=TU2Ikxin; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h5si4813747ejj.144.2021.09.03.07.54.02; Fri, 03 Sep 2021 07:54:03 -0700 (PDT) Received-SPF: pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@NXP1.onmicrosoft.com header.s=selector2-NXP1-onmicrosoft-com header.b=TU2Ikxin; arc=pass (i=1 spf=pass spfdomain=oss.nxp.com dkim=pass dkdomain=oss.nxp.com dmarc=pass fromdomain=oss.nxp.com); spf=pass (google.com: domain of devicetree-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=devicetree-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=nxp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349554AbhICOzB (ORCPT + 6 others); Fri, 3 Sep 2021 10:55:01 -0400 Received: from mail-eopbgr150081.outbound.protection.outlook.com ([40.107.15.81]:11191 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1349539AbhICOzA (ORCPT ); Fri, 3 Sep 2021 10:55:00 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=G6/pJMkHzmGb/mAa1Ve0zCBRmIcUmmToJ/PaatYvc02XmXsNfhN3tSDpXozUnPAH5E/Sie2eC8GdtsOvU/vG3a5ElKWVPLA1KQzDvZHiwb7EY0omd0Tg90OwF9XdEUSArWFMbQJh+j1wvo+L5+bojuhfRYqJs6jMVdpibVhM3iOinkJcSzzsCCZRH605kSqg4Zi2/t4VTK5kshztCHE6SoEMucd+VpjCD5/YsMMI2B5Q7258hDm/VOjEORXr2woIHBctUqKj8d7XxLdAGZQAoXvkd5dxhE0mBjmJkCj4D3foeAsaj4AQ3GMsmZhH0kdKVFD9Mwi+RHRBXeWku6EEhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=KmqZnWedP1AJSXsFtOa8M95+jajfkJOrqyR2j0dN1Gg=; b=aQUXdUdz4mwQ1MT0g1aoXsEMUNbCT5nFXRptfafpKWprDXr2arn+yYwB5XJxDdkZwZdhJ1CN5X0NP3pGkggrtqc64XEHxQCnRGEhRxVPPtg1kVDxyi9abibkorHgRrZL6k7UMNTg+XkUs9nIZzVH1U2ryVkfSOO6YgEBinpO9Nr261PRvbkghWhTdURdtmVvI+o2NfMhIIyxlwbdsXFkIB2VPJNqOJeZ2EgsuBPqAj0qaIRvjqmscElt4BtH0StF/dVFTZCxBwImBw6YL7/1aCfyA02QvsE/Py1+PZ4lZE/itefWonHXighM3TQ4yBjYph1PpF7X7sFUugfszMyA8g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=oss.nxp.com; dmarc=pass action=none header.from=oss.nxp.com; dkim=pass header.d=oss.nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=NXP1.onmicrosoft.com; s=selector2-NXP1-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KmqZnWedP1AJSXsFtOa8M95+jajfkJOrqyR2j0dN1Gg=; b=TU2IkxindeWmaBueZEe/s+l4uwc9NOKkSnZmU5e+D/Z9Al5FlXCcQGYY+iF401bgso+wrD5lwKbQRCVIn0hOMlyhgN+PspDyDDxy0wtKP96S1SRb31+tXpU6dlxkCjfFtbiT7beHW2lvZ1NN9JVGWMZXjEqE23HyhXdyC7BevHg= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=oss.nxp.com; Received: from VI1PR04MB5151.eurprd04.prod.outlook.com (2603:10a6:803:61::28) by VI1PR0401MB2654.eurprd04.prod.outlook.com (2603:10a6:800:58::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Fri, 3 Sep 2021 14:53:57 +0000 Received: from VI1PR04MB5151.eurprd04.prod.outlook.com ([fe80::499b:ba92:db2e:3f28]) by VI1PR04MB5151.eurprd04.prod.outlook.com ([fe80::499b:ba92:db2e:3f28%7]) with mapi id 15.20.4457.026; Fri, 3 Sep 2021 14:53:57 +0000 From: Daniel Baluta To: broonie@kernel.org, pierre-louis.bossart@linux.intel.com, lgirdwood@gmail.com, robh+dt@kernel.org, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com Cc: devicetree@vger.kernel.org, shawnguo@kernel.org, kernel@pengutronix.de, festevam@gmail.com, linux-imx@nxp.com, peter.ujfalusi@linux.intel.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, s-anna@ti.com, Daniel Baluta Subject: [PATCH v2 2/2] dt-bindings: dsp: fsl: Add DSP optional clocks documentation Date: Fri, 3 Sep 2021 17:53:40 +0300 Message-Id: <20210903145340.225511-3-daniel.baluta@oss.nxp.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210903145340.225511-1-daniel.baluta@oss.nxp.com> References: <20210903145340.225511-1-daniel.baluta@oss.nxp.com> X-ClientProxiedBy: VI1PR07CA0200.eurprd07.prod.outlook.com (2603:10a6:802:3f::24) To VI1PR04MB5151.eurprd04.prod.outlook.com (2603:10a6:803:61::28) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (2a02:2f08:5708:8600:fd8d:b9e7:97b5:dd4a) by VI1PR07CA0200.eurprd07.prod.outlook.com (2603:10a6:802:3f::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.4 via Frontend Transport; Fri, 3 Sep 2021 14:53:55 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8abee408-5033-4f3d-aa15-08d96eeaa7e3 X-MS-TrafficTypeDiagnostic: VI1PR0401MB2654: X-MS-Exchange-SharedMailbox-RoutingAgent-Processed: True X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5236; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1EwvMrtVhHdmZNdLZ4B5I6XfCApnMAfBFcp84iMPH0gMfGv9pe18u4j2l1uEOrC4t3qvQhvx0aUmlG80ebC7ygdOX0Kb0t8gkFhvhC1tXTRNjE5qNXTtQBG9LNOzy/Hni7AjPeucTH4zrwIU4exjR6AEhaazZyQSgfAZMcr++vjge6HZmJ9ES98wqbDufuCZFVUYs+tzfX8za7+ns1ZbrrZ88pM/rnRI+uER1TSpND9Kfx4kQSq8vCo9tJ0ac9Zm2aljL/Q16wXCtrOO0qt2kYogeYsq6CeuMQJ6Gi56/O4xZaBVi6xviSRBqrYr9yR5oD6rL5xpCQgivTbCZlAi3uxaWbyfa9SZoJnUoi4+eZaWny6xP2D0XN9U1yQvjvWEAGEb2L9hx7lQ5FweFbieSE0Uy8eKn/LcShqlnCgIP/AFTEthRXnGHQ4YGO4K5TCYV8Jbks6jJX/b8mUmKrwl60fAnMr4cn4mboq8pekodeczX0wD8rGWcZr/3u+ZecHSFob54tut3tEjEooA0Y6tx7BgKadw7n6NBZIXWCp+XvllFJrx8M2LVzT54tPdyXV+znSFd38MaYmudWE8/BFdI2gK+Chot4pk8RrQIsFz67IvlxUc83v9zY8EZcTINRuMSoqkoTHeHkLF0JuN04I3zQ== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB5151.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(366004)(186003)(38100700002)(66946007)(44832011)(52116002)(6506007)(86362001)(8676002)(6666004)(5660300002)(316002)(2906002)(66556008)(4326008)(6512007)(6486002)(66476007)(508600001)(2616005)(1076003)(83380400001)(8936002)(7416002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8oFI3p623F6E+R0PaY+ugG0iPJwNUpJwHu39fJcgW/rMMfxfHPP2MyIpbhLM3a9ua/HFLpq0b/6A+2bgTBj0/mRwry3YN2rEuHfjZJk5IJGGQvk99586VGQzrotKw51xIugNPx709kI4VACtFY+liVw6piLEkoSozxDCcvvi8O4qQBvqXl2WUXH4G33tRQh/FYlGvkxr0AMc+PApG79n1H/V3cU0mhmflk6jYaOBPDKkrt9NHH6bCqOKl6zkdboZZq3yV46ARfefe3J0wGQ3LUMRGXkIyckFVhMD2+tr1vZp05g+JljHnuXaAZqDGtvNJ0YgP7L8GrNGaVZv0KgwW8A+yGPr21ejyghk9/PKwYzo1YzQ8kJQ1P88ZCPSpWeNf2Mwqm3JUJhMKRc2lyce+p437Gt9zlLMq0/w6VgEgqsI0bkAYCHOQlOFr26UZb0LAYYjDLDJ53r1MfcmJg2c6cSdQuxmjosROhCA7SMZ33lsNKpr0Q6Sprpo62KUHgIuHUk++OEvLHH8dj4Gc2bT+LmKT6jkvK07mtsG5RLJEnBxsRSaXN7b4/YyQ0fypXWq1NcbPxZcw6nNa7ni7g/ksbu7FUWRjEcqnJ4qKZj9VOjaJs2YBIyRA8eUeiNenxnT89VvFYcpc1CnI9GmmYiyV9T3vcMZz8NG4FfzyZme6oCgAxGHAHvBOAnIzzo9XtJp6fh/io2dlSgwxKWzXOSlFCWAjIw3mBb3MRM6bHeHY/JlnX+8vEZPRLI4Bzq9if0kBGFOGj0HuqnLhLPsYVbhkbf+ltsN6Iv131ZvvaDLtAk2s5a2QUjRskwp1ImfsXbM0oXqxuImKY2jRSOLd38pDU/hvWJRBY6OPAGO1DrPsybv0hnp0DN+qfufjoUDZ3h8v2EtneKnQQaobtr8ahcr4x/bVgZCOttW0eAWcWiDyv0zo3ncDWPAsgrVcs/BYZj/Gq7vGNbnbB7hIa3uIUWVyIZL292WAphfHb7N6agEUDND3pNtvC/PPcAZhOGdwVksR0j/GeaRPMGRDnKfjXgTSiXoxF/iMbMlIodxcDxDgaWgO4f165z0JxZ1/56G8/QT1QsdG06f8AbyFmJLECNjd4xgKeySqjQfFCLgv0QUb6nG38tiOrrxSZMsKGANkYu90gqVINCez9CDWaaOu3ET9qllPbN/NzIM7ofF7dlX9YtdZJuH/QEIYqh7EIXlT0gaXu6fDt0ugj7W9agm4px12yDTRBTzH+Mg38InoqDao5o29YYOKZz15xOg/eZnSYAFBmRTAOQnIz8YliDF4ZrSXaTsiGKzi/vRK3aZ/BihIJiKBqqua9pwgKuNy1XIa1yfhCuv7PCraAy1JqaC4zLmZy2ft4MtO5NnIFHxMsdf81v3VYU42rplbUluEJf6R1bD X-OriginatorOrg: oss.nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 8abee408-5033-4f3d-aa15-08d96eeaa7e3 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB5151.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Sep 2021 14:53:56.9532 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: YbDeJ9aPbWwd/frx9RPMbFQYa2GxfGhHi3OEVtbU4sFnxXBMfk9Iqz56iB1QdsRTMuAhRndGNYlDmHuGaeIh0w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2654 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org From: Daniel Baluta DSP node on the Linux kernel side must also take care of enabling DAI/DMA related clocks. By design we choose to manage DAI/DMA clocks from the kernel side because of the architecture of some i.MX8 boards. Clocks are handled by a special M4 core which runs a special firmware called SCFW (System Controler firmware). This communicates with A cores running Linux via a special Messaging Unit and implements a custom API which is already implemented by the Linux kernel i.MX clocks implementation. Note that these clocks are optional. We can use the DSP without them. Signed-off-by: Daniel Baluta --- .../devicetree/bindings/dsp/fsl,dsp.yaml | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) -- 2.27.0 diff --git a/Documentation/devicetree/bindings/dsp/fsl,dsp.yaml b/Documentation/devicetree/bindings/dsp/fsl,dsp.yaml index 7afc9f2be13a..1453668c0194 100644 --- a/Documentation/devicetree/bindings/dsp/fsl,dsp.yaml +++ b/Documentation/devicetree/bindings/dsp/fsl,dsp.yaml @@ -24,16 +24,49 @@ properties: maxItems: 1 clocks: + minItems: 3 items: - description: ipg clock - description: ocram clock - description: core clock + - description: esai0 core clock for accessing registers + - description: esai0 baud clock + - description: esai0 system clock + - description: esai0 spba clock required when ESAI is placed in slave mode + - description: SAI1 bus clock + - description: SAI1 master clock 0 + - description: SAI1 master clock 1 + - description: SAI1 master clock 2 + - description: SAI1 master clock 3 + - description: SAI3 bus clock + - description: SAI3 master clock 0 + - description: SAI3 master clock 1 + - description: SAI3 master clock 2 + - description: SAI3 master clock 3 + - description: SDMA3 root clock used for accessing registers + clock-names: + minItems: 3 items: - const: ipg - const: ocram - const: core + - const: esai0_core + - const: esai0_extal + - const: esai0_fsys + - const: esai0_spba + - const: sai1_bus + - const: sai1_mclk0 + - const: sai1_mclk1 + - const: sai1_mclk2 + - const: sai1_mclk3 + - const: sai3_bus + - const: sai3_mclk0 + - const: sai3_mclk1 + - const: sai3_mclk2 + - const: sai3_mclk3 + - const: smda3_root power-domains: description: