mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
dma: tegra: move smmu.h into SMMU driver
There's no need to place these defines into arch/arm/mach-tegra/include/. Move them into the SMMU driver to clean up mach-tegra, as a pre-requisite for single-zImage. Signed-off-by: Stephen Warren <swarren@nvidia.com> Cc: Hiroshi Doyu <hdoyu@nvidia.com> Acked-by: Hiroshi Doyu <hdoyu@nvidia.com> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
This commit is contained in:
parent
5a2c937a8b
commit
e6bc59330e
2 changed files with 40 additions and 64 deletions
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* IOMMU API for SMMU in Tegra30
|
|
||||||
*
|
|
||||||
* Copyright (c) 2012, NVIDIA CORPORATION. All rights reserved.
|
|
||||||
*
|
|
||||||
* This program is free software; you can redistribute it and/or modify it
|
|
||||||
* under the terms and conditions of the GNU General Public License,
|
|
||||||
* version 2, as published by the Free Software Foundation.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope it will be useful, but WITHOUT
|
|
||||||
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
||||||
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
|
|
||||||
* more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License along with
|
|
||||||
* this program; if not, write to the Free Software Foundation, Inc.,
|
|
||||||
* 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifndef MACH_SMMU_H
|
|
||||||
#define MACH_SMMU_H
|
|
||||||
|
|
||||||
enum smmu_hwgrp {
|
|
||||||
HWGRP_AFI,
|
|
||||||
HWGRP_AVPC,
|
|
||||||
HWGRP_DC,
|
|
||||||
HWGRP_DCB,
|
|
||||||
HWGRP_EPP,
|
|
||||||
HWGRP_G2,
|
|
||||||
HWGRP_HC,
|
|
||||||
HWGRP_HDA,
|
|
||||||
HWGRP_ISP,
|
|
||||||
HWGRP_MPE,
|
|
||||||
HWGRP_NV,
|
|
||||||
HWGRP_NV2,
|
|
||||||
HWGRP_PPCS,
|
|
||||||
HWGRP_SATA,
|
|
||||||
HWGRP_VDE,
|
|
||||||
HWGRP_VI,
|
|
||||||
|
|
||||||
HWGRP_COUNT,
|
|
||||||
|
|
||||||
HWGRP_END = ~0,
|
|
||||||
};
|
|
||||||
|
|
||||||
#define HWG_AFI (1 << HWGRP_AFI)
|
|
||||||
#define HWG_AVPC (1 << HWGRP_AVPC)
|
|
||||||
#define HWG_DC (1 << HWGRP_DC)
|
|
||||||
#define HWG_DCB (1 << HWGRP_DCB)
|
|
||||||
#define HWG_EPP (1 << HWGRP_EPP)
|
|
||||||
#define HWG_G2 (1 << HWGRP_G2)
|
|
||||||
#define HWG_HC (1 << HWGRP_HC)
|
|
||||||
#define HWG_HDA (1 << HWGRP_HDA)
|
|
||||||
#define HWG_ISP (1 << HWGRP_ISP)
|
|
||||||
#define HWG_MPE (1 << HWGRP_MPE)
|
|
||||||
#define HWG_NV (1 << HWGRP_NV)
|
|
||||||
#define HWG_NV2 (1 << HWGRP_NV2)
|
|
||||||
#define HWG_PPCS (1 << HWGRP_PPCS)
|
|
||||||
#define HWG_SATA (1 << HWGRP_SATA)
|
|
||||||
#define HWG_VDE (1 << HWGRP_VDE)
|
|
||||||
#define HWG_VI (1 << HWGRP_VI)
|
|
||||||
|
|
||||||
#endif /* MACH_SMMU_H */
|
|
|
@ -39,9 +39,48 @@
|
||||||
#include <asm/cacheflush.h>
|
#include <asm/cacheflush.h>
|
||||||
|
|
||||||
#include <mach/iomap.h>
|
#include <mach/iomap.h>
|
||||||
#include <mach/smmu.h>
|
|
||||||
#include <mach/tegra-ahb.h>
|
#include <mach/tegra-ahb.h>
|
||||||
|
|
||||||
|
enum smmu_hwgrp {
|
||||||
|
HWGRP_AFI,
|
||||||
|
HWGRP_AVPC,
|
||||||
|
HWGRP_DC,
|
||||||
|
HWGRP_DCB,
|
||||||
|
HWGRP_EPP,
|
||||||
|
HWGRP_G2,
|
||||||
|
HWGRP_HC,
|
||||||
|
HWGRP_HDA,
|
||||||
|
HWGRP_ISP,
|
||||||
|
HWGRP_MPE,
|
||||||
|
HWGRP_NV,
|
||||||
|
HWGRP_NV2,
|
||||||
|
HWGRP_PPCS,
|
||||||
|
HWGRP_SATA,
|
||||||
|
HWGRP_VDE,
|
||||||
|
HWGRP_VI,
|
||||||
|
|
||||||
|
HWGRP_COUNT,
|
||||||
|
|
||||||
|
HWGRP_END = ~0,
|
||||||
|
};
|
||||||
|
|
||||||
|
#define HWG_AFI (1 << HWGRP_AFI)
|
||||||
|
#define HWG_AVPC (1 << HWGRP_AVPC)
|
||||||
|
#define HWG_DC (1 << HWGRP_DC)
|
||||||
|
#define HWG_DCB (1 << HWGRP_DCB)
|
||||||
|
#define HWG_EPP (1 << HWGRP_EPP)
|
||||||
|
#define HWG_G2 (1 << HWGRP_G2)
|
||||||
|
#define HWG_HC (1 << HWGRP_HC)
|
||||||
|
#define HWG_HDA (1 << HWGRP_HDA)
|
||||||
|
#define HWG_ISP (1 << HWGRP_ISP)
|
||||||
|
#define HWG_MPE (1 << HWGRP_MPE)
|
||||||
|
#define HWG_NV (1 << HWGRP_NV)
|
||||||
|
#define HWG_NV2 (1 << HWGRP_NV2)
|
||||||
|
#define HWG_PPCS (1 << HWGRP_PPCS)
|
||||||
|
#define HWG_SATA (1 << HWGRP_SATA)
|
||||||
|
#define HWG_VDE (1 << HWGRP_VDE)
|
||||||
|
#define HWG_VI (1 << HWGRP_VI)
|
||||||
|
|
||||||
/* bitmap of the page sizes currently supported */
|
/* bitmap of the page sizes currently supported */
|
||||||
#define SMMU_IOMMU_PGSIZES (SZ_4K)
|
#define SMMU_IOMMU_PGSIZES (SZ_4K)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue