mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2025-01-13 09:15:02 +08:00
acb7452369
-----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRAuO3AAoJEHm+PkMAQRiGbfAH/1C3QQKB11aBpYLAw7qijAze yOui26UCnwRryxsO8zBCQjGoByy5DvY/Q0zyUCWUE6nf/JFSoKGUHzfJ1ATyzGll 3vENP6Fnmq0Hgc4t8/gXtXrZ1k/c43cYA2XEhDnEsJlFNmNj2wCQQj9njTNn2cl1 k6XhZ9U1V2hGYpLL5bmsZiLVI6dIpkCVw8d4GZ8BKxSLUacVKMS7ml2kZqxBTMgt AF6T2SPagBBxxNq8q87x4b7vyHYchZmk+9tAV8UMs1ecimasLK8vrRAJvkXXaH1t xgtR0sfIp5raEjoFYswCK+cf5NEusLZDKOEvoABFfEgL4/RKFZ8w7MMsmG8m0rk= =m68Y -----END PGP SIGNATURE----- Merge branch 'omap/multiplatform-fixes', tag 'v3.8-rc5' into next/multiplatform The omap multiplatform support uncovered a bug in the cwdavinci_cpdma code and was missing two drivers that are enabled now but are not quite ready for multiplatform, as found by allyesconfig builds. There is also a conflict generated by automated merge in arch/arm/mach-omap2/drm.c between a bug fix that went into v3.8-rc5 and a different version of the same fix that went into the omap/multiplatform branch. This merge removes the extraneous #include that was causing build errors. * omap/multiplatform-fixes: net: cwdavinci_cpdma: export symbols for cpsw remoteproc: omap: depend on OMAP_MBOX_FWK [media] davinci: do not include mach/hardware.h Signed-off-by: Arnd Bergmann <arnd@arndb.de>
69 lines
1.8 KiB
C
69 lines
1.8 KiB
C
/*
|
|
* 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 <linux/platform_data/omap_drm.h>
|
|
|
|
#include "soc.h"
|
|
#include "omap_device.h"
|
|
#include "omap_hwmod.h"
|
|
|
|
#if defined(CONFIG_DRM_OMAP) || (CONFIG_DRM_OMAP_MODULE)
|
|
|
|
static struct omap_drm_platform_data platform_data;
|
|
|
|
static struct platform_device omap_drm_device = {
|
|
.dev = {
|
|
.coherent_dma_mask = DMA_BIT_MASK(32),
|
|
.platform_data = &platform_data,
|
|
},
|
|
.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);
|
|
}
|
|
|
|
platform_data.omaprev = GET_OMAP_TYPE;
|
|
|
|
return platform_device_register(&omap_drm_device);
|
|
|
|
}
|
|
|
|
omap_arch_initcall(omap_init_drm);
|
|
|
|
#endif
|