Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54156c2a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

drm: omapdrm: sdi: Remove platform driver 



The SDI platform driver was used for non-DT platforms only. On DT
platforms the SDI port is handled manually. As OMAP display devices are
now instantiated from DT only, remove the SDI platform driver.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 5115bba1

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

+0 −6
Original line number Diff line number Diff line
@@ -208,9 +208,6 @@ static int (*dss_output_drv_reg_funcs[])(void) __initdata = { 
#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_SDI

	sdi_init_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_RFBI

	rfbi_init_platform_driver,

#endif
@@ -238,9 +235,6 @@ static void (*dss_output_drv_unreg_funcs[])(void) = { 
#ifdef CONFIG_OMAP2_DSS_RFBI

	rfbi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_SDI

	sdi_uninit_platform_driver,

#endif

#ifdef CONFIG_OMAP2_DSS_DSI

	dsi_uninit_platform_driver,

#endif

drivers/gpu/drm/omapdrm/dss/dss.h

+0 −3
Original line number Diff line number Diff line
@@ -280,9 +280,6 @@ bool dss_div_calc(unsigned long pck, unsigned long fck_min, 
		dss_div_calc_func func, void *data);



/* SDI */

int sdi_init_platform_driver(void) __init;

void sdi_uninit_platform_driver(void);



#ifdef CONFIG_OMAP2_DSS_SDI

int sdi_init_port(struct platform_device *pdev, struct device_node *port);

void sdi_uninit_port(struct device_node *port);

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

+0 −54
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/platform_device.h>

#include <linux/string.h>

#include <linux/of.h>

#include <linux/component.h>



#include "omapdss.h"

#include "dss.h"
@@ -355,59 +354,6 @@ static void sdi_uninit_output(struct platform_device *pdev) 
	omapdss_unregister_output(out);

}



static int sdi_bind(struct device *dev, struct device *master, void *data)

{

	struct platform_device *pdev = to_platform_device(dev);



	sdi.pdev = pdev;



	sdi_init_output(pdev);



	return 0;

}



static void sdi_unbind(struct device *dev, struct device *master, void *data)

{

	struct platform_device *pdev = to_platform_device(dev);



	sdi_uninit_output(pdev);

}



static const struct component_ops sdi_component_ops = {

	.bind	= sdi_bind,

	.unbind	= sdi_unbind,

};



static int sdi_probe(struct platform_device *pdev)

{

	return component_add(&pdev->dev, &sdi_component_ops);

}



static int sdi_remove(struct platform_device *pdev)

{

	component_del(&pdev->dev, &sdi_component_ops);

	return 0;

}



static struct platform_driver omap_sdi_driver = {

	.probe		= sdi_probe,

	.remove         = sdi_remove,

	.driver         = {

		.name   = "omapdss_sdi",

		.suppress_bind_attrs = true,

	},

};



int __init sdi_init_platform_driver(void)

{

	return platform_driver_register(&omap_sdi_driver);

}



void sdi_uninit_platform_driver(void)

{

	platform_driver_unregister(&omap_sdi_driver);

}



int sdi_init_port(struct platform_device *pdev, struct device_node *port)

{

	struct device_node *ep;