Commit 7a59743d authored by Archit Taneja's avatar Archit Taneja Committed by Tony Lindgren
Browse files

ARM: OMAP2+: display: Create omapdrm device inside omap_display_init 



Move omapdrm device creation inside the omap_display_init so that we can
correctly create the device based on the presence of omapdss within the
platform.

For example, on a kernel image supporting multiple platforms, omap_init_drm
will create a omapdrm platform device on a AM33xx platform even though it
doesn't have a DSS block.

Originally worked on by Andy Gross.

Cc: Andy Gross <andygro@gmail.com>
Signed-off-by: default avatarArchit Taneja <archit@ti.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 7dfebabd

arch/arm/mach-omap2/Makefile

+1 −5
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \ 
# Common support

obj-y := id.o io.o control.o mux.o devices.o fb.o serial.o gpmc.o timer.o pm.o \

	 common.o gpio.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o sram.o

	 omap_device.o sram.o drm.o



omap-2-3-common				= irq.o

hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \
@@ -228,10 +228,6 @@ endif 
# OMAP2420 MSDI controller integration support ("MMC")

obj-$(CONFIG_SOC_OMAP2420)		+= msdi.o



ifneq ($(CONFIG_DRM_OMAP),)

obj-y					+= drm.o

endif



# Specific board support

obj-$(CONFIG_MACH_OMAP_GENERIC)		+= board-generic.o

obj-$(CONFIG_MACH_OMAP_H4)		+= board-h4.o

arch/arm/mach-omap2/display.c

+7 −0
Original line number Diff line number Diff line
@@ -416,6 +416,13 @@ int __init omap_display_init(struct omap_dss_board_info *board_data) 
		}

	}



	/* create DRM device */

	r = omap_init_drm();

	if (r < 0) {

		pr_err("Unable to register omapdrm device\n");

		return r;

	}



	return 0;

}

arch/arm/mach-omap2/display.h

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ struct omap_dss_dispc_dev_attr { 
	bool	has_framedonetv_irq;

};



int omap_init_drm(void);

#endif

arch/arm/mach-omap2/drm.c

+5 −5
Original line number Diff line number Diff line
@@ -26,8 +26,9 @@ 
#include <linux/platform_data/omap_drm.h>



#include "soc.h"

#include "display.h"



#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)

#if defined(CONFIG_DRM_OMAP) || defined(CONFIG_DRM_OMAP_MODULE)



static struct omap_drm_platform_data platform_data;
@@ -40,14 +41,13 @@ static struct platform_device omap_drm_device = { 
	.id = 0,

};



static int __init omap_init_drm(void)

int __init omap_init_drm(void)

{

	platform_data.omaprev = GET_OMAP_TYPE;



	return platform_device_register(&omap_drm_device);



}



omap_arch_initcall(omap_init_drm);



#else

int __init omap_init_drm(void) { return 0; }

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE