Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/1.0/patches/2197350/?format=api
{ "id": 2197350, "url": "http://patchwork.ozlabs.org/api/1.0/patches/2197350/?format=api", "project": { "id": 21, "url": "http://patchwork.ozlabs.org/api/1.0/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": "<20260217173457.18628-5-akhilrajeev@nvidia.com>", "date": "2026-02-17T17:34:53", "name": "[4/8] dmaengine: tegra: Use struct for register offsets", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": false, "hash": "091c30d892d1831c50e149b1d7581b57a1565890", "submitter": { "id": 81965, "url": "http://patchwork.ozlabs.org/api/1.0/people/81965/?format=api", "name": "Akhil R", "email": "akhilrajeev@nvidia.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/linux-tegra/patch/20260217173457.18628-5-akhilrajeev@nvidia.com/mbox/", "series": [ { "id": 492464, "url": "http://patchwork.ozlabs.org/api/1.0/series/492464/?format=api", "date": "2026-02-17T17:34:49", "name": "Add GPCDMA support in Tegra264", "version": 1, "mbox": "http://patchwork.ozlabs.org/series/492464/mbox/" } ], "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/2197350/checks/", "tags": {}, "headers": { "Return-Path": "\n <linux-tegra+bounces-12015-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=Nvidia.com header.i=@Nvidia.com header.a=rsa-sha256\n header.s=selector2 header.b=GsoMnu7y;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org\n (client-ip=2600:3c09:e001:a7::12fc:5321; helo=sto.lore.kernel.org;\n envelope-from=linux-tegra+bounces-12015-incoming=patchwork.ozlabs.org@vger.kernel.org;\n receiver=patchwork.ozlabs.org)", "smtp.subspace.kernel.org;\n\tdkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com\n header.b=\"GsoMnu7y\"", "smtp.subspace.kernel.org;\n arc=fail smtp.client-ip=40.93.201.8", "smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=nvidia.com", "smtp.subspace.kernel.org;\n spf=fail smtp.mailfrom=nvidia.com" ], "Received": [ "from sto.lore.kernel.org (sto.lore.kernel.org\n [IPv6:2600:3c09:e001:a7::12fc:5321])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fFmzL0rN1z1xwD\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 18 Feb 2026 04:36:46 +1100 (AEDT)", "from smtp.subspace.kernel.org (conduit.subspace.kernel.org\n [100.90.174.1])\n\tby sto.lore.kernel.org (Postfix) with ESMTP id 07CD130054C4\n\tfor <incoming@patchwork.ozlabs.org>; Tue, 17 Feb 2026 17:36:43 +0000 (UTC)", "from localhost.localdomain (localhost.localdomain [127.0.0.1])\n\tby smtp.subspace.kernel.org (Postfix) with ESMTP id 54849371052;\n\tTue, 17 Feb 2026 17:36:42 +0000 (UTC)", "from CY3PR05CU001.outbound.protection.outlook.com\n (mail-westcentralusazon11013008.outbound.protection.outlook.com\n [40.93.201.8])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby smtp.subspace.kernel.org (Postfix) with ESMTPS id 5330036EA9E;\n\tTue, 17 Feb 2026 17:36:40 +0000 (UTC)", "from SJ0PR13CA0030.namprd13.prod.outlook.com (2603:10b6:a03:2c0::35)\n by DM3PR12MB9326.namprd12.prod.outlook.com (2603:10b6:0:3d::14) with\n Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9611.16; Tue, 17 Feb\n 2026 17:36:26 +0000", "from SJ1PEPF00002315.namprd03.prod.outlook.com\n (2603:10b6:a03:2c0:cafe::6f) by SJ0PR13CA0030.outlook.office365.com\n (2603:10b6:a03:2c0::35) with Microsoft SMTP Server (version=TLS1_3,\n cipher=TLS_AES_256_GCM_SHA384) id 15.20.9632.13 via Frontend Transport; Tue,\n 17 Feb 2026 17:36:00 +0000", "from mail.nvidia.com (216.228.118.233) by\n SJ1PEPF00002315.mail.protection.outlook.com (10.167.242.169) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.20.9632.12 via Frontend Transport; Tue, 17 Feb 2026 17:36:26 +0000", "from drhqmail202.nvidia.com (10.126.190.181) by mail.nvidia.com\n (10.127.129.6) with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.2562.20; Tue, 17 Feb\n 2026 09:36:14 -0800", "from drhqmail202.nvidia.com (10.126.190.181) by\n drhqmail202.nvidia.com (10.126.190.181) with Microsoft SMTP Server\n (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n 15.2.2562.20; Tue, 17 Feb 2026 09:36:13 -0800", "from BUILDSERVER-IO-L4T.nvidia.com (10.127.8.9) by mail.nvidia.com\n (10.126.190.181) with Microsoft SMTP Server id 15.2.2562.20 via Frontend\n Transport; Tue, 17 Feb 2026 09:36:10 -0800" ], "ARC-Seal": [ "i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;\n\tt=1771349802; cv=fail;\n b=YCcLL+jZPf8nu8ID+h5EZlOgKwp4QREPKF3UXpLtrb8yN0xE97Oe/Yz3M/TeDEk7xl8NULXYDCZksL/De93LdjjDQoumdivP1LgAMa01PyJAemjkjqv0TAdem8kI9jOF8qRGHSg7liZkUwyJNkG2sw51d5qYPKZgSVk4mrUjvoE=", "i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none;\n b=uKUBZSxYFL8k67zar+Fp26RiFaP2Zy6Xucw9j+QJ9OWmAoaK/fbYp6lpgKl3B85xhsCoGKbSKkOC7gxEV9EFox84+GZEHHWn8rIOAqC2Zr6M5K91T+VS5Al+1gSdWINfEOQ9J3J2wsXV7ciXIh4n1Rlc75QTLzVwDhQh5iBqYfNJxgB8aCPq4CCxH0+6psW98+vuj3ks0DFTmDT8Qy6bn7wuOxJIj29z3fq+T1PTWXLJdZKI6Y6xsgxryc0kfhd7yfXCMN9tFE8EekaFJQGBkGWx86nrurFRZ00Qyv6tZw6Vvbzm5x0dPW8XRRWhIfVLQXQX0TQ05TQPzYnfGjaymA==" ], "ARC-Message-Signature": [ "i=2; a=rsa-sha256; d=subspace.kernel.org;\n\ts=arc-20240116; t=1771349802; c=relaxed/simple;\n\tbh=JhzGtl8jwoYGquOyl+/GitjrT4NreVmoAZp8s9/7GJk=;\n\th=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=Hlr9W/27FERO25Ei/4ldUhYRAECdY9vhtsKqTklmmgT8jOpxitQpxsqhcqCvKABLQ4+748svLBBOb8MdbkY28XsZDRfpFer41hqheN13MyC+2sXn+nWiTIRY9ACuVaIeEgsXI/mDH830xKmqotVR9MC027Wzt6HHTHvYZRpoXVU=", "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector10001;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1;\n bh=3mfgGmbywXr5P++ughYan1cbFFjyUS6TLwcxnpbgg4s=;\n b=rPbmWU2aE3ZslH2qoh9yf+DTa4O87WsB/gPxD6t0iDI+lkzuGJQ/RzIPhNvbKuBJKAR/Y0sEvQps915+sCFTCa4pe5Q0AImu2W8Cj2Bk0UTdh4+tyxhntj+tqObMNO8E184zjgxRLAyPlTGDJ5m0IpcFore3uzVhYRAQXSqOOs+FOwcZvXOa/lj2zu7dWc1CqBaw6kRW7o55w52Wm7iq3oP15M7o7ouUfP3I5uWcGMuzNiauSXNLq/zIzv7dKDODhk3M2wxfYTQ0pCJseM3d7nfUkLo8INX/sOZcN9WFxbViG8JMRbUJaNWl/hFf4iwSySkS2M0LpNLn9gcwZu3Exw==" ], "ARC-Authentication-Results": [ "i=2; smtp.subspace.kernel.org;\n dmarc=pass (p=reject dis=none) header.from=nvidia.com;\n spf=fail smtp.mailfrom=nvidia.com;\n dkim=pass (2048-bit key) header.d=Nvidia.com header.i=@Nvidia.com\n header.b=GsoMnu7y; arc=fail smtp.client-ip=40.93.201.8", "i=1; mx.microsoft.com 1; spf=pass (sender ip is\n 216.228.118.233) smtp.rcpttodomain=vger.kernel.org smtp.mailfrom=nvidia.com;\n dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com;\n dkim=none (message not signed); arc=none (0)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com;\n s=selector2;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=3mfgGmbywXr5P++ughYan1cbFFjyUS6TLwcxnpbgg4s=;\n b=GsoMnu7yRmnU8OkxLwtvH6VymXoNwIETKbXCqvUQ8kdX541rEs7Sh9mrwjJOJNtUVc2A2649zfdMm2l0IPEKSiWh+raxc1Hl+SiGJ/S/qUiGr9zsxce6m/FcqNKSd3jGnvKh8MmyD8BI/MPbCM0QgYe8JquO9J9DPbTy4XlZBpQXMy1NyDcWbWS3U61WLOrH+/bugOxx1k/gKCdF0pRREcHVSVBbE8GJnO/isdSJLL0mdvXC1O1Yy71J31tf3ilweG4pNgLlMoakM29vHzT6DBv/87XsrkrOvzITL7AQImhWpTi2iMiRtmpWNg7YnXBXcjxTp2+940AMre4i/DyE+g==", "X-MS-Exchange-Authentication-Results": "spf=pass (sender IP is 216.228.118.233)\n smtp.mailfrom=nvidia.com; dkim=none (message not signed)\n header.d=none;dmarc=pass action=none header.from=nvidia.com;", "Received-SPF": "Pass (protection.outlook.com: domain of nvidia.com designates\n 216.228.118.233 as permitted sender) receiver=protection.outlook.com;\n client-ip=216.228.118.233; helo=mail.nvidia.com; pr=C", "From": "Akhil R <akhilrajeev@nvidia.com>", "To": "<dmaengine@vger.kernel.org>, <linux-tegra@vger.kernel.org>", "CC": "<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,\n\t<vkoul@kernel.org>, <Frank.Li@kernel.org>, <robh@kernel.org>,\n\t<krzk+dt@kernel.org>, <conor+dt@kernel.org>, <thierry.reding@gmail.com>,\n\t<jonathanh@nvidia.com>, <p.zabel@pengutronix.de>, Akhil R\n\t<akhilrajeev@nvidia.com>", "Subject": "[PATCH 4/8] dmaengine: tegra: Use struct for register offsets", "Date": "Tue, 17 Feb 2026 23:04:53 +0530", "Message-ID": "<20260217173457.18628-5-akhilrajeev@nvidia.com>", "X-Mailer": "git-send-email 2.50.1", "In-Reply-To": "<20260217173457.18628-1-akhilrajeev@nvidia.com>", "References": "<20260217173457.18628-1-akhilrajeev@nvidia.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", "X-NVConfidentiality": "public", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain", "X-NV-OnPremToCloud": "ExternallySecured", "X-EOPAttributedMessage": "0", "X-MS-PublicTrafficType": "Email", "X-MS-TrafficTypeDiagnostic": "SJ1PEPF00002315:EE_|DM3PR12MB9326:EE_", "X-MS-Office365-Filtering-Correlation-Id": "a91b4b8a-9f10-4ef3-a6a7-08de6e4b13a6", "X-MS-Exchange-SenderADCheck": "1", "X-MS-Exchange-AntiSpam-Relay": "0", "X-Microsoft-Antispam": "\n\tBCL:0;ARA:13230040|1800799024|376014|7416014|36860700013|82310400026;", "X-Microsoft-Antispam-Message-Info": "\n gTK75lEPA0VAxhEiUzznQwlXSAMIaFGst63/NNwTFbc3PFfD1NOPk+vPykM5G1e8zM2kd0uy254vqjbQRnEvfQvFr19FpImqRwCaQlY9DRzsP6QuFsqr8jIddUSCzH8JPiOM/c6lT6L2FO2bZBuqRYFJVVW/xlNUHYarWCPQtYYwklj9J6dV8SJ94TqICAbPpEpPfeePdHPZ2+8DcsuEabWj5+bCr8WZjxJW9JPJ5ofiRnWXliQBtiA3fT1S84bMYljKB0NVvVuk4hHKizX/ybzl9pILYE6XqIquwx/stO3k4Z/wQX606CDslwGs6Pd/Rc/AWonipAzT3wM0+JkNcbwvTl7E6Pi1EcX8GT6Pl0doEQTfijwZid5aPhIsI4cOTePsj8aLJCT1fSG7c/k+2XEKwDvUTOgsqW0K/J+IJQ7r++FdL3OXFacpNPtreOIEe+GkzYBM/+bUIurG4rs4Ncyx7pjLJw3+/aD+Nvixv6Xf3nAa5NOfhDlNc+aCoXYv0+7mr3X6rnAB/hGU5y+9Rqny7j8gws6dOidax9zZZ21rQJQ8P+PDssKwPhBRCf40k0U0+qh721/m9aSBRnYE8u+xakRifvSF6BaRRRLPcXTpZiuHBOX/8KYI1ZUxNDwOY99QyXpUsqHC93FTParhRoWBvDr5oQyUGHhni+FZYPtW+CcA4ePf/FsPLk1l2KA9lY015SXpmtz5iHX7WrodcxDf5T/3+/NOwUNX2z1mZ2d/KtxL03dr6JpklXv83lVcquZ5FRxorvWJNNjttzinoJlc1xNFGW0cG0JUERFE7sm6OwomQtxhpQsgXfs4IUPP7phzhKlE8YyEOMT4VoyJu0+tip0janKgs7gHQySNANseqTEEaTMWoD6esHPbSFWAinjkylaGWL4F6GADR35vsB9t0TJ8GxFT2JgSfQoTJsGD+LTBZ5Qu5+EcUuIUQYxNn/00YXOzlDTfqQaD1TABume8Vfnk+SC4qGhFbriQ1Q+4ByAcnJERyQLvZ+uoII03WTxHf+X8UGMcmMvPtZ7mvyNTPyLQrlJ7zA1Zdd25Pt+WB9fzZ6/5FOwdBV+6XKsrT9ACG+sFObqgRzo2/tH5YSliGrKxU2jWLzKOtJ6IsxbfradF8WMXiqmHioJvFNtaTm+upcNk9UGBEf3qKYRq1idg/Z9SBnjs4V3REikcOB6Jwh77MzTeJGbi10dUIa8ugx1nMNJRfDjerpRjQS5VIuLS/DP+h+FZjUt69ohIwR8AeSboXlzdLKT0OEpLJ9J4ovSm/6E6LaHiGjdMTy2KQ8+z9Y4tHhdOe260lRrzWJKyl/+opiCoeToursZbjC+WCkRJiJg8MvRXZoj6doJMpjfCRtQz56+PAyWW1pLZFSl7LM5abjDH3ZcibccgZNi2DKWh+PGG44UkGtkuvxf0rX29z+FmDB+uOub6L1g2ixSaYQr37zU4lqryS84sWUZFREs09oJOPedkDJBphKaj6g8yjs5mVZ5GdTG++UPlDLDjckIOmPjDonEsVycNLValV4GibKHtgmvzHgtwJ+6ARaAVbyrd7siG0K/WK8j0z2jMsMXrUEUfT3AQ81zW8nfe+3rE9HN/0+rhCT2azRWS73YaBzJdDlPIKskjMK0je4qvbOPb0c19jxFaTmg6Jf6cRf6jCNCcaKJkfmzGJyajdg==", "X-Forefront-Antispam-Report": "\n\tCIP:216.228.118.233;CTRY:US;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:mail.nvidia.com;PTR:dc7edge2.nvidia.com;CAT:NONE;SFS:(13230040)(1800799024)(376014)(7416014)(36860700013)(82310400026);DIR:OUT;SFP:1101;", "X-MS-Exchange-AntiSpam-MessageData-ChunkCount": "1", "X-MS-Exchange-AntiSpam-MessageData-0": "\n\tO+UjE1iEz9ZuRr0CdFMGRJGj+/RIX3jMdxmxAyvH62slEahB3is9zLPxgfdUVfDk2JJ0oryWKDPeOx5fC0wFrc6BfFS6E0yfDubavzPjj125uTV6C39oOFAo9U0o6K6PjTmtvHLNE8z59akpvIdPb8GQVVSgkKBUP99/UR0p8lW3Ytp5OP/QvIXWubBKuYYA6JD+GJw79qssNte0LeAx2a14iOS0VobrAqw9TOhsHd50Sj5Ywhq6goLAE0iVUNDncA6boyf7+LFokQN/TuQnQpkwZ5BZiji8ATB92DF4aKTU3nUqFY7QNFoj499O2Ylgec1IM3/MrEeC7/B/G7VnttFo4YgVxW6Gj7uSVJ5c2hst9MfLDCR7SPslrdPfnjRS9Nl05iTA+mjO6PrtGwAn12kOrnpw0x9OTudqzXOECv2BAJ+dBJpyEW06kNLY5OF+", "X-OriginatorOrg": "Nvidia.com", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "17 Feb 2026 17:36:26.4233\n (UTC)", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n a91b4b8a-9f10-4ef3-a6a7-08de6e4b13a6", "X-MS-Exchange-CrossTenant-Id": "43083d15-7273-40c1-b7db-39efd9ccc17a", "X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp": "\n TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.118.233];Helo=[mail.nvidia.com]", "X-MS-Exchange-CrossTenant-AuthSource": "\n\tSJ1PEPF00002315.namprd03.prod.outlook.com", "X-MS-Exchange-CrossTenant-AuthAs": "Anonymous", "X-MS-Exchange-CrossTenant-FromEntityHeader": "HybridOnPrem", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "DM3PR12MB9326" }, "content": "Repurpose tegra_dma_channel_regs struct to define offsets for all the\nchannel registers. Previously, the struct only held the register values\nfor each transfer and was wrapped within tegra_dma_sg_req. Now, let\nstruct tegra_dma_sg_req hold the values directly and use channel_regs\nfor storing the register offsets. Update all register read/write to use\nchannel_regs struct. This is to accommodate the register offset change\nin Tegra264.\n\nSigned-off-by: Akhil R <akhilrajeev@nvidia.com>\n---\n drivers/dma/tegra186-gpc-dma.c | 280 +++++++++++++++++----------------\n 1 file changed, 147 insertions(+), 133 deletions(-)", "diff": "diff --git a/drivers/dma/tegra186-gpc-dma.c b/drivers/dma/tegra186-gpc-dma.c\nindex 236a298c26a1..72701b543ceb 100644\n--- a/drivers/dma/tegra186-gpc-dma.c\n+++ b/drivers/dma/tegra186-gpc-dma.c\n@@ -22,7 +22,6 @@\n #include \"virt-dma.h\"\n \n /* CSR register */\n-#define TEGRA_GPCDMA_CHAN_CSR\t\t\t0x00\n #define TEGRA_GPCDMA_CSR_ENB\t\t\tBIT(31)\n #define TEGRA_GPCDMA_CSR_IE_EOC\t\t\tBIT(30)\n #define TEGRA_GPCDMA_CSR_ONCE\t\t\tBIT(27)\n@@ -58,7 +57,6 @@\n #define TEGRA_GPCDMA_CSR_WEIGHT\t\t\tGENMASK(13, 10)\n \n /* STATUS register */\n-#define TEGRA_GPCDMA_CHAN_STATUS\t\t0x004\n #define TEGRA_GPCDMA_STATUS_BUSY\t\tBIT(31)\n #define TEGRA_GPCDMA_STATUS_ISE_EOC\t\tBIT(30)\n #define TEGRA_GPCDMA_STATUS_PING_PONG\t\tBIT(28)\n@@ -70,22 +68,13 @@\n #define TEGRA_GPCDMA_STATUS_IRQ_STA\t\tBIT(21)\n #define TEGRA_GPCDMA_STATUS_IRQ_TRIG_STA\tBIT(20)\n \n-#define TEGRA_GPCDMA_CHAN_CSRE\t\t\t0x008\n #define TEGRA_GPCDMA_CHAN_CSRE_PAUSE\t\tBIT(31)\n \n-/* Source address */\n-#define TEGRA_GPCDMA_CHAN_SRC_PTR\t\t0x00C\n-\n-/* Destination address */\n-#define TEGRA_GPCDMA_CHAN_DST_PTR\t\t0x010\n-\n /* High address pointer */\n-#define TEGRA_GPCDMA_CHAN_HIGH_ADDR_PTR\t\t0x014\n #define TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR\t\tGENMASK(7, 0)\n #define TEGRA_GPCDMA_HIGH_ADDR_DST_PTR\t\tGENMASK(23, 16)\n \n /* MC sequence register */\n-#define TEGRA_GPCDMA_CHAN_MCSEQ\t\t\t0x18\n #define TEGRA_GPCDMA_MCSEQ_DATA_SWAP\t\tBIT(31)\n #define TEGRA_GPCDMA_MCSEQ_REQ_COUNT\t\tGENMASK(30, 25)\n #define TEGRA_GPCDMA_MCSEQ_BURST\t\tGENMASK(24, 23)\n@@ -101,7 +90,6 @@\n #define TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK\tGENMASK(6, 0)\n \n /* MMIO sequence register */\n-#define TEGRA_GPCDMA_CHAN_MMIOSEQ\t\t\t0x01c\n #define TEGRA_GPCDMA_MMIOSEQ_DBL_BUF\t\tBIT(31)\n #define TEGRA_GPCDMA_MMIOSEQ_BUS_WIDTH\t\tGENMASK(30, 28)\n #define TEGRA_GPCDMA_MMIOSEQ_BUS_WIDTH_8\t\\\n@@ -120,17 +108,7 @@\n #define TEGRA_GPCDMA_MMIOSEQ_WRAP_WORD\t\tGENMASK(18, 16)\n #define TEGRA_GPCDMA_MMIOSEQ_MMIO_PROT\t\tGENMASK(8, 7)\n \n-/* Channel WCOUNT */\n-#define TEGRA_GPCDMA_CHAN_WCOUNT\t\t0x20\n-\n-/* Transfer count */\n-#define TEGRA_GPCDMA_CHAN_XFER_COUNT\t\t0x24\n-\n-/* DMA byte count status */\n-#define TEGRA_GPCDMA_CHAN_DMA_BYTE_STATUS\t0x28\n-\n /* Error Status Register */\n-#define TEGRA_GPCDMA_CHAN_ERR_STATUS\t\t0x30\n #define TEGRA_GPCDMA_CHAN_ERR_TYPE_SHIFT\t8\n #define TEGRA_GPCDMA_CHAN_ERR_TYPE_MASK\t0xF\n #define TEGRA_GPCDMA_CHAN_ERR_TYPE(err)\t(\t\t\t\\\n@@ -143,14 +121,9 @@\n #define TEGRA_DMA_MC_SLAVE_ERR\t\t\t0xB\n #define TEGRA_DMA_MMIO_SLAVE_ERR\t\t0xA\n \n-/* Fixed Pattern */\n-#define TEGRA_GPCDMA_CHAN_FIXED_PATTERN\t\t0x34\n-\n-#define TEGRA_GPCDMA_CHAN_TZ\t\t\t0x38\n #define TEGRA_GPCDMA_CHAN_TZ_MMIO_PROT_1\tBIT(0)\n #define TEGRA_GPCDMA_CHAN_TZ_MC_PROT_1\t\tBIT(1)\n \n-#define TEGRA_GPCDMA_CHAN_SPARE\t\t\t0x3c\n #define TEGRA_GPCDMA_CHAN_SPARE_EN_LEGACY_FC\tBIT(16)\n \n /*\n@@ -181,19 +154,27 @@ struct tegra_dma_chip_data {\n \tunsigned int nr_channels;\n \tunsigned int channel_reg_size;\n \tunsigned int max_dma_count;\n+\tconst struct tegra_dma_channel_regs *channel_regs;\n \tint (*terminate)(struct tegra_dma_channel *tdc);\n };\n \n /* DMA channel registers */\n struct tegra_dma_channel_regs {\n \tu32 csr;\n-\tu32 src_ptr;\n-\tu32 dst_ptr;\n-\tu32 high_addr_ptr;\n+\tu32 status;\n+\tu32 csre;\n+\tu32 src;\n+\tu32 dst;\n+\tu32 high_addr;\n \tu32 mc_seq;\n \tu32 mmio_seq;\n \tu32 wcount;\n+\tu32 wxfer;\n+\tu32 wstatus;\n+\tu32 err_status;\n \tu32 fixed_pattern;\n+\tu32 tz;\n+\tu32 spare;\n };\n \n /*\n@@ -205,7 +186,14 @@ struct tegra_dma_channel_regs {\n */\n struct tegra_dma_sg_req {\n \tunsigned int len;\n-\tstruct tegra_dma_channel_regs ch_regs;\n+\tu32 csr;\n+\tu32 src;\n+\tu32 dst;\n+\tu32 high_addr;\n+\tu32 mc_seq;\n+\tu32 mmio_seq;\n+\tu32 wcount;\n+\tu32 fixed_pattern;\n };\n \n /*\n@@ -228,19 +216,20 @@ struct tegra_dma_desc {\n * tegra_dma_channel: Channel specific information\n */\n struct tegra_dma_channel {\n-\tbool config_init;\n-\tchar name[30];\n-\tenum dma_transfer_direction sid_dir;\n-\tenum dma_status status;\n-\tint id;\n-\tint irq;\n-\tint slave_id;\n+\tconst struct tegra_dma_channel_regs *regs;\n \tstruct tegra_dma *tdma;\n \tstruct virt_dma_chan vc;\n \tstruct tegra_dma_desc *dma_desc;\n \tstruct dma_slave_config dma_sconfig;\n+\tenum dma_transfer_direction sid_dir;\n+\tenum dma_status status;\n \tunsigned int stream_id;\n \tunsigned long chan_base_offset;\n+\tbool config_init;\n+\tchar name[30];\n+\tint id;\n+\tint irq;\n+\tint slave_id;\n };\n \n /*\n@@ -288,22 +277,25 @@ static void tegra_dma_dump_chan_regs(struct tegra_dma_channel *tdc)\n {\n \tdev_dbg(tdc2dev(tdc), \"DMA Channel %d name %s register dump:\\n\",\n \t\ttdc->id, tdc->name);\n-\tdev_dbg(tdc2dev(tdc), \"CSR %x STA %x CSRE %x SRC %x DST %x\\n\",\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_CSR),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_STATUS),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_CSRE),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_SRC_PTR),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_DST_PTR)\n+\tdev_dbg(tdc2dev(tdc), \"CSR %x STA %x CSRE %x\\n\",\n+\t\ttdc_read(tdc, tdc->regs->csr),\n+\t\ttdc_read(tdc, tdc->regs->status),\n+\t\ttdc_read(tdc, tdc->regs->csre)\n \t);\n-\tdev_dbg(tdc2dev(tdc), \"MCSEQ %x IOSEQ %x WCNT %x XFER %x BSTA %x\\n\",\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_MMIOSEQ),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_WCOUNT),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_XFER_COUNT),\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_DMA_BYTE_STATUS)\n+\tdev_dbg(tdc2dev(tdc), \"SRC %x DST %x HI ADDR %x\\n\",\n+\t\ttdc_read(tdc, tdc->regs->src),\n+\t\ttdc_read(tdc, tdc->regs->dst),\n+\t\ttdc_read(tdc, tdc->regs->high_addr)\n+\t);\n+\tdev_dbg(tdc2dev(tdc), \"MCSEQ %x IOSEQ %x WCNT %x XFER %x WSTA %x\\n\",\n+\t\ttdc_read(tdc, tdc->regs->mc_seq),\n+\t\ttdc_read(tdc, tdc->regs->mmio_seq),\n+\t\ttdc_read(tdc, tdc->regs->wcount),\n+\t\ttdc_read(tdc, tdc->regs->wxfer),\n+\t\ttdc_read(tdc, tdc->regs->wstatus)\n \t);\n \tdev_dbg(tdc2dev(tdc), \"DMA ERR_STA %x\\n\",\n-\t\ttdc_read(tdc, TEGRA_GPCDMA_CHAN_ERR_STATUS));\n+\t\ttdc_read(tdc, tdc->regs->err_status));\n }\n \n static int tegra_dma_sid_reserve(struct tegra_dma_channel *tdc,\n@@ -377,13 +369,13 @@ static int tegra_dma_pause(struct tegra_dma_channel *tdc)\n \tint ret;\n \tu32 val;\n \n-\tval = tdc_read(tdc, TEGRA_GPCDMA_CHAN_CSRE);\n+\tval = tdc_read(tdc, tdc->regs->csre);\n \tval |= TEGRA_GPCDMA_CHAN_CSRE_PAUSE;\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSRE, val);\n+\ttdc_write(tdc, tdc->regs->csre, val);\n \n \t/* Wait until busy bit is de-asserted */\n \tret = readl_relaxed_poll_timeout_atomic(tdc->tdma->base_addr +\n-\t\t\ttdc->chan_base_offset + TEGRA_GPCDMA_CHAN_STATUS,\n+\t\t\ttdc->chan_base_offset + tdc->regs->status,\n \t\t\tval,\n \t\t\t!(val & TEGRA_GPCDMA_STATUS_BUSY),\n \t\t\tTEGRA_GPCDMA_BURST_COMPLETE_TIME,\n@@ -419,9 +411,9 @@ static void tegra_dma_resume(struct tegra_dma_channel *tdc)\n {\n \tu32 val;\n \n-\tval = tdc_read(tdc, TEGRA_GPCDMA_CHAN_CSRE);\n+\tval = tdc_read(tdc, tdc->regs->csre);\n \tval &= ~TEGRA_GPCDMA_CHAN_CSRE_PAUSE;\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSRE, val);\n+\ttdc_write(tdc, tdc->regs->csre, val);\n \n \ttdc->status = DMA_IN_PROGRESS;\n }\n@@ -456,27 +448,27 @@ static void tegra_dma_disable(struct tegra_dma_channel *tdc)\n {\n \tu32 csr, status;\n \n-\tcsr = tdc_read(tdc, TEGRA_GPCDMA_CHAN_CSR);\n+\tcsr = tdc_read(tdc, tdc->regs->csr);\n \n \t/* Disable interrupts */\n \tcsr &= ~TEGRA_GPCDMA_CSR_IE_EOC;\n \n \t/* Disable DMA */\n \tcsr &= ~TEGRA_GPCDMA_CSR_ENB;\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR, csr);\n+\ttdc_write(tdc, tdc->regs->csr, csr);\n \n \t/* Clear interrupt status if it is there */\n-\tstatus = tdc_read(tdc, TEGRA_GPCDMA_CHAN_STATUS);\n+\tstatus = tdc_read(tdc, tdc->regs->status);\n \tif (status & TEGRA_GPCDMA_STATUS_ISE_EOC) {\n \t\tdev_dbg(tdc2dev(tdc), \"%s():clearing interrupt\\n\", __func__);\n-\t\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_STATUS, status);\n+\t\ttdc_write(tdc, tdc->regs->status, status);\n \t}\n }\n \n static void tegra_dma_configure_next_sg(struct tegra_dma_channel *tdc)\n {\n \tstruct tegra_dma_desc *dma_desc = tdc->dma_desc;\n-\tstruct tegra_dma_channel_regs *ch_regs;\n+\tstruct tegra_dma_sg_req *sg_req;\n \tint ret;\n \tu32 val;\n \n@@ -488,29 +480,29 @@ static void tegra_dma_configure_next_sg(struct tegra_dma_channel *tdc)\n \n \t/* Configure next transfer immediately after DMA is busy */\n \tret = readl_relaxed_poll_timeout_atomic(tdc->tdma->base_addr +\n-\t\t\ttdc->chan_base_offset + TEGRA_GPCDMA_CHAN_STATUS,\n+\t\t\ttdc->chan_base_offset + tdc->regs->status,\n \t\t\tval,\n \t\t\t(val & TEGRA_GPCDMA_STATUS_BUSY), 0,\n \t\t\tTEGRA_GPCDMA_BURST_COMPLETION_TIMEOUT);\n \tif (ret)\n \t\treturn;\n \n-\tch_regs = &dma_desc->sg_req[dma_desc->sg_idx].ch_regs;\n+\tsg_req = &dma_desc->sg_req[dma_desc->sg_idx];\n \n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_WCOUNT, ch_regs->wcount);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_SRC_PTR, ch_regs->src_ptr);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_DST_PTR, ch_regs->dst_ptr);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_HIGH_ADDR_PTR, ch_regs->high_addr_ptr);\n+\ttdc_write(tdc, tdc->regs->wcount, sg_req->wcount);\n+\ttdc_write(tdc, tdc->regs->src, sg_req->src);\n+\ttdc_write(tdc, tdc->regs->dst, sg_req->dst);\n+\ttdc_write(tdc, tdc->regs->high_addr, sg_req->high_addr);\n \n \t/* Start DMA */\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR,\n-\t\t ch_regs->csr | TEGRA_GPCDMA_CSR_ENB);\n+\ttdc_write(tdc, tdc->regs->csr,\n+\t\t sg_req->csr | TEGRA_GPCDMA_CSR_ENB);\n }\n \n static void tegra_dma_start(struct tegra_dma_channel *tdc)\n {\n \tstruct tegra_dma_desc *dma_desc = tdc->dma_desc;\n-\tstruct tegra_dma_channel_regs *ch_regs;\n+\tstruct tegra_dma_sg_req *sg_req;\n \tstruct virt_dma_desc *vdesc;\n \n \tif (!dma_desc) {\n@@ -526,21 +518,21 @@ static void tegra_dma_start(struct tegra_dma_channel *tdc)\n \t\ttegra_dma_resume(tdc);\n \t}\n \n-\tch_regs = &dma_desc->sg_req[dma_desc->sg_idx].ch_regs;\n+\tsg_req = &dma_desc->sg_req[dma_desc->sg_idx];\n \n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_WCOUNT, ch_regs->wcount);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR, 0);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_SRC_PTR, ch_regs->src_ptr);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_DST_PTR, ch_regs->dst_ptr);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_HIGH_ADDR_PTR, ch_regs->high_addr_ptr);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_FIXED_PATTERN, ch_regs->fixed_pattern);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_MMIOSEQ, ch_regs->mmio_seq);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_MCSEQ, ch_regs->mc_seq);\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR, ch_regs->csr);\n+\ttdc_write(tdc, tdc->regs->wcount, sg_req->wcount);\n+\ttdc_write(tdc, tdc->regs->csr, 0);\n+\ttdc_write(tdc, tdc->regs->src, sg_req->src);\n+\ttdc_write(tdc, tdc->regs->dst, sg_req->dst);\n+\ttdc_write(tdc, tdc->regs->high_addr, sg_req->high_addr);\n+\ttdc_write(tdc, tdc->regs->fixed_pattern, sg_req->fixed_pattern);\n+\ttdc_write(tdc, tdc->regs->mmio_seq, sg_req->mmio_seq);\n+\ttdc_write(tdc, tdc->regs->mc_seq, sg_req->mc_seq);\n+\ttdc_write(tdc, tdc->regs->csr, sg_req->csr);\n \n \t/* Start DMA */\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR,\n-\t\t ch_regs->csr | TEGRA_GPCDMA_CSR_ENB);\n+\ttdc_write(tdc, tdc->regs->csr,\n+\t\t sg_req->csr | TEGRA_GPCDMA_CSR_ENB);\n }\n \n static void tegra_dma_xfer_complete(struct tegra_dma_channel *tdc)\n@@ -601,19 +593,19 @@ static irqreturn_t tegra_dma_isr(int irq, void *dev_id)\n \tu32 status;\n \n \t/* Check channel error status register */\n-\tstatus = tdc_read(tdc, TEGRA_GPCDMA_CHAN_ERR_STATUS);\n+\tstatus = tdc_read(tdc, tdc->regs->err_status);\n \tif (status) {\n \t\ttegra_dma_chan_decode_error(tdc, status);\n \t\ttegra_dma_dump_chan_regs(tdc);\n-\t\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_ERR_STATUS, 0xFFFFFFFF);\n+\t\ttdc_write(tdc, tdc->regs->err_status, 0xFFFFFFFF);\n \t}\n \n \tspin_lock(&tdc->vc.lock);\n-\tstatus = tdc_read(tdc, TEGRA_GPCDMA_CHAN_STATUS);\n+\tstatus = tdc_read(tdc, tdc->regs->status);\n \tif (!(status & TEGRA_GPCDMA_STATUS_ISE_EOC))\n \t\tgoto irq_done;\n \n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_STATUS,\n+\ttdc_write(tdc, tdc->regs->status,\n \t\t TEGRA_GPCDMA_STATUS_ISE_EOC);\n \n \tif (!dma_desc)\n@@ -673,10 +665,10 @@ static int tegra_dma_stop_client(struct tegra_dma_channel *tdc)\n \t * to stop DMA engine from starting any more bursts for\n \t * the given client and wait for in flight bursts to complete\n \t */\n-\tcsr = tdc_read(tdc, TEGRA_GPCDMA_CHAN_CSR);\n+\tcsr = tdc_read(tdc, tdc->regs->csr);\n \tcsr &= ~(TEGRA_GPCDMA_CSR_REQ_SEL_MASK);\n \tcsr |= TEGRA_GPCDMA_CSR_REQ_SEL_UNUSED;\n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_CSR, csr);\n+\ttdc_write(tdc, tdc->regs->csr, csr);\n \n \t/* Wait for in flight data transfer to finish */\n \tudelay(TEGRA_GPCDMA_BURST_COMPLETE_TIME);\n@@ -687,7 +679,7 @@ static int tegra_dma_stop_client(struct tegra_dma_channel *tdc)\n \n \tret = readl_relaxed_poll_timeout_atomic(tdc->tdma->base_addr +\n \t\t\t\ttdc->chan_base_offset +\n-\t\t\t\tTEGRA_GPCDMA_CHAN_STATUS,\n+\t\t\t\ttdc->regs->status,\n \t\t\t\tstatus,\n \t\t\t\t!(status & (TEGRA_GPCDMA_STATUS_CHANNEL_TX |\n \t\t\t\tTEGRA_GPCDMA_STATUS_CHANNEL_RX)),\n@@ -739,14 +731,14 @@ static int tegra_dma_get_residual(struct tegra_dma_channel *tdc)\n \tunsigned int bytes_xfer, residual;\n \tu32 wcount = 0, status;\n \n-\twcount = tdc_read(tdc, TEGRA_GPCDMA_CHAN_XFER_COUNT);\n+\twcount = tdc_read(tdc, tdc->regs->wxfer);\n \n \t/*\n \t * Set wcount = 0 if EOC bit is set. The transfer would have\n \t * already completed and the CHAN_XFER_COUNT could have updated\n \t * for the next transfer, specifically in case of cyclic transfers.\n \t */\n-\tstatus = tdc_read(tdc, TEGRA_GPCDMA_CHAN_STATUS);\n+\tstatus = tdc_read(tdc, tdc->regs->status);\n \tif (status & TEGRA_GPCDMA_STATUS_ISE_EOC)\n \t\twcount = 0;\n \n@@ -893,7 +885,7 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,\n \t/* Configure default priority weight for the channel */\n \tcsr |= FIELD_PREP(TEGRA_GPCDMA_CSR_WEIGHT, 1);\n \n-\tmc_seq = tdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ);\n+\tmc_seq = tdc_read(tdc, tdc->regs->mc_seq);\n \t/* retain stream-id and clean rest */\n \tmc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;\n \n@@ -916,16 +908,16 @@ tegra_dma_prep_dma_memset(struct dma_chan *dc, dma_addr_t dest, int value,\n \tdma_desc->sg_count = 1;\n \tsg_req = dma_desc->sg_req;\n \n-\tsg_req[0].ch_regs.src_ptr = 0;\n-\tsg_req[0].ch_regs.dst_ptr = dest;\n-\tsg_req[0].ch_regs.high_addr_ptr =\n+\tsg_req[0].src = 0;\n+\tsg_req[0].dst = dest;\n+\tsg_req[0].high_addr =\n \t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (dest >> 32));\n-\tsg_req[0].ch_regs.fixed_pattern = value;\n+\tsg_req[0].fixed_pattern = value;\n \t/* Word count reg takes value as (N +1) words */\n-\tsg_req[0].ch_regs.wcount = ((len - 4) >> 2);\n-\tsg_req[0].ch_regs.csr = csr;\n-\tsg_req[0].ch_regs.mmio_seq = 0;\n-\tsg_req[0].ch_regs.mc_seq = mc_seq;\n+\tsg_req[0].wcount = ((len - 4) >> 2);\n+\tsg_req[0].csr = csr;\n+\tsg_req[0].mmio_seq = 0;\n+\tsg_req[0].mc_seq = mc_seq;\n \tsg_req[0].len = len;\n \n \tdma_desc->cyclic = false;\n@@ -961,7 +953,7 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,\n \t/* Configure default priority weight for the channel */\n \tcsr |= FIELD_PREP(TEGRA_GPCDMA_CSR_WEIGHT, 1);\n \n-\tmc_seq = tdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ);\n+\tmc_seq = tdc_read(tdc, tdc->regs->mc_seq);\n \t/* retain stream-id and clean rest */\n \tmc_seq &= (TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK) |\n \t\t (TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK);\n@@ -985,17 +977,17 @@ tegra_dma_prep_dma_memcpy(struct dma_chan *dc, dma_addr_t dest,\n \tdma_desc->sg_count = 1;\n \tsg_req = dma_desc->sg_req;\n \n-\tsg_req[0].ch_regs.src_ptr = src;\n-\tsg_req[0].ch_regs.dst_ptr = dest;\n-\tsg_req[0].ch_regs.high_addr_ptr =\n+\tsg_req[0].src = src;\n+\tsg_req[0].dst = dest;\n+\tsg_req[0].high_addr =\n \t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (src >> 32));\n-\tsg_req[0].ch_regs.high_addr_ptr |=\n+\tsg_req[0].high_addr |=\n \t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (dest >> 32));\n \t/* Word count reg takes value as (N +1) words */\n-\tsg_req[0].ch_regs.wcount = ((len - 4) >> 2);\n-\tsg_req[0].ch_regs.csr = csr;\n-\tsg_req[0].ch_regs.mmio_seq = 0;\n-\tsg_req[0].ch_regs.mc_seq = mc_seq;\n+\tsg_req[0].wcount = ((len - 4) >> 2);\n+\tsg_req[0].csr = csr;\n+\tsg_req[0].mmio_seq = 0;\n+\tsg_req[0].mc_seq = mc_seq;\n \tsg_req[0].len = len;\n \n \tdma_desc->cyclic = false;\n@@ -1049,7 +1041,7 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,\n \tif (flags & DMA_PREP_INTERRUPT)\n \t\tcsr |= TEGRA_GPCDMA_CSR_IE_EOC;\n \n-\tmc_seq = tdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ);\n+\tmc_seq = tdc_read(tdc, tdc->regs->mc_seq);\n \t/* retain stream-id and clean rest */\n \tmc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;\n \n@@ -1096,14 +1088,14 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,\n \t\tdma_desc->bytes_req += len;\n \n \t\tif (direction == DMA_MEM_TO_DEV) {\n-\t\t\tsg_req[i].ch_regs.src_ptr = mem;\n-\t\t\tsg_req[i].ch_regs.dst_ptr = apb_ptr;\n-\t\t\tsg_req[i].ch_regs.high_addr_ptr =\n+\t\t\tsg_req[i].src = mem;\n+\t\t\tsg_req[i].dst = apb_ptr;\n+\t\t\tsg_req[i].high_addr =\n \t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (mem >> 32));\n \t\t} else if (direction == DMA_DEV_TO_MEM) {\n-\t\t\tsg_req[i].ch_regs.src_ptr = apb_ptr;\n-\t\t\tsg_req[i].ch_regs.dst_ptr = mem;\n-\t\t\tsg_req[i].ch_regs.high_addr_ptr =\n+\t\t\tsg_req[i].src = apb_ptr;\n+\t\t\tsg_req[i].dst = mem;\n+\t\t\tsg_req[i].high_addr =\n \t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (mem >> 32));\n \t\t}\n \n@@ -1111,10 +1103,10 @@ tegra_dma_prep_slave_sg(struct dma_chan *dc, struct scatterlist *sgl,\n \t\t * Word count register takes input in words. Writing a value\n \t\t * of N into word count register means a req of (N+1) words.\n \t\t */\n-\t\tsg_req[i].ch_regs.wcount = ((len - 4) >> 2);\n-\t\tsg_req[i].ch_regs.csr = csr;\n-\t\tsg_req[i].ch_regs.mmio_seq = mmio_seq;\n-\t\tsg_req[i].ch_regs.mc_seq = mc_seq;\n+\t\tsg_req[i].wcount = ((len - 4) >> 2);\n+\t\tsg_req[i].csr = csr;\n+\t\tsg_req[i].mmio_seq = mmio_seq;\n+\t\tsg_req[i].mc_seq = mc_seq;\n \t\tsg_req[i].len = len;\n \t}\n \n@@ -1186,7 +1178,7 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l\n \n \tmmio_seq |= FIELD_PREP(TEGRA_GPCDMA_MMIOSEQ_WRAP_WORD, 1);\n \n-\tmc_seq = tdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ);\n+\tmc_seq = tdc_read(tdc, tdc->regs->mc_seq);\n \t/* retain stream-id and clean rest */\n \tmc_seq &= TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK;\n \n@@ -1218,24 +1210,24 @@ tegra_dma_prep_dma_cyclic(struct dma_chan *dc, dma_addr_t buf_addr, size_t buf_l\n \tfor (i = 0; i < period_count; i++) {\n \t\tmmio_seq |= get_burst_size(tdc, burst_size, slave_bw, len);\n \t\tif (direction == DMA_MEM_TO_DEV) {\n-\t\t\tsg_req[i].ch_regs.src_ptr = mem;\n-\t\t\tsg_req[i].ch_regs.dst_ptr = apb_ptr;\n-\t\t\tsg_req[i].ch_regs.high_addr_ptr =\n+\t\t\tsg_req[i].src = mem;\n+\t\t\tsg_req[i].dst = apb_ptr;\n+\t\t\tsg_req[i].high_addr =\n \t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_SRC_PTR, (mem >> 32));\n \t\t} else if (direction == DMA_DEV_TO_MEM) {\n-\t\t\tsg_req[i].ch_regs.src_ptr = apb_ptr;\n-\t\t\tsg_req[i].ch_regs.dst_ptr = mem;\n-\t\t\tsg_req[i].ch_regs.high_addr_ptr =\n+\t\t\tsg_req[i].src = apb_ptr;\n+\t\t\tsg_req[i].dst = mem;\n+\t\t\tsg_req[i].high_addr =\n \t\t\t\tFIELD_PREP(TEGRA_GPCDMA_HIGH_ADDR_DST_PTR, (mem >> 32));\n \t\t}\n \t\t/*\n \t\t * Word count register takes input in words. Writing a value\n \t\t * of N into word count register means a req of (N+1) words.\n \t\t */\n-\t\tsg_req[i].ch_regs.wcount = ((len - 4) >> 2);\n-\t\tsg_req[i].ch_regs.csr = csr;\n-\t\tsg_req[i].ch_regs.mmio_seq = mmio_seq;\n-\t\tsg_req[i].ch_regs.mc_seq = mc_seq;\n+\t\tsg_req[i].wcount = ((len - 4) >> 2);\n+\t\tsg_req[i].csr = csr;\n+\t\tsg_req[i].mmio_seq = mmio_seq;\n+\t\tsg_req[i].mc_seq = mc_seq;\n \t\tsg_req[i].len = len;\n \n \t\tmem += len;\n@@ -1305,11 +1297,30 @@ static struct dma_chan *tegra_dma_of_xlate(struct of_phandle_args *dma_spec,\n \treturn chan;\n }\n \n+static const struct tegra_dma_channel_regs tegra186_reg_offsets = {\n+\t.csr = 0x0,\n+\t.status = 0x4,\n+\t.csre = 0x8,\n+\t.src = 0xc,\n+\t.dst = 0x10,\n+\t.high_addr = 0x14,\n+\t.mc_seq = 0x18,\n+\t.mmio_seq = 0x1c,\n+\t.wcount = 0x20,\n+\t.wxfer = 0x24,\n+\t.wstatus = 0x28,\n+\t.err_status = 0x30,\n+\t.fixed_pattern = 0x34,\n+\t.tz = 0x38,\n+\t.spare = 0x40,\n+};\n+\n static const struct tegra_dma_chip_data tegra186_dma_chip_data = {\n \t.nr_channels = 32,\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = false,\n+\t.channel_regs = &tegra186_reg_offsets,\n \t.terminate = tegra_dma_stop_client,\n };\n \n@@ -1318,6 +1329,7 @@ static const struct tegra_dma_chip_data tegra194_dma_chip_data = {\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = true,\n+\t.channel_regs = &tegra186_reg_offsets,\n \t.terminate = tegra_dma_pause,\n };\n \n@@ -1326,6 +1338,7 @@ static const struct tegra_dma_chip_data tegra234_dma_chip_data = {\n \t.channel_reg_size = SZ_64K,\n \t.max_dma_count = SZ_1G,\n \t.hw_support_pause = true,\n+\t.channel_regs = &tegra186_reg_offsets,\n \t.terminate = tegra_dma_pause_noerr,\n };\n \n@@ -1346,7 +1359,7 @@ MODULE_DEVICE_TABLE(of, tegra_dma_of_match);\n \n static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)\n {\n-\tunsigned int reg_val = tdc_read(tdc, TEGRA_GPCDMA_CHAN_MCSEQ);\n+\tunsigned int reg_val = tdc_read(tdc, tdc->regs->mc_seq);\n \n \treg_val &= ~(TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK);\n \treg_val &= ~(TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK);\n@@ -1354,7 +1367,7 @@ static int tegra_dma_program_sid(struct tegra_dma_channel *tdc, int stream_id)\n \treg_val |= FIELD_PREP(TEGRA_GPCDMA_MCSEQ_STREAM_ID0_MASK, stream_id);\n \treg_val |= FIELD_PREP(TEGRA_GPCDMA_MCSEQ_STREAM_ID1_MASK, stream_id);\n \n-\ttdc_write(tdc, TEGRA_GPCDMA_CHAN_MCSEQ, reg_val);\n+\ttdc_write(tdc, tdc->regs->mc_seq, reg_val);\n \treturn 0;\n }\n \n@@ -1420,6 +1433,7 @@ static int tegra_dma_probe(struct platform_device *pdev)\n \t\ttdc->chan_base_offset = TEGRA_GPCDMA_CHANNEL_BASE_ADDR_OFFSET +\n \t\t\t\t\ti * cdata->channel_reg_size;\n \t\tsnprintf(tdc->name, sizeof(tdc->name), \"gpcdma.%d\", i);\n+\t\ttdc->regs = cdata->channel_regs;\n \t\ttdc->tdma = tdma;\n \t\ttdc->id = i;\n \t\ttdc->slave_id = -1;\n", "prefixes": [ "4/8" ] }