From patchwork Mon Feb 3 17:18:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Mihalcea X-Patchwork-Id: 13957895 Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (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 3644520E000; Mon, 3 Feb 2025 17:19:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738603152; cv=none; b=uFTfsM4ujcrbmcI8Ep32xOJIXCR4wmk45iI5y8Q3J7wS0YOXClrbuOXeuLnCBhFCao8jb8mZgHpgidRWOCAJujIUKRAZFsIi66B9RryU0IUgF6GjfDyQPFpwsg1b74ie8T574gPrk8Ir3FkXbgf3HdhyPVI/C+Ez9/cCvP6A0bA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738603152; c=relaxed/simple; bh=c/87/Tqegwrt/2Kl9lHnm/e1ty+fIyN0gPiFt760Fno=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=fGrN/tJqNIKOL7oLrT4V+LWAT0vtjZOVQD0gN5ODFSl4Mnlj1p5F5sq8qW3yzymtNVUndvy5SfLdQomjf63Bc5Dlj7Xx/K53+BvfsTnClqte8ScOnO7q9Tle4iNJO2ct4G7rg0YuepFeLJMxx+qW73V4XOVEwcsUCF5oSAau40k= 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=lO/SYO3a; arc=none smtp.client-ip=209.85.208.41 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="lO/SYO3a" Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-5d932eac638so8412872a12.1; Mon, 03 Feb 2025 09:19:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738603148; x=1739207948; darn=vger.kernel.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=8HDJU/hlw9VtUZBjKQe881/LPWYIHVX4wwVTE4H2RZk=; b=lO/SYO3anjQMhArK8sQEhVsygmavVYDyWX/TOqmeI9Nx6czFyzCOBhfYjXH1bryM4Q zot+m0kCzj/9cWgUWpVFgbTMTEZIwynfvr1Yokxgp10Cvu4pKpxpfzjr+6f/oscuT0oC w82JU/pl4joLqwRhBnw39yOg3BnYhDOpSd0fRZF6ye9WJtn+uKR6FVRKbNlv+QFRB8so brr4lvN4VnJNH8wFLVSZ9t6sgFsoLpejC5qdwB6gTmEWqwVxVagbYRndQ5jHIAEy+o89 PVLt+8jjfDp5bQgEBk6Xj5Lt4PWuJx5C0AmAWzNCLkMpbzE5JJJB+2UttL1vkmshSglu ufYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738603148; x=1739207948; 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=8HDJU/hlw9VtUZBjKQe881/LPWYIHVX4wwVTE4H2RZk=; b=FzFyYbPrEXBfzcVFYEAXoBu1NuQ9jdQpvNn73doDwJyf8VXWTgRJN7xFCJMwVOq2rv WKBfWzoZui8nP5J+7XcWPgIY1vXHV1PfvOLqCV/zwdJeWK+Su5ZTZk4yEgu8YqPTt1VD 6HS7pmrP3L/+XX5C5hTb4Hx1V5g8ngUcI5ujLr6OH2quYkpSBDlmrgAFQJSe5He1IEt9 AHFac6pR6OPySADxU4kzMrYru5MWlgYJzDFH8LQleVsMKdjgHueH/3AfGKkP1WnjGMml xmKC5PsEJQHJOXxf7sIfM1UTR7vCFrllxxwcEbib0Y0ZQQ472p6TPr+EBnyJju6ffn0j 3HSg== X-Forwarded-Encrypted: i=1; AJvYcCVj/Q4984o610S3lkKmGIz8qs7vEt9PQEu0UCnCB5RsUhoKX9MeuM3kPOJorJlxjVyKMsZa1XeWbMIN4A==@vger.kernel.org X-Gm-Message-State: AOJu0Ywu2XIh6kAJU6SavvSON6L8+mOhscumjyrFkKBjElP8kdXhwvLy fzYxgiGPKWV/i7SAowk53YFfwt2tdQkLd8W65ihdwplubkLZN2Ax X-Gm-Gg: ASbGncvxv15lB0TEwXtzfDAF/fIHDGHY4R8i5M9EAo3lPsnSjEh5JoA9GAXLKMPFF0I GemKpU1l4c+Q0uKtwaSIF9EYauDO2jgPJfAgjTnd6KnsPbxu9AJxYB7fipdmq/832jck13mZsvS 9loeU73CcHzpGWLOG2bpQIt/D4iUg5yYkfuKDkOeBbSBg9S0PGo04MFMgvys9eYdYN10Q5+37EK dYytTJTiNRBVlteO91tsGXNuUlQEuB5Irsv5g0xjAUk2VHQudRZuHzNI00JjsaarOWsmujypLkJ mn49VWfejM9eXevL9GNlh2W/Ov1+KgwkUsmuAZH3sPW8NBqXFg== X-Google-Smtp-Source: AGHT+IHqGG7FODmJuqkyhO/fPMpoBjkJnej9dmtGBBBibBSaKHHWSfPqxSu3cw+Gk6EJGBDRs/8G8Q== X-Received: by 2002:a17:907:1c95:b0:ab7:992:7f42 with SMTP id a640c23a62f3a-ab709927f70mr1262532566b.34.1738603148425; Mon, 03 Feb 2025 09:19:08 -0800 (PST) Received: from playground.localdomain ([92.120.5.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ab6e47d21aasm784253866b.74.2025.02.03.09.19.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 03 Feb 2025 09:19:07 -0800 (PST) From: Laurentiu Mihalcea To: Bard Liao , Daniel Baluta , Iuliana Prodan , Jaroslav Kysela , Takashi Iwai , Mark Brown Cc: linux-kernel@vger.kernel.org, linux-sound@vger.kernel.org, imx@lists.linux.dev Subject: [PATCH 4/9] ASoC: SOF: imx8: shuffle structure and function definitions Date: Mon, 3 Feb 2025 12:18:03 -0500 Message-Id: <20250203171808.4108-5-laurentiumihalcea111@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250203171808.4108-1-laurentiumihalcea111@gmail.com> References: <20250203171808.4108-1-laurentiumihalcea111@gmail.com> Precedence: bulk X-Mailing-List: linux-sound@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Laurentiu Mihalcea Shuffle the definitions of some structures and functions such that they are better grouped. This is purely a cosmetic change. Signed-off-by: Laurentiu Mihalcea Reviewed-by: Daniel Baluta Reviewed-by: Iuliana Prodan --- sound/soc/sof/imx/imx8.c | 85 ++++++++++++++++++++-------------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c index 05c4d70cd116..93968f077d52 100644 --- a/sound/soc/sof/imx/imx8.c +++ b/sound/soc/sof/imx/imx8.c @@ -41,6 +41,49 @@ #define MBOX_OFFSET 0x800000 #define MBOX_SIZE 0x1000 +static struct snd_soc_dai_driver imx8_dai[] = { + IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8), + IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32), +}; + +static struct snd_sof_dsp_ops sof_imx8_ops; + +static int imx8_ops_init(struct snd_sof_dev *sdev) +{ + /* first copy from template */ + memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops)); + + /* then set common imx8 ops */ + sof_imx8_ops.dbg_dump = imx8_dump; + sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops; + sof_imx8_ops.debugfs_add_region_item = + snd_sof_debugfs_add_region_item_iomem; + + /* ... and finally set DAI driver */ + sof_imx8_ops.drv = imx8_dai; + sof_imx8_ops.num_drv = ARRAY_SIZE(imx8_dai); + + return 0; +} + +static int imx8_probe(struct snd_sof_dev *sdev) +{ + struct imx_common_data *common; + struct imx_sc_ipc *sc_ipc_handle; + int ret; + + common = sdev->pdata->hw_pdata; + + ret = imx_scu_get_handle(&sc_ipc_handle); + if (ret < 0) + return dev_err_probe(sdev->dev, ret, + "failed to fetch SC IPC handle\n"); + + common->chip_pdata = sc_ipc_handle; + + return 0; +} + /* * DSP control. */ @@ -100,48 +143,6 @@ static int imx8_run(struct snd_sof_dev *sdev) return 0; } -static int imx8_probe(struct snd_sof_dev *sdev) -{ - struct imx_common_data *common; - struct imx_sc_ipc *sc_ipc_handle; - int ret; - - common = sdev->pdata->hw_pdata; - - ret = imx_scu_get_handle(&sc_ipc_handle); - if (ret < 0) - return dev_err_probe(sdev->dev, ret, - "failed to fetch SC IPC handle\n"); - - common->chip_pdata = sc_ipc_handle; - - return 0; -} - -static struct snd_soc_dai_driver imx8_dai[] = { - IMX_SOF_DAI_DRV_ENTRY_BIDIR("esai0", 1, 8), - IMX_SOF_DAI_DRV_ENTRY_BIDIR("sai1", 1, 32), -}; - -static struct snd_sof_dsp_ops sof_imx8_ops; - -static int imx8_ops_init(struct snd_sof_dev *sdev) -{ - /* first copy from template */ - memcpy(&sof_imx8_ops, &sof_imx_ops, sizeof(sof_imx_ops)); - - /* then set common imx8 ops */ - sof_imx8_ops.dbg_dump = imx8_dump; - sof_imx8_ops.dsp_arch_ops = &sof_xtensa_arch_ops; - sof_imx8_ops.debugfs_add_region_item = - snd_sof_debugfs_add_region_item_iomem; - - /* ... and finally set DAI driver */ - sof_imx8_ops.drv = imx8_dai; - sof_imx8_ops.num_drv = ARRAY_SIZE(imx8_dai); - - return 0; -} static const struct imx_chip_ops imx8_chip_ops = { .probe = imx8_probe,