From patchwork Wed Sep 18 18:21:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Mihalcea X-Patchwork-Id: 13807085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7147CCDD54D for ; Wed, 18 Sep 2024 18:25:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=9pnB/66IiiBxwPue9k5AJc8T5aJ3texuVaLDQqQnrlo=; b=AYNWtYzoh9LViYV3LmVK6/r/6d +2iEwL6hqcTCQlyPHVMduECjrDBpoaEyMAUyKUfRt6QrOf5U/cxLt6kaSqlWYCeZSj8+9M0lR+SbJ ilvuSGWApbUnZDF43Aln3rxLhsMVwLOyoQsrfsBS2pyf9Zu3GY2PGl8/uULjWOz7UefrBe4+F40xm su2H1m9b4mVacticVahK7s5Kl3dEAuTg1x6uAzksAI6qw3SMKAV1n9QUm618WFyE7q8Ms+3ZWA0n4 7ec+JlPsyh3baH8HHxfKpzhsHMTPKCQlSaO4S+ni55moaXKD3GmjMycAz9LkdqFcx2o/ZH/ikUaVM YE+36dUw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1sqzMn-00000008o9w-1ze4; Wed, 18 Sep 2024 18:25:29 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1sqzJk-00000008nem-170Q for linux-arm-kernel@lists.infradead.org; Wed, 18 Sep 2024 18:22:21 +0000 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5c3ca32974fso10679a12.3 for ; Wed, 18 Sep 2024 11:22:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726683738; x=1727288538; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=9pnB/66IiiBxwPue9k5AJc8T5aJ3texuVaLDQqQnrlo=; b=eeeS9eWE1EffIzyXyYWvD3IJle+9wYBhiQQPV8SfQmSS0LWnMYmzyx2oHfLGQLZzIv WjAbxEa204f8VNG5qKnkUVTXVw0jOsCItoAEKDBiwoaVg2CMQZhHjS5rfOlgxtsmQbZb Yaq+r1k1r9AkmTqgSeG52dlGRRVemt1tgdaBJcKwO3pNbWKR+Fi1m2zUswGBBlt4KCAH G+154qEBcqrDE7xo0JpnW6c5s0cnf2Kuh94QENkfncy495MaF7pSGgKiOjL9qROlRcWc BtoGa0qB3JC0k9hQj9JaOHICT1rtuD6z6bwiuBzN5l1pwht5fFrH8ubFpdXvc9UfhaWG SFpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726683738; x=1727288538; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=9pnB/66IiiBxwPue9k5AJc8T5aJ3texuVaLDQqQnrlo=; b=lgOd+0tqRSNS/KVkzaX661nsaj2bbIXsxKQjwiTOBbg8zjlUqDTGax6VIiCQuImeNC Rka9byA6PQWzZHUF/4RKd8Qz2CAvAha4iO8gWgh5xAmpj7zw91ACoabd/Wh4qnalFUjU o2f6+q3fTQFW6RkLXEsIx7LW8fk7T/eyZ3OrY6My9UUQuRHhCGXCk0/rWAINPRcKueaS kZ2zo5aOa0dsuwLuwLBZF+/s51aMkfLmMSGkHJkXv1Du2cdkUrn9XdnKYfQAH2OC53SE wsvC7MTiZOsHK6BBh/yBVbLcDsRzyxk9YeGfS0VaFsTxUm7enp93ffl3usube4aYk5mA mT0w== X-Forwarded-Encrypted: i=1; AJvYcCU8dUVlB+dHfPO7NhvHjO2Sywy325qQoHnGJTyzWmf6stMQ2H3tVlUydu2n1Ig/yvL/kcoWV55O7raYdKrDLEDf@lists.infradead.org X-Gm-Message-State: AOJu0Yz3u258I8m02xmUSvtGm8+w13krO45++XrqIkSqBcAzvzmU2IFY 93dRljS+c1krrw/L2QXeojXLERZVbGlnE4drvok1jyyUb0YwfBJQ X-Google-Smtp-Source: AGHT+IFLWoD9g3KIUXWE4OYaPCJDDEreIkagIcss6zDxUmRyhLSrCsW3Dv/hxMtDn3gbm+0lHG8v8g== X-Received: by 2002:a05:6402:321c:b0:5c2:7699:fb6f with SMTP id 4fb4d7f45d1cf-5c413e1fd66mr20241398a12.15.1726683738183; Wed, 18 Sep 2024 11:22:18 -0700 (PDT) Received: from playground.localdomain ([86.127.146.72]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c42bb5312dsm5200146a12.23.2024.09.18.11.22.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Sep 2024 11:22:16 -0700 (PDT) From: Laurentiu Mihalcea To: Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shawn Guo , Sascha Hauer , Daniel Baluta , Shengjiu Wang , Iuliana Prodan Cc: devicetree@vger.kernel.org, imx@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arm64: dts: imx8qxp: configure dsp node for rproc usage Date: Wed, 18 Sep 2024 14:21:14 -0400 Message-Id: <20240918182117.86221-3-laurentiumihalcea111@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240918182117.86221-1-laurentiumihalcea111@gmail.com> References: <20240918182117.86221-1-laurentiumihalcea111@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240918_112220_339756_ABF06D65 X-CRM114-Status: GOOD ( 13.75 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Laurentiu Mihalcea Currently, the dsp node is configured for SOF usage, which is not the "default" case and should be done in a separate SOF DTS. As such, configure the dsp node for rproc usage, which is the "default" case. This also includes the addition of the 2 optional power domains which may be required by some applications. Signed-off-by: Laurentiu Mihalcea --- .../boot/dts/freescale/imx8-ss-audio.dtsi | 20 +++++++++---------- arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 15 +++++++++++++- arch/arm64/boot/dts/freescale/imx8qxp.dtsi | 19 ++++++++++++++++++ 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi index ff5df0fed9e9..28970211dd67 100644 --- a/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi @@ -431,22 +431,20 @@ dsp_ram_lpcg: clock-controller@59590000 { }; dsp: dsp@596e8000 { - compatible = "fsl,imx8qxp-dsp"; + compatible = "fsl,imx8qxp-hifi4"; reg = <0x596e8000 0x88000>; clocks = <&dsp_lpcg IMX_LPCG_CLK_5>, <&dsp_ram_lpcg IMX_LPCG_CLK_4>, <&dsp_lpcg IMX_LPCG_CLK_7>; clock-names = "ipg", "ocram", "core"; - power-domains = <&pd IMX_SC_R_MU_13A>, - <&pd IMX_SC_R_MU_13B>, - <&pd IMX_SC_R_DSP>, - <&pd IMX_SC_R_DSP_RAM>; - mbox-names = "txdb0", "txdb1", - "rxdb0", "rxdb1"; - mboxes = <&lsio_mu13 2 0>, - <&lsio_mu13 2 1>, - <&lsio_mu13 3 0>, - <&lsio_mu13 3 1>; + power-domains = <&pd IMX_SC_R_MU_13B>, + <&pd IMX_SC_R_IRQSTR_DSP>, + <&pd IMX_SC_R_MU_2A>; + mbox-names = "tx", "rx", "rxdb"; + mboxes = <&lsio_mu13 0 0>, + <&lsio_mu13 1 0>, + <&lsio_mu13 3 0>; + firmware-name = "imx/dsp/hifi4.bin"; status = "disabled"; }; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts index 936ba5ecdcac..527933a3eb5c 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts +++ b/arch/arm64/boot/dts/freescale/imx8qxp-mek.dts @@ -63,7 +63,8 @@ sound-wm8960 { }; &dsp { - memory-region = <&dsp_reserved>; + memory-region = <&dsp_vdev0buffer>, <&dsp_vdev0vring0>, + <&dsp_vdev0vring1>, <&dsp_reserved>; status = "okay"; }; @@ -71,6 +72,18 @@ &dsp_reserved { status = "okay"; }; +&dsp_vdev0buffer { + status = "okay"; +}; + +&dsp_vdev0vring0 { + status = "okay"; +}; + +&dsp_vdev0vring1 { + status = "okay"; +}; + &fec1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_fec1>; diff --git a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi index 0313f295de2e..9522a65b3e22 100644 --- a/arch/arm64/boot/dts/freescale/imx8qxp.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8qxp.dtsi @@ -186,6 +186,25 @@ dsp_reserved: dsp@92400000 { status = "disabled"; }; + dsp_vdev0vring0: vdev0vring0@942f0000 { + reg = <0 0x942f0000 0 0x8000>; + no-map; + status = "disabled"; + }; + + dsp_vdev0vring1: vdev0vring1@942f8000 { + reg = <0 0x942f8000 0 0x8000>; + no-map; + status = "disabled"; + }; + + dsp_vdev0buffer: vdev0buffer@94300000 { + compatible = "shared-dma-pool"; + reg = <0 0x94300000 0 0x100000>; + no-map; + status = "disabled"; + }; + encoder_rpc: encoder-rpc@94400000 { reg = <0 0x94400000 0 0x700000>; no-map;