Skip to content

Commit

Permalink
ARM: OMAP2+: drm: Don't build device for DMM
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Archit Taneja authored and Tony Lindgren committed Oct 8, 2013
1 parent d0e639c commit 7dfebab
Showing 1 changed file with 0 additions and 14 deletions.
14 changes: 0 additions & 14 deletions arch/arm/mach-omap2/drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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);
Expand Down

0 comments on commit 7dfebab

Please sign in to comment.