Commit e1e4f7fe authored by CK Hu's avatar CK Hu Committed by Chun-Kuang Hu
Browse files

soc / drm: mediatek: Move mtk mutex driver to soc folder 



mtk mutex is used by DRM and MDP driver, and its function is SoC-specific,
so move it to soc folder.

Signed-off-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
Acked-by: default avatarMatthias Brugger <matthias.bgg@gmail.com>
parent 42a090b8

drivers/gpu/drm/mediatek/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -9,8 +9,7 @@ mediatek-drm-y := mtk_disp_color.o \ 
		  mtk_drm_gem.o \

		  mtk_drm_plane.o \

		  mtk_dsi.o \

		  mtk_dpi.o \

		  mtk_mutex.o

		  mtk_dpi.o



obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pm_runtime.h>

#include <linux/soc/mediatek/mtk-cmdq.h>

#include <linux/soc/mediatek/mtk-mmsys.h>

#include <linux/soc/mediatek/mtk-mutex.h>



#include <asm/barrier.h>

#include <soc/mediatek/smi.h>
@@ -22,7 +23,6 @@ 
#include "mtk_drm_ddp_comp.h"

#include "mtk_drm_gem.h"

#include "mtk_drm_plane.h"

#include "mtk_mutex.h"



/*

 * struct mtk_drm_crtc - MediaTek specific crtc structure.

drivers/gpu/drm/mediatek/mtk_drm_drv.c

+0 −1
Original line number Diff line number Diff line
@@ -588,7 +588,6 @@ static struct platform_driver mtk_drm_platform_driver = { 
};



static struct platform_driver * const mtk_drm_drivers[] = {

	&mtk_mutex_driver,

	&mtk_disp_color_driver,

	&mtk_disp_ovl_driver,

	&mtk_disp_rdma_driver,

drivers/gpu/drm/mediatek/mtk_drm_drv.h

+0 −1
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ struct mtk_drm_private { 
	struct drm_atomic_state *suspend_state;

};



extern struct platform_driver mtk_mutex_driver;

extern struct platform_driver mtk_disp_color_driver;

extern struct platform_driver mtk_disp_ovl_driver;

extern struct platform_driver mtk_disp_rdma_driver;

drivers/soc/mediatek/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -6,3 +6,4 @@ obj-$(CONFIG_MTK_PMIC_WRAP) += mtk-pmic-wrap.o 
obj-$(CONFIG_MTK_SCPSYS) += mtk-scpsys.o

obj-$(CONFIG_MTK_SCPSYS_PM_DOMAINS) += mtk-pm-domains.o

obj-$(CONFIG_MTK_MMSYS) += mtk-mmsys.o

obj-$(CONFIG_MTK_MMSYS) += mtk-mutex.o