From 9c68af58a9d2542e33ced54bdabc35b18f589475 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Tue, 14 Feb 2017 22:47:29 +0530 Subject: gpu: nvgpu: ACR interface headers reorganization MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -Moved ACR interface headers from acr_gm20b.h/acr_gp106.h to Its specific header files under “drivers/gpu/nvgpu/include/nvgpu/acr/” Folder. - nvgpu_acr.h - Top-level header-file which include ACR interfaces headers & defines required to communicate with ACR, including this header file is good to get access into ACR interface & made changes accordingly, -Deleted acr.h & acr_t18x.h as not required anymore & removed its include from dependent files. Jira NVGPU-19 Change-Id: Ie404043cfe1ab32404eb63a43831f470d8436324 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1304748 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/acr.h | 51 ------------------------------------------------- 1 file changed, 51 deletions(-) delete mode 100644 drivers/gpu/nvgpu/acr.h (limited to 'drivers/gpu/nvgpu/acr.h') diff --git a/drivers/gpu/nvgpu/acr.h b/drivers/gpu/nvgpu/acr.h deleted file mode 100644 index df90c96e..00000000 --- a/drivers/gpu/nvgpu/acr.h +++ /dev/null @@ -1,51 +0,0 @@ -/* - * Copyright (c) 2016-2017, 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. - */ - -#ifndef __ACR_H_ -#define __ACR_H_ - -#include "gm20b/mm_gm20b.h" -#include "gm20b/acr_gm20b.h" -#include "gp106/acr_gp106.h" -#ifdef CONFIG_ARCH_TEGRA_18x_SOC -#include "acr_t18x.h" -#endif - -struct acr_desc { - struct mem_desc ucode_blob; - struct mem_desc wpr_dummy; - struct bin_hdr *bl_bin_hdr; - struct hsflcn_bl_desc *pmu_hsbl_desc; - struct bin_hdr *hsbin_hdr; - struct acr_fw_header *fw_hdr; - u32 pmu_args; - const struct firmware *acr_fw; - union{ - struct flcn_acr_desc *acr_dmem_desc; -#ifdef CONFIG_ARCH_TEGRA_18x_SOC - struct flcn_acr_desc_v1 *acr_dmem_desc_v1; -#endif - }; - struct mem_desc acr_ucode; - const struct firmware *hsbl_fw; - struct mem_desc hsbl_ucode; - union { - struct flcn_bl_dmem_desc bl_dmem_desc; - struct flcn_bl_dmem_desc_v1 bl_dmem_desc_v1; - }; - const struct firmware *pmu_fw; - const struct firmware *pmu_desc; - u32 capabilities; -}; - -#endif /*__ACR_H_*/ -- cgit v1.2.2