From 3885fe099af0bda910ac8ee64f2cd1a5bbea3ab0 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Mon, 6 Feb 2017 16:49:24 +0530 Subject: gpu: nvgpu: move pmuif/* to drivers/gpu/nvgpu/include/nvgpu MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Moved pmuif/* headers to drivers/gpu/nvgpu/include/nvgpu folder to support cross platform feature implementation. Made changes to files which accessed “include pmuif/*” to reflect pmuif/* movement changes. Deleted includes of gk20a.h/pmu_gk20a.h from pmuif/*.h files. Jira NVGPU-19 Change-Id: Iace4e107c24bdaff08a407eae3b147959173e485 Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1299823 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/boardobj/boardobj.c | 4 +--- drivers/gpu/nvgpu/boardobj/boardobj.h | 4 ++-- drivers/gpu/nvgpu/boardobj/boardobjgrp.h | 3 +-- drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c | 3 +-- drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c | 3 +-- 5 files changed, 6 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/boardobj') diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.c b/drivers/gpu/nvgpu/boardobj/boardobj.c index 6cd3e2b1..0fa8f6b6 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.c +++ b/drivers/gpu/nvgpu/boardobj/boardobj.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. + * 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, @@ -17,8 +17,6 @@ #include #include "boardobj.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" - u32 boardobj_construct_super(struct gk20a *g, struct boardobj **ppboardobj, u16 size, void *args) diff --git a/drivers/gpu/nvgpu/boardobj/boardobj.h b/drivers/gpu/nvgpu/boardobj/boardobj.h index 3d437a82..138b3acc 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobj.h +++ b/drivers/gpu/nvgpu/boardobj/boardobj.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* 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, @@ -20,7 +20,7 @@ struct boardobj; #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" +#include /* * check whether the specified BOARDOBJ object implements the queried diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h index 303c9288..f41ae48e 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp.h +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp.h @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* 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, @@ -23,7 +23,6 @@ struct boardobjgrp; #include "ctrl/ctrlboardobj.h" #include "boardobj.h" #include "boardobjgrpmask.h" -#include "pmuif/gpmuifboardobj.h" /* * Board Object Group destructor. diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c index a56dca9b..2510f636 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e255.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* 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, @@ -15,7 +15,6 @@ #include "boardobj.h" #include "boardobjgrp_e255.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" #include "boardobjgrp.h" #include "boardobjgrpmask.h" diff --git a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c index 95610aba..70b3c8f0 100644 --- a/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c +++ b/drivers/gpu/nvgpu/boardobj/boardobjgrp_e32.c @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. +* 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, @@ -16,7 +16,6 @@ #include "boardobjgrp.h" #include "boardobjgrp_e32.h" #include "ctrl/ctrlboardobj.h" -#include "pmuif/gpmuifboardobj.h" #include "boardobjgrpmask.h" -- cgit v1.2.2