Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.1/patches/2222208/?format=api
{ "id": 2222208, "url": "http://patchwork.ozlabs.org/api/1.1/patches/2222208/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260410200530.171323-2-piyushpatle228@gmail.com/", "project": { "id": 21, "url": "http://patchwork.ozlabs.org/api/1.1/projects/21/?format=api", "name": "Linux Tegra Development", "link_name": "linux-tegra", "list_id": "linux-tegra.vger.kernel.org", "list_email": "linux-tegra@vger.kernel.org", "web_url": null, "scm_url": null, "webscm_url": null }, "msgid": "<20260410200530.171323-2-piyushpatle228@gmail.com>", "date": "2026-04-10T20:05:22", "name": "[v3,1/2] ASoC: tegra210_adx: simplify byte map get/put logic", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "5bb45b285e7d16662276ff0ff078f9c31e4ed4c1", "submitter": { "id": 92665, "url": "http://patchwork.ozlabs.org/api/1.1/people/92665/?format=api", "name": "Piyush Patle", "email": "piyushpatle228@gmail.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260410200530.171323-2-piyushpatle228@gmail.com/mbox/", "series": [ { "id": 499502, "url": "http://patchwork.ozlabs.org/api/1.1/series/499502/?format=api", "web_url": "http://patchwork.ozlabs.org/project/linux-tegra/list/?series=499502", "date": "2026-04-10T20:05:21", "name": "ASoC: tegra210: simplify ADX/AMX byte map get/put logic", "version": 3, "mbox": "http://patchwork.ozlabs.org/series/499502/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/2222208/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2222208/checks/", "tags": {}, "headers": { "Return-Path": "\n <linux-tegra+bounces-13697-incoming=patchwork.ozlabs.org@vger.kernel.org>", "X-Original-To": [ "incoming@patchwork.ozlabs.org", "linux-tegra@vger.kernel.org" ], "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256\n header.s=20251104 header.b=WCnRZKIs;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c15:e001:75::12fc:5321; helo=sin.lore.kernel.org;\n envelope-from=linux-tegra+bounces-13697-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com\n header.b=\"WCnRZKIs\"", "smtp.subspace.kernel.org;\n arc=none smtp.client-ip=209.85.216.50", "smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com", "smtp.subspace.kernel.org;\n spf=pass smtp.mailfrom=gmail.com" ], "Received": [ "from sin.lore.kernel.org (sin.lore.kernel.org\n [IPv6:2600:3c15:e001:75::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519 server-signature ECDSA (secp384r1) server-digest SHA384)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fsny25LKHz1yCv\n\tfor <incoming@patchwork.ozlabs.org>; Sat, 11 Apr 2026 06:11:38 +1000 (AEST)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sin.lore.kernel.org (Postfix) with ESMTP id 832CC30347A0\n\tfor <incoming@patchwork.ozlabs.org>; Fri, 10 Apr 2026 20:06:13 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id D2D523859DC;\n\tFri, 10 Apr 2026 20:06:12 +0000 (UTC)", "from mail-pj1-f50.google.com (mail-pj1-f50.google.com\n [209.85.216.50])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id BE95A33F5B4\n\tfor <linux-tegra@vger.kernel.org>; Fri, 10 Apr 2026 20:06:10 +0000 (UTC)", "by mail-pj1-f50.google.com with SMTP id\n 98e67ed59e1d1-35691a231a7so1735031a91.3\n for <linux-tegra@vger.kernel.org>;\n Fri, 10 Apr 2026 13:06:10 -0700 (PDT)", "from lord-daniel-VivoBook-ASUSLaptop-K3502ZA-S3502ZA..\n ([2405:201:31:d01f:a107:5c92:b303:910a])\n by smtp.gmail.com with ESMTPSA id\n d9443c01a7336-2b2d4dabc08sm39569975ad.5.2026.04.10.13.06.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Fri, 10 Apr 2026 13:06:09 -0700 (PDT)" ], "ARC-Seal": "i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1775851572; cv=none;\n b=FYCLJg2R4/LBratpTAN2A9WED2x7zfRbf+uN9uSDQDz05Cy92YSFUcttYpatevGkWePNYTaA655ceG+ZsbvyOKRCDO+APJ/EoF7blrJ6e0TjcA9stCRicbMm0G+hVG2KCa9amgGDAZoumH6NDFibzLnOK2wu8oYomLQBwyw/SXo=", "ARC-Message-Signature": "i=1; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1775851572; c=relaxed/simple;\n\tbh=sFV7iqgieN0KFItIWqAGLhioP5P/KLL3pDQtJDeDDxg=;\n\th=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version;\n b=BuiHSJCj5IxKCP4rbC6D5OUFc3QkMou0DJaKeMPh27Bto3eG7LlcLjRiImHoHBhCDQwL92S84qbNhZdk80ZPtxDx00IOrAzIATwul96BV5t1J3QbrWBQLKtRa6NmV5PkM8ZqvVJOEO1UDinta5qkLyfUqVutcO4Qq84z0YZ5DAY=", "ARC-Authentication-Results": "i=1; smtp.subspace.kernel.org;\n dmarc=pass (p=none dis=none) header.from=gmail.com;\n spf=pass smtp.mailfrom=gmail.com;\n dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com\n header.b=WCnRZKIs; arc=none smtp.client-ip=209.85.216.50", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=gmail.com; s=20251104; t=1775851570; x=1776456370;\n darn=vger.kernel.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=VIKVkUWRV3tsyXN2qB9/P/46aDPpmzyvk7S8fxwfbLc=;\n b=WCnRZKIs6fAKwpK/EYaePbwuHUijJfUj8VX6P7gCRW2n9Hf3AwubjeytmKymkdSC77\n aHMrYIIfXkt68N4jP2P3otNOhkW2bAMOTFpI656BMinIgKyKIWDgYUcKBItSakPjEPRJ\n qdee/Qi/xFHG5qvn+d/m0dDLj7gUYMYU6tPf2yc2KHd0G1DNpFlY+unIWarGtxpZQbRR\n zWMjcOE1QhLp22KJ0Cw9Rgfv53cc7oTEkKA8nGCA/xvL3UwPzRlaLIfQgYQjyEoPEfeo\n 9hAIf/AMTf/GXhd+mbjsaIotaqVJiO+9sEQWHsNL9E4ZgA/6QvM1tAn8IhyxgZ3xvL1R\n fW6g==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20251104; t=1775851570; x=1776456370;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from\n :to:cc:subject:date:message-id:reply-to;\n bh=VIKVkUWRV3tsyXN2qB9/P/46aDPpmzyvk7S8fxwfbLc=;\n b=qnBNRGq8U9906n9hWnIaw0uGRMPlKpveyfTsPb8XHcMmJR/lguBBwzCGNBQtVb9q5g\n 90bdyfVqgfQcnVpTYLiAKcL+xM1HTRZqsaAfy07y5rh9WapfLQHBo7y2K3gAdUZXh6xa\n 7DjiqlQrwAGLEMcaddBOpkuUFDcaDT/vtnCaFPh//HjGZe53tBFlCtEBy/amM2h8EMy0\n dBksJbuhm6QWBDhnYjrBO8A8OcB+2Vyp2jH0AE5gXDjEzw3fJffDX9gm4Q4jDpJj/g5C\n V/GKEyHBnEntTEDWtp5/vGME9/YLCb3jlhVJpKFoCqJ5ae/dGUiik7nyOXPRm1qOWuAi\n sI0A==", "X-Forwarded-Encrypted": "i=1;\n AJvYcCX6BksWTl0aCRrkcfjsA4X5aGH39+C/cDaMHchMKG7P9PqDrKwDnWsn2IwVkrBFpVk8ShXSE1yi90+p3Q==@vger.kernel.org", "X-Gm-Message-State": "AOJu0YzITIxJkiMTLItss3GvdV/GEE19dy7tqAGNzm0/jcn/b259LMvk\n\tHd2DJMB9wr2djMyb/gZ62f0dDCB9Ljbsd2+PL/BceCGsv2LEtb6UEfcXzUhkF1X8ZpE=", "X-Gm-Gg": "AeBDieveYIbfcAqBLYv2Itcyj5dB5F+PpTNpK62Az1PQ7AhT8+kT/LyyyydgvUmhjrG\n\tPpwTiXAkv19uT8pHxVpjbRqcBp4AYlXHtnFeYQVuFyAQ2SPFowOmcd5LFtkbULfBphS1W2XdgfN\n\tiSkfRt2Y1R+XWRjabMSwSrzCQqJ7Qz2x0T+1itshzav0W+fD8c4O2oQW5TMEHiLYTmqGZ7kZZRP\n\tBk5h4DFvpDI614HJ9gkOK0Id7olhuF8iU48M9M8+3sJOXDoEEGVtPsxICkVqPMcfFPvuI8zYUvd\n\tjUwFuSSM+z4JbpKAhxPCoETKEmc4iU5l7XD0FfExub6GxX1wZ7ad5UFu/GOdD7YJ2UHamdCEH9r\n\tTQKMykYkjYGA3lmHBZ2TOhdBPhaxFIqbHdesbkt01JY4p6dcnDfeL6LJTqu1v+H9hyz1BQLT6b3\n\tsjHmJvnRqrFz86T5qq/7wsLeOL2KkF/razEzCt5eXIw7TLyY9gk3BEmG5jTyx7Egd0jZRhy2pUt\n\tSiiFbnBr4o7nEXM+VJSA+nwJ+jy0tsolWR9jKRC", "X-Received": "by 2002:a17:903:2783:b0:2b2:539b:d2b1 with SMTP id\n d9443c01a7336-2b2d596537amr31136705ad.16.1775851569863;\n Fri, 10 Apr 2026 13:06:09 -0700 (PDT)", "From": "Piyush Patle <piyushpatle228@gmail.com>", "To": "Mark Brown <broonie@kernel.org>", "Cc": "Liam Girdwood <lgirdwood@gmail.com>,\n\tJaroslav Kysela <perex@perex.cz>,\n\tTakashi Iwai <tiwai@suse.com>,\n\tThierry Reding <thierry.reding@gmail.com>,\n\tJonathan Hunter <jonathanh@nvidia.com>,\n\tSheetal <sheetal@nvidia.com>,\n\tKuninori Morimoto <kuninori.morimoto.gx@renesas.com>,\n\tlinux-sound@vger.kernel.org,\n\tlinux-tegra@vger.kernel.org,\n\tlinux-kernel@vger.kernel.org", "Subject": "[PATCH v3 1/2] ASoC: tegra210_adx: simplify byte map get/put logic", "Date": "Sat, 11 Apr 2026 01:35:22 +0530", "Message-ID": "<20260410200530.171323-2-piyushpatle228@gmail.com>", "X-Mailer": "git-send-email 2.43.0", "In-Reply-To": "<20260410200530.171323-1-piyushpatle228@gmail.com>", "References": "<20260410200530.171323-1-piyushpatle228@gmail.com>", "Precedence": "bulk", "X-Mailing-List": "linux-tegra@vger.kernel.org", "List-Id": "<linux-tegra.vger.kernel.org>", "List-Subscribe": "<mailto:linux-tegra+subscribe@vger.kernel.org>", "List-Unsubscribe": "<mailto:linux-tegra+unsubscribe@vger.kernel.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit" }, "content": "The byte-map controls (\"Byte Map N\") already expose a value range of\n[0, 256] to userspace via SOC_SINGLE_EXT(), where 256 is the\n\"disabled\" sentinel. The driver stored this state as a byte-packed\nu32 map[] array plus a separate byte_mask[] bitmap tracking which\nslots were enabled, because 256 does not fit in a byte. As a result\nget_byte_map() had to consult byte_mask[] to decide whether to\nreport the stored byte or 256, and put_byte_map() had to keep the\ntwo arrays in sync on every write.\n\nStore each slot as a u16 holding the control value directly\n(0..255 enabled, 256 disabled). This is the native representation\nfor what userspace already sees, so get_byte_map() becomes a direct\nreturn and put_byte_map() becomes a compare-and-store. The\nhardware-facing packed RAM word and the IN_BYTE_EN mask are now\nderived on the fly inside tegra210_adx_write_map_ram() from the\nslot array, which is the only place that needs to know about the\nhardware layout.\n\nThe byte_mask buffer is allocated in probe() using devm_kcalloc()\nwith soc_data->byte_mask_size, so it scales to any SoC variant\nwithout depending on chip-specific constants. It is zeroed and\nrecomputed each time write_map_ram() is called.\n\nA new TEGRA_ADX_SLOTS_PER_WORD constant replaces the literal '4'\nused for byte slots per RAM word, and BITS_PER_BYTE /\nBITS_PER_TYPE() from <linux/bits.h> replace the literal '8' and\n'32' shifts.\n\nSlots are initialised to 256 in probe() so the default reported\nvalue stays \"disabled\", matching previous behaviour. Values written\nfrom userspace that fall outside [0, 255] are clamped to 256\n(\"disabled\") exactly as before -- no userspace-visible change.\n\nAs a side effect this also fixes a latent bug in the previous\nput_byte_map(): because it compared the enable mask rather than the\nstored byte, changing a slot from one enabled value to another\nenabled value (e.g. 42 -> 99) would early-return without persisting\nthe new value, and the next CFG_RAM flush would still program the\nold byte. The new implementation compares the stored value itself,\nso this case is now handled correctly.\n\nAddresses TODO left in tegra210_adx_get_byte_map().\n\nSigned-off-by: Piyush Patle <piyushpatle228@gmail.com>\n---\nChanges since v2:\n - Move byte_mask allocation back to probe() with devm_kcalloc()\n using soc_data->byte_mask_size; revert write_map_ram() to void\n and runtime_resume() to returning 0. Suggested by Jon Hunter.\n - Fix bits_per_mask: use BITS_PER_TYPE(*adx->byte_mask) instead of\n the incorrect BITS_PER_TYPE(*adx->map) * BITS_PER_BYTE. Reported\n by Mark Brown.\n - Drop <linux/slab.h> include (no longer needed without kfree).\n\nChanges since v1:\n - Use dynamic sizing via soc_data->byte_mask_size instead of\n chip-specific constants. Suggested by Sheetal.\n - Replace magic numbers with TEGRA_ADX_SLOTS_PER_WORD and use\n BITS_PER_BYTE / BITS_PER_TYPE(). Suggested by Sheetal.\n - Add <linux/bits.h> include.\n\n sound/soc/tegra/tegra210_adx.c | 85 ++++++++++++++++++----------------\n sound/soc/tegra/tegra210_adx.h | 5 +-\n 2 files changed, 49 insertions(+), 41 deletions(-)", "diff": "diff --git a/sound/soc/tegra/tegra210_adx.c b/sound/soc/tegra/tegra210_adx.c\nindex 95875c75ddf8..1d25e490879e 100644\n--- a/sound/soc/tegra/tegra210_adx.c\n+++ b/sound/soc/tegra/tegra210_adx.c\n@@ -4,6 +4,7 @@\n //\n // tegra210_adx.c - Tegra210 ADX driver\n \n+#include <linux/bits.h>\n #include <linux/clk.h>\n #include <linux/device.h>\n #include <linux/io.h>\n@@ -47,18 +48,36 @@ static const struct reg_default tegra264_adx_reg_defaults[] = {\n \n static void tegra210_adx_write_map_ram(struct tegra210_adx *adx)\n {\n+\tconst unsigned int bits_per_mask = BITS_PER_TYPE(*adx->byte_mask);\n \tint i;\n \n+\tmemset(adx->byte_mask, 0,\n+\t adx->soc_data->byte_mask_size * sizeof(*adx->byte_mask));\n+\n \tregmap_write(adx->regmap, TEGRA210_ADX_CFG_RAM_CTRL +\n \t\t\tadx->soc_data->cya_offset,\n \t\t TEGRA210_ADX_CFG_RAM_CTRL_SEQ_ACCESS_EN |\n \t\t TEGRA210_ADX_CFG_RAM_CTRL_ADDR_INIT_EN |\n \t\t TEGRA210_ADX_CFG_RAM_CTRL_RW_WRITE);\n \n-\tfor (i = 0; i < adx->soc_data->ram_depth; i++)\n+\tfor (i = 0; i < adx->soc_data->ram_depth; i++) {\n+\t\tu32 word = 0;\n+\t\tint b;\n+\n+\t\tfor (b = 0; b < TEGRA_ADX_SLOTS_PER_WORD; b++) {\n+\t\t\tunsigned int slot = i * TEGRA_ADX_SLOTS_PER_WORD + b;\n+\t\t\tu16 val = adx->map[slot];\n+\n+\t\t\tif (val >= 256)\n+\t\t\t\tcontinue;\n+\n+\t\t\tword |= (u32)val << (b * BITS_PER_BYTE);\n+\t\t\tadx->byte_mask[slot / bits_per_mask] |=\n+\t\t\t\t1U << (slot % bits_per_mask);\n+\t\t}\n \t\tregmap_write(adx->regmap, TEGRA210_ADX_CFG_RAM_DATA +\n-\t\t\t\tadx->soc_data->cya_offset,\n-\t\t\t adx->map[i]);\n+\t\t\t\tadx->soc_data->cya_offset, word);\n+\t}\n \n \tfor (i = 0; i < adx->soc_data->byte_mask_size; i++)\n \t\tregmap_write(adx->regmap,\n@@ -188,27 +207,10 @@ static int tegra210_adx_get_byte_map(struct snd_kcontrol *kcontrol,\n {\n \tstruct snd_soc_component *cmpnt = snd_kcontrol_chip(kcontrol);\n \tstruct tegra210_adx *adx = snd_soc_component_get_drvdata(cmpnt);\n-\tstruct soc_mixer_control *mc;\n-\tunsigned char *bytes_map = (unsigned char *)adx->map;\n-\tint enabled;\n-\n-\tmc = (struct soc_mixer_control *)kcontrol->private_value;\n-\tenabled = adx->byte_mask[mc->reg / 32] & (1 << (mc->reg % 32));\n+\tstruct soc_mixer_control *mc =\n+\t\t(struct soc_mixer_control *)kcontrol->private_value;\n \n-\t/*\n-\t * TODO: Simplify this logic to just return from bytes_map[]\n-\t *\n-\t * Presently below is required since bytes_map[] is\n-\t * tightly packed and cannot store the control value of 256.\n-\t * Byte mask state is used to know if 256 needs to be returned.\n-\t * Note that for control value of 256, the put() call stores 0\n-\t * in the bytes_map[] and disables the corresponding bit in\n-\t * byte_mask[].\n-\t */\n-\tif (enabled)\n-\t\tucontrol->value.integer.value[0] = bytes_map[mc->reg];\n-\telse\n-\t\tucontrol->value.integer.value[0] = 256;\n+\tucontrol->value.integer.value[0] = adx->map[mc->reg];\n \n \treturn 0;\n }\n@@ -218,23 +220,22 @@ static int tegra210_adx_put_byte_map(struct snd_kcontrol *kcontrol,\n {\n \tstruct snd_soc_component *cmpnt = snd_kcontrol_chip(kcontrol);\n \tstruct tegra210_adx *adx = snd_soc_component_get_drvdata(cmpnt);\n-\tunsigned char *bytes_map = (unsigned char *)adx->map;\n-\tint value = ucontrol->value.integer.value[0];\n \tstruct soc_mixer_control *mc =\n \t\t(struct soc_mixer_control *)kcontrol->private_value;\n-\tunsigned int mask_val = adx->byte_mask[mc->reg / 32];\n+\tunsigned int value = ucontrol->value.integer.value[0];\n \n-\tif (value >= 0 && value <= 255)\n-\t\tmask_val |= (1 << (mc->reg % 32));\n-\telse\n-\t\tmask_val &= ~(1 << (mc->reg % 32));\n+\t/*\n+\t * Match the previous behaviour: any value outside [0, 255] is\n+\t * treated as the \"disabled\" sentinel (256). Negative values from\n+\t * userspace fold in through the unsigned cast and are caught here.\n+\t */\n+\tif (value > 255)\n+\t\tvalue = 256;\n \n-\tif (mask_val == adx->byte_mask[mc->reg / 32])\n+\tif (adx->map[mc->reg] == value)\n \t\treturn 0;\n \n-\t/* Update byte map and slot */\n-\tbytes_map[mc->reg] = value % 256;\n-\tadx->byte_mask[mc->reg / 32] = mask_val;\n+\tadx->map[mc->reg] = value;\n \n \treturn 1;\n }\n@@ -675,7 +676,7 @@ static int tegra210_adx_platform_probe(struct platform_device *pdev)\n \tconst struct of_device_id *match;\n \tstruct tegra210_adx_soc_data *soc_data;\n \tvoid __iomem *regs;\n-\tint err;\n+\tint err, i;\n \n \tadx = devm_kzalloc(dev, sizeof(*adx), GFP_KERNEL);\n \tif (!adx)\n@@ -700,17 +701,21 @@ static int tegra210_adx_platform_probe(struct platform_device *pdev)\n \n \tregcache_cache_only(adx->regmap, true);\n \n-\tadx->map = devm_kzalloc(dev, soc_data->ram_depth * sizeof(*adx->map),\n-\t\t\t\tGFP_KERNEL);\n+\tadx->map = devm_kcalloc(dev,\n+\t\t\t\tsoc_data->ram_depth * TEGRA_ADX_SLOTS_PER_WORD,\n+\t\t\t\tsizeof(*adx->map), GFP_KERNEL);\n \tif (!adx->map)\n \t\treturn -ENOMEM;\n \n-\tadx->byte_mask = devm_kzalloc(dev,\n-\t\t\t\t soc_data->byte_mask_size * sizeof(*adx->byte_mask),\n-\t\t\t\t GFP_KERNEL);\n+\tadx->byte_mask = devm_kcalloc(dev, soc_data->byte_mask_size,\n+\t\t\t\t sizeof(*adx->byte_mask), GFP_KERNEL);\n \tif (!adx->byte_mask)\n \t\treturn -ENOMEM;\n \n+\t/* Initialise all byte map slots as disabled (value 256). */\n+\tfor (i = 0; i < soc_data->ram_depth * TEGRA_ADX_SLOTS_PER_WORD; i++)\n+\t\tadx->map[i] = 256;\n+\n \ttegra210_adx_dais[TEGRA_ADX_IN_DAI_ID].playback.channels_max =\n \t\t\tadx->soc_data->max_ch;\n \ndiff --git a/sound/soc/tegra/tegra210_adx.h b/sound/soc/tegra/tegra210_adx.h\nindex 176a4e40de0a..a6298c3dcca5 100644\n--- a/sound/soc/tegra/tegra210_adx.h\n+++ b/sound/soc/tegra/tegra210_adx.h\n@@ -8,6 +8,8 @@\n #ifndef __TEGRA210_ADX_H__\n #define __TEGRA210_ADX_H__\n \n+#include <linux/types.h>\n+\n /* Register offsets from TEGRA210_ADX*_BASE */\n #define TEGRA210_ADX_RX_STATUS\t\t0x0c\n #define TEGRA210_ADX_RX_INT_STATUS\t0x10\n@@ -61,6 +63,7 @@\n #define TEGRA210_ADX_SOFT_RESET_SOFT_DEFAULT\t\t(0 << TEGRA210_ADX_SOFT_RESET_SOFT_RESET_SHIFT)\n \n #define TEGRA210_ADX_AUDIOCIF_CH_STRIDE\t\t4\n+#define TEGRA_ADX_SLOTS_PER_WORD\t\t4\n #define TEGRA210_ADX_RAM_DEPTH\t\t\t16\n #define TEGRA210_ADX_MAP_STREAM_NUMBER_SHIFT\t6\n #define TEGRA210_ADX_MAP_WORD_NUMBER_SHIFT\t2\n@@ -88,8 +91,8 @@ struct tegra210_adx_soc_data {\n \n struct tegra210_adx {\n \tstruct regmap *regmap;\n-\tunsigned int *map;\n \tunsigned int *byte_mask;\n+\tu16 *map;\n \tconst struct tegra210_adx_soc_data *soc_data;\n };\n \n", "prefixes": [ "v3", "1/2" ] }