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

Commit d86bd82c authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Tomi Valkeinen
Browse files

ARM: OMAP2+: Remove unused omapdrm platform device 



The omapdrm platform device is unused, as a replacement is now
registered in the omapdss driver. Remove it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent 56503e18

arch/arm/mach-omap2/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ ccflags-y := -I$(srctree)/$(src)/include \ 
# Common support

obj-y := id.o io.o control.o devices.o fb.o timer.o pm.o \

	 common.o dma.o wd_timer.o display.o i2c.o hdq1w.o omap_hwmod.o \

	 omap_device.o omap-headsmp.o sram.o drm.o

	 omap_device.o omap-headsmp.o sram.o



hwmod-common				= omap_hwmod.o omap_hwmod_reset.o \

					  omap_hwmod_common_data.o

arch/arm/mach-omap2/display.c

+0 −7
Original line number Diff line number Diff line
@@ -384,13 +384,6 @@ int __init omapdss_init_of(void) 
		return r;

	}



	/* create DRM device */

	r = omap_init_drm();

	if (r < 0) {

		pr_err("Unable to register omapdrm device\n");

		return r;

	}



	/* create vrfb device */

	r = omap_init_vrfb();

	if (r < 0) {

arch/arm/mach-omap2/display.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct omap_dss_dispc_dev_attr { 
	bool	has_framedonetv_irq;

};



int omap_init_drm(void);

int omap_init_vrfb(void);

int omap_init_fb(void);

int omap_init_vout(void);

arch/arm/mach-omap2/drm.c

deleted100644 → 0
+0 −53
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 <linux/platform_data/omap_drm.h>



#include "soc.h"

#include "display.h"



#if IS_ENABLED(CONFIG_DRM_OMAP)



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,

};



int __init omap_init_drm(void)

{

	platform_data.omaprev = GET_OMAP_TYPE;



	return platform_device_register(&omap_drm_device);



}

#else

int __init omap_init_drm(void) { return 0; }

#endif