summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2013-09-16 12:48:28 +0530
committerTony Lindgren <tony@atomide.com>2013-10-08 13:59:20 -0700
commit7dfebabd4852b08ec0093d6f78aba7bc1b100318 (patch)
treed45a5e4185af06a2898020581ba4846dd1f9d415
parentd0e639c9e06d44e713170031fe05fb60ebe680af (diff)
downloadop-kernel-dev-7dfebabd4852b08ec0093d6f78aba7bc1b100318.zip
op-kernel-dev-7dfebabd4852b08ec0093d6f78aba7bc1b100318.tar.gz
ARM: OMAP2+: drm: Don't build device for DMM
DMM exists on omap4+ platforms, these platforms are always expected to boot with DT. Remove the current method of searching the dmm hwmod and building an omap_device for dmm. For OMAP4, the address and irq data for DMM hwmod(along with other blocks) were removed, so the current method fails in the dmm driver's probe anyway. The addition of DMM nodes in DT will ensure that a DMM device is built correctly. Cc: Andy Gross <andygro@gmail.com> Signed-off-by: Archit Taneja <archit@ti.com> Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
-rw-r--r--arch/arm/mach-omap2/drm.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c
index 59a4af7..e6c38cd 100644
--- a/arch/arm/mach-omap2/drm.c
+++ b/arch/arm/mach-omap2/drm.c
@@ -26,8 +26,6 @@
#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)
@@ -44,18 +42,6 @@ static struct platform_device omap_drm_device = {
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);
- 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);
OpenPOWER on IntegriCloud