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

Commit 44773ba1 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

ARM: OMAP2+: Drop unused pm-noop 



Looks like these functions don't do anything in the mainline kernel so
we can just drop it.

Note that we must now also remove ir-rx51 pdata as it relies on the dummy
platform data that does not do anything. And ir-rx51 is calling a pdata
callback that doesn't do anything without checking if it exists first.

For configuring device specific minimal latencies, the interface to use
is pm_qos_add_request(). For an example, see what was done in commit
9834ffd1 ("ASoC: omap-mcbsp: Add PM QoS support for McBSP to prevent
glitches"). I've added some comments to ir-rx51 so people using it can
add pm_qos support and test it.

Cc: Ivaylo Dimitrov <ivo.g.dimitrov.75@gmail.com>
Cc: Kevin Hilman <khilman@kernel.org>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 60cc43fc

arch/arm/mach-omap2/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -78,7 +78,6 @@ endif 
omap-4-5-pm-common			= omap-mpuss-lowpower.o

obj-$(CONFIG_ARCH_OMAP4)		+= $(omap-4-5-pm-common)

obj-$(CONFIG_SOC_OMAP5)			+= $(omap-4-5-pm-common)

obj-$(CONFIG_OMAP_PM_NOOP)		+= omap-pm-noop.o



ifeq ($(CONFIG_PM),y)

obj-$(CONFIG_ARCH_OMAP2)		+= pm24xx.o

arch/arm/mach-omap2/display.c

+0 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <linux/platform_data/omapdss.h>

#include "omap_hwmod.h"

#include "omap_device.h"

#include "omap-pm.h"

#include "common.h"



#include "soc.h"
@@ -126,11 +125,6 @@ static void omap_dsi_disable_pads(int dsi_id, unsigned lane_mask) 
		omap4_dsi_mux_pads(dsi_id, 0);

}



static int omap_dss_set_min_bus_tput(struct device *dev, unsigned long tput)

{

	return omap_pm_set_min_bus_tput(dev, OCP_INITIATOR_AGENT, tput);

}



static enum omapdss_version __init omap_display_get_version(void)

{

	if (cpu_is_omap24xx())
@@ -169,7 +163,6 @@ static int __init omapdss_init_fbdev(void) 
	static struct omap_dss_board_info board_data = {

		.dsi_enable_pads = omap_dsi_enable_pads,

		.dsi_disable_pads = omap_dsi_disable_pads,

		.set_min_bus_tput = omap_dss_set_min_bus_tput,

	};

	struct device_node *node;

	int r;

arch/arm/mach-omap2/hsmmc.c

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 


#include "soc.h"

#include "omap_device.h"

#include "omap-pm.h"



#include "hsmmc.h"

#include "control.h"

arch/arm/mach-omap2/i2c.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include "soc.h"

#include "omap_hwmod.h"

#include "omap_device.h"

#include "omap-pm.h"



#include "prm.h"

#include "common.h"

arch/arm/mach-omap2/io.c

+0 −3
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
#include "clock.h"

#include "clock2xxx.h"

#include "clock3xxx.h"

#include "omap-pm.h"

#include "sdrc.h"

#include "control.h"

#include "serial.h"
@@ -421,8 +420,6 @@ static void __init __maybe_unused omap_hwmod_init_postsetup(void) 
	postsetup_state = _HWMOD_STATE_ENABLED;

#endif

	omap_hwmod_for_each(_set_hwmod_postsetup_state, &postsetup_state);



	omap_pm_if_early_init();

}



static void __init __maybe_unused omap_common_late_init(void)