OMAP4: devices.c: Aligning display-next vs intgration branch

Aligning the content of devices.c file under:
arch/arm/mach-omap2/devices.c

This patch ensures that all changes from display-next branch
are included into integration branch.

Signed-off-by: Ricardo Perez Olivares <x0081762@ti.com>

1 files changed, 0 insertions, 124 deletions

diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 56e03399419e..aa486c0455bc 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -32,12 +32,9 @@
 #include <plat/mmc.h>
 #include <plat/display.h>
 #include <plat/dma.h>
-
 #include <plat/omap_device.h>
 #include <plat/omap_hwmod.h>
 #include <plat/omap4-keypad.h>
-#include <plat/mcbsp.h>
-#include <sound/omap-abe-dsp.h>
 
 #include "mux.h"
 
@@ -320,73 +317,6 @@ static inline void omap_init_mbox(void)
 static inline void omap_init_mbox(void) { }
 #endif /* CONFIG_OMAP_MBOX_FWK */
 
-#if defined CONFIG_ARCH_OMAP4
-
-static struct omap4_abe_dsp_pdata omap4_abe_dsp_config = {
-	/* FIXME: dsp */
-//	int (*device_enable) (struct platform_device *pdev);
-	//int (*device_shutdown) (struct platform_device *pdev);
-//	int (*device_idle) (struct platform_device *pdev);
-};
-
-static struct platform_device codec_dmic0 = {
-	.name	= "dmic-codec",
-	.id	= 0,
-};
-
-static struct platform_device codec_dmic1 = {
-	.name	= "dmic-codec",
-	.id	= 1,
-};
-
-static struct platform_device codec_dmic2 = {
-	.name	= "dmic-codec",
-	.id	= 2,
-};
-
-static struct platform_device omap_abe_dai = {
-	.name	= "omap-abe-dai",
-	.id	= -1,
-};
-
-static struct platform_device omap_dsp_audio = {
-	.name	= "omap-dsp-audio",
-	.id	= -1,
-	.dev		= {
-		.platform_data = &omap4_abe_dsp_config,
-	},
-};
-
-static struct platform_device omap_dmic_dai0 = {
-	.name	= "omap-dmic-dai",
-	.id	= 0,
-};
-
-static struct platform_device omap_dmic_dai1 = {
-	.name	= "omap-dmic-dai",
-	.id	= 1,
-};
-
-static struct platform_device omap_dmic_dai2 = {
-	.name	= "omap-dmic-dai",
-	.id	= 2,
-};
-
-static inline void omap_init_abe(void)
-{
-	platform_device_register(&codec_dmic0);
-	platform_device_register(&codec_dmic1);
-	platform_device_register(&codec_dmic2);
-	platform_device_register(&omap_abe_dai);
-	platform_device_register(&omap_dsp_audio);
-	platform_device_register(&omap_dmic_dai0);
-	platform_device_register(&omap_dmic_dai1);
-	platform_device_register(&omap_dmic_dai2);
-}
-#else
-static inline void omap_init_abe(void) {}
-#endif
-
 #if defined(CONFIG_OMAP_STI)
 
 #if defined(CONFIG_ARCH_OMAP2)
@@ -446,43 +376,6 @@ static inline void omap_init_sti(void)
 static inline void omap_init_sti(void) {}
 #endif
 
-#if defined(CONFIG_SND_SOC) || defined(CONFIG_SND_SOC_MODULE)
-
-static struct platform_device omap_pcm = {
-	.name	= "omap-pcm-audio",
-	.id	= -1,
-};
-
-/*
- * OMAP2420 has 2 McBSP ports
- * OMAP2430 has 5 McBSP ports
- * OMAP3 has 5 McBSP ports
- * OMAP4 has 4 McBSP ports
- */
-OMAP_MCBSP_PLATFORM_DEVICE(1);
-OMAP_MCBSP_PLATFORM_DEVICE(2);
-OMAP_MCBSP_PLATFORM_DEVICE(3);
-OMAP_MCBSP_PLATFORM_DEVICE(4);
-OMAP_MCBSP_PLATFORM_DEVICE(5);
-
-static void omap_init_audio(void)
-{
-	platform_device_register(&omap_mcbsp1);
-	platform_device_register(&omap_mcbsp2);
-	if (cpu_is_omap243x() || cpu_is_omap34xx() || cpu_is_omap44xx()) {
-		platform_device_register(&omap_mcbsp3);
-		platform_device_register(&omap_mcbsp4);
-	}
-	if (cpu_is_omap243x() || cpu_is_omap34xx())
-		platform_device_register(&omap_mcbsp5);
-
-	platform_device_register(&omap_pcm);
-}
-
-#else
-static inline void omap_init_audio(void) {}
-#endif
-
 #if defined(CONFIG_SPI_OMAP24XX) || defined(CONFIG_SPI_OMAP24XX_MODULE)
 
 #include <plat/mcspi.h>
@@ -881,21 +774,6 @@ void __init omap_display_init(struct omap_dss_board_info *board_data)
 	char oh_name[7][MAX_OMAP_DSS_HWMOD_NAME_LEN] = {"dss", "dss_dispc", "dss_dsi1", "dss_dsi2", "dss_hdmi", "dss_rfbi", "dss_venc"};
 	int l, idx, i;
 	struct omap_display_platform_data pdata;
-	void __iomem    *base_cm;
-	idx = 1;
-
-	/* This is a temporary fix
-	 * In CM_DSS_CLKSTCTRL register bits [1:0] are CLKTRCTRL
-	 * The default value is 0x3 (HW_AUTO)  but desired value is 0x2 (SW_WKUP)
-	 * 0x2: SW_WKUP: Start a software forced wake-up
-	 *	transition on the domain.
-	 * 0x3: HW_AUTO: Automatic transition is enabled. Sleep
-	 *	and wakeup transition are based upon hardware
-	 *	conditions.
-	 */
-	base_cm = ioremap(0x4A009100, 0x64);
-	__raw_writel(0x2, base_cm);
-
 	idx = 1;
 
 	for (i = 0; i < 7; i++)	{
@@ -995,8 +873,6 @@ static int __init omap2_init_devices(void)
 	 * in alphabetical order so they're easier to sort through.
 	 */
 	omap_init_32k();
-	omap_init_abe();
-	omap_init_audio();
 	omap_init_camera();
 	omap_init_mbox();
 	omap_init_mcspi();