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: 13807079 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 413D71C986B for ; Wed, 18 Sep 2024 18:22:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726683742; cv=none; b=FwyCaRFST7pz7JwhqQhO6TOQHCtsiH45WJAuNYZP2VRLqjc0uEz2swEuorrEtf+tK41+auRTQ7Mg2ltY4Gt1sSbt3UPx5v9jttjhzoKxk8DqeeH4LI2ykcobw0bdD3yJtUvk82fiPdBIviTfzv3VcbBKO2Lt9+rjrrdeXs3IxzE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1726683742; c=relaxed/simple; bh=tPPolANXFudZukym9KFwXomjOeqaddIywz6B3npeFX0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=K0rAZ4ooJ6YBJ8rIrhQ9A6oBDoo553V1LKtTYptMBHytH/Dd6NBKL8BkpXTscSxiutJ5yZfhVUm+WRwKjmfDPHf9T39CrjMI924ZsmzbL0u2MFz5PZHOHRiksLTzsdWisPsjCBab7GpWxj5HZgwc8So5WeDmasBoQrb/+WP4fV0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kZkZsaTg; arc=none smtp.client-ip=209.85.208.46 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kZkZsaTg" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-5c42bda005eso38065a12.0 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.linux.dev; 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=kZkZsaTgUWZyPn5dukS2p4E+mjzw32FbYkws3XnXeWMqmradl14Z1EEEJCMjrrp/NL yBOaRzYWWD+9R79q8YG2DOvHM+odxs4rHHKB5Oo1DKKFFvpr/OVbIkrH/uBiSLKYZ+L+ ydKPUTeGubMqgIm75jX8mHxm0ph6aoxKn3ZRov1rR2/0xnFoD/E5e4GjRxoCcMajeYok 53uftCXH2kbW1O30gnlhoBz74/oAAejica2UfyHBiJ+vUdt0wYAu9gaoR5sXsgWRce5L alHWlL2WhYjZMCbxdo8mGC7XfNkGP1dLqc9311hFilHoLMTc8upcr69LbC7KUZn9Fpvw ak1Q== 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=dwJqzIHh9RCqYJmy41jIFGyxpGC35y76HaGggC5yyM7CKrUPjQlaXVvUeGV3AFH46j TdI7UmY8mJRPxBbscX1Ti3eBJg8VSZ4HenOqPzrKThpKo5kK/VPXfCeNet3+WRyQoQe+ GfL6f9unL+EZTDnJVcvhvChAiWgwBZ9e85lBmI6MAI2U/aPEkSLYSl7lzF2RyU6h9J+4 om0jGGD9gV0C5S3b1H4444aGCMw/8aYs739gQZrHYtYOnV0rsp+iXB0nuEmSZuGdvl0A Hu6rigaX5/aaFCoi6tkaa2aDpRfMp1u82Ni22KO+vCNIksDoZEHVYY5EG/Y5v7mqGIog NkxA== X-Forwarded-Encrypted: i=1; AJvYcCXB4nLLznGmDxKxYX06NYVHR0rV+TsezhxsPOqz+Pi37L5O5ca/v8Bjjbg1AX8f8j1kzHU=@lists.linux.dev X-Gm-Message-State: AOJu0YyseMx6tzHzQ9myHXuqIu6fhsi5kIsDUdz8JeKmcXtUtsGMRnHj 1o+9X64Uo9sOwmEvtLrki7Sd+XK7BdG2kklkX6Mh8/craw7Z7ngk 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> Precedence: bulk X-Mailing-List: imx@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 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;