Commit 34d71136 authored by Jyri Sarha's avatar Jyri Sarha Committed by Tomi Valkeinen
Browse files

drm/omap: dss: move platform_register_drivers() to dss.c and remove core.c 



The core.c just for registering the drivers is kind of useless. Let's
get rid of it and register the dss drivers in dss.c.

Signed-off-by: default avatarJyri Sarha <jsarha@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190930103840.18970-6-tomi.valkeinen@ti.com
parent f5b1fae1

drivers/gpu/drm/omapdrm/dss/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ omapdss-base-y := base.o display.o dss-of.o output.o 


obj-$(CONFIG_OMAP2_DSS) += omapdss.o

# Core DSS files

omapdss-y := core.o dss.o dispc.o dispc_coefs.o \

omapdss-y := dss.o dispc.o dispc_coefs.o \

	pll.o video-pll.o

omapdss-$(CONFIG_OMAP2_DSS_DPI) += dpi.o

omapdss-$(CONFIG_OMAP2_DSS_VENC) += venc.o

drivers/gpu/drm/omapdrm/dss/core.c

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

/*

 * Copyright (C) 2009 Nokia Corporation

 * Author: Tomi Valkeinen <tomi.valkeinen@ti.com>

 *

 * Some code and ideas taken from drivers/video/omap/ driver

 * by Imre Deak.

 */



#define DSS_SUBSYS_NAME "CORE"



#include <linux/kernel.h>

#include <linux/module.h>

#include <linux/platform_device.h>



#include "omapdss.h"

#include "dss.h"



/* INIT */

static struct platform_driver * const omap_dss_drivers[] = {

	&omap_dsshw_driver,

	&omap_dispchw_driver,

#ifdef CONFIG_OMAP2_DSS_DSI

	&omap_dsihw_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_VENC

	&omap_venchw_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

	&omapdss_hdmi4hw_driver,

#endif

#ifdef CONFIG_OMAP5_DSS_HDMI

	&omapdss_hdmi5hw_driver,

#endif

};



static int __init omap_dss_init(void)

{

	return platform_register_drivers(omap_dss_drivers,

					 ARRAY_SIZE(omap_dss_drivers));

}



static void __exit omap_dss_exit(void)

{

	platform_unregister_drivers(omap_dss_drivers,

				    ARRAY_SIZE(omap_dss_drivers));

}



module_init(omap_dss_init);

module_exit(omap_dss_exit);



MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");

MODULE_DESCRIPTION("OMAP2/3 Display Subsystem");

MODULE_LICENSE("GPL v2");

drivers/gpu/drm/omapdrm/dss/dss.c

+37 −0
Original line number Diff line number Diff line
@@ -1598,3 +1598,40 @@ struct platform_driver omap_dsshw_driver = { 
		.suppress_bind_attrs = true,

	},

};



/* INIT */

static struct platform_driver * const omap_dss_drivers[] = {

	&omap_dsshw_driver,

	&omap_dispchw_driver,

#ifdef CONFIG_OMAP2_DSS_DSI

	&omap_dsihw_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_VENC

	&omap_venchw_driver,

#endif

#ifdef CONFIG_OMAP4_DSS_HDMI

	&omapdss_hdmi4hw_driver,

#endif

#ifdef CONFIG_OMAP5_DSS_HDMI

	&omapdss_hdmi5hw_driver,

#endif

};



static int __init omap_dss_init(void)

{

	return platform_register_drivers(omap_dss_drivers,

					 ARRAY_SIZE(omap_dss_drivers));

}



static void __exit omap_dss_exit(void)

{

	platform_unregister_drivers(omap_dss_drivers,

				    ARRAY_SIZE(omap_dss_drivers));

}



module_init(omap_dss_init);

module_exit(omap_dss_exit);



MODULE_AUTHOR("Tomi Valkeinen <tomi.valkeinen@ti.com>");

MODULE_DESCRIPTION("OMAP2/3/4/5 Display Subsystem");

MODULE_LICENSE("GPL v2");

CRA Git | Maintained and supported by SUSTech CRA and CCSE