From: Archit Taneja Date: Mon, 16 Sep 2013 07:18:28 +0000 (+0530) Subject: ARM: OMAP2+: drm: Don't build device for DMM X-Git-Tag: firefly_0821_release~176^2~5045^2~2^2~4 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7dfebabd4852b08ec0093d6f78aba7bc1b100318;p=firefly-linux-kernel-4.4.55.git 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 Signed-off-by: Archit Taneja Acked-by: Tomi Valkeinen Signed-off-by: Tony Lindgren --- diff --git a/arch/arm/mach-omap2/drm.c b/arch/arm/mach-omap2/drm.c index 59a4af779f42..e6c38cd98930 100644 --- a/arch/arm/mach-omap2/drm.c +++ b/arch/arm/mach-omap2/drm.c @@ -26,8 +26,6 @@ #include #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);