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

Commit e2fb5052 authored by Andy Gross's avatar Andy Gross Committed by Tony Lindgren
Browse files

omap2+: add drm device 



Register OMAP DRM/KMS platform device.  DMM is split into a
separate device using hwmod.

Signed-off-by: default avatarAndy Gross <andy.gross@ti.com>
Signed-off-by: default avatarRob Clark <rob.clark@linaro.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 6887a413

arch/arm/mach-omap2/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -189,6 +189,10 @@ 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/drm.c

0 → 100644
+61 −0
Original line number Diff line number Diff line 
/*

 * DRM/KMS device registration for TI OMAP platforms

 *

 * Copyright (C) 2012 Texas Instruments

 * Author: Rob Clark <rob.clark@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by

 * the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 *

 * You should have received a copy of the GNU General Public License along with

 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#include <linux/module.h>

#include <linux/kernel.h>

#include <linux/mm.h>

#include <linux/init.h>

#include <linux/platform_device.h>

#include <linux/dma-mapping.h>



#include <plat/omap_device.h>

#include <plat/omap_hwmod.h>



#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)



static struct platform_device omap_drm_device = {

	.dev = {

		.coherent_dma_mask = DMA_BIT_MASK(32),

	},

	.name = "omapdrm",

	.id = 0,

};



static int __init omap_init_drm(void)

{

	struct omap_hwmod *oh = NULL;

	struct platform_device *pdev;



	/* lookup and populate the DMM information, if present - OMAP4+ */

	oh = omap_hwmod_lookup("dmm");



	if (oh) {

		pdev = omap_device_build(oh->name, -1, oh, NULL, 0, NULL, 0,

					false);

		WARN(IS_ERR(pdev), "Could not build omap_device for %s\n",

			oh->name);

	}



	return platform_device_register(&omap_drm_device);



}



arch_initcall(omap_init_drm);



#endif

drivers/staging/omapdrm/omap_drv.h

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ 
#include <linux/types.h>

#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <linux/platform_data/omap_drm.h>

#include "omap_drm.h"

#include "omap_priv.h"



#define DBG(fmt, ...) DRM_DEBUG(fmt"\n", ##__VA_ARGS__)

#define VERB(fmt, ...) if (0) DRM_DEBUG(fmt, ##__VA_ARGS__) /* verbose debug */

drivers/staging/omapdrm/omap_priv.h→include/linux/platform_data/omap_drm.h

+8 −11
Original line number Diff line number Diff line 
/*

 * include/drm/omap_priv.h

 * DRM/KMS platform data for TI OMAP platforms

 *

 * Copyright (C) 2011 Texas Instruments

 * Author: Rob Clark <rob@ti.com>

 * Copyright (C) 2012 Texas Instruments

 * Author: Rob Clark <rob.clark@linaro.org>

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms of the GNU General Public License version 2 as published by
@@ -17,13 +17,11 @@ 
 * this program.  If not, see <http://www.gnu.org/licenses/>.

 */



#ifndef __OMAP_PRIV_H__

#define __OMAP_PRIV_H__

#ifndef __PLATFORM_DATA_OMAP_DRM_H__

#define __PLATFORM_DATA_OMAP_DRM_H__



/* Non-userspace facing APIs

 */



/* optional platform data to configure the default configuration of which

/*

 * Optional platform data to configure the default configuration of which

 * pipes/overlays/CRTCs are used.. if this is not provided, then instead the

 * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to

 * one manager, with priority given to managers that are connected to
@@ -49,7 +47,6 @@ struct omap_kms_platform_data { 


struct omap_drm_platform_data {

	struct omap_kms_platform_data *kms_pdata;

	struct omap_dmm_platform_data *dmm_pdata;

};



#endif /* __OMAP_DRM_H__ */
 
#endif /* __PLATFORM_DATA_OMAP_DRM_H__ */