Commit c241118b authored by AngeloGioacchino Del Regno's avatar AngeloGioacchino Del Regno Committed by Chun-Kuang Hu
Browse files

drm/mediatek: mtk_hdmi_ddc: Switch to register as module_platform_driver 



In preparation for adding a driver for the new HDMIv2 IP, and
before splitting out the common bits from the HDMI driver,
change the mtk_hdmi_ddc driver from being registered from the
HDMI driver itself to be a module_platform_driver of its own.

With this change, there are no more users of the mtk_hdmi.h header
so, while at it, also remove it.

Reviewed-by: default avatarAlexandre Mergnat <amergnat@baylibre.com>
Reviewed-by: default avatarCK Hu <ck.hu@mediatek.com>
Signed-off-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patchwork.kernel.org/project/dri-devel/patch/20250415104321.51149-6-angelogioacchino.delregno@collabora.com/


Signed-off-by: default avatarChun-Kuang Hu <chunkuang.hu@kernel.org>
parent 1e914a89

drivers/gpu/drm/mediatek/Makefile

+2 −4
Original line number Diff line number Diff line
@@ -21,10 +21,8 @@ mediatek-drm-y := mtk_crtc.o \ 


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



mediatek-drm-hdmi-objs := mtk_hdmi.o \

			  mtk_hdmi_ddc.o



obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_cec.o

obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mediatek-drm-hdmi.o

obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi.o

obj-$(CONFIG_DRM_MEDIATEK_HDMI) += mtk_hdmi_ddc.o



obj-$(CONFIG_DRM_MEDIATEK_DP) += mtk_dp.o

drivers/gpu/drm/mediatek/mtk_hdmi.c

+0 −2
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <drm/drm_probe_helper.h>



#include "mtk_cec.h"

#include "mtk_hdmi.h"

#include "mtk_hdmi_regs.h"



#define NCTS_BYTES	7
@@ -1787,7 +1786,6 @@ static struct platform_driver mtk_hdmi_driver = { 
};



static struct platform_driver * const mtk_hdmi_drivers[] = {

	&mtk_hdmi_ddc_driver,

	&mtk_hdmi_driver,

};

drivers/gpu/drm/mediatek/mtk_hdmi.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2014 MediaTek Inc.

 * Author: Jie Qiu <jie.qiu@mediatek.com>

 */

#ifndef _MTK_HDMI_CTRL_H

#define _MTK_HDMI_CTRL_H



struct platform_driver;



extern struct platform_driver mtk_hdmi_ddc_driver;



#endif /* _MTK_HDMI_CTRL_H */

drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c

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



#include "mtk_drm_drv.h"

#include "mtk_hdmi.h"



#define SIF1_CLOK		(288)

#define DDC_DDCMCTL0		(0x0)
@@ -337,6 +336,7 @@ struct platform_driver mtk_hdmi_ddc_driver = { 
		.of_match_table = mtk_hdmi_ddc_match,

	},

};

module_platform_driver(mtk_hdmi_ddc_driver);



MODULE_AUTHOR("Jie Qiu <jie.qiu@mediatek.com>");

MODULE_DESCRIPTION("MediaTek HDMI DDC Driver");