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

Commit 9751efbb authored by Chintan Pandya's avatar Chintan Pandya Committed by Stephen Boyd
Browse files

msm: board-msm7627a: De-feature FMEM suport 



We are no longer supporting FMEM from MSMs. So, disable
FMEM from 7627a/8625

Change-Id: I557a9a851a21ff1480d76e5115b1b07acdd48483
Signed-off-by: default avatarChintan Pandya <cpandya@codeaurora.org>
parent f69dc374

arch/arm/mach-msm/board-msm7x27a.c

+0 −35
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ 
#include <mach/msm_battery.h>

#include <linux/smsc911x.h>

#include <linux/atmel_maxtouch.h>

#include <linux/fmem.h>

#include <linux/msm_adc.h>

#include <linux/ion.h>

#include "devices.h"
@@ -447,9 +446,6 @@ static struct android_pmem_platform_data android_pmem_adsp_pdata = { 
	.allocator_type = PMEM_ALLOCATORTYPE_BITMAP,

	.cached = 1,

	.memory_type = MEMTYPE_EBI1,

	.request_region = request_fmem_c_region,

	.release_region = release_fmem_c_region,

	.reusable = 1,

};



static struct platform_device android_pmem_adsp_device = {
@@ -777,14 +773,6 @@ static void msm7x27a_cfg_uart2dm_serial(void) 
static void msm7x27a_cfg_uart2dm_serial(void) { }

#endif



static struct fmem_platform_data fmem_pdata;



static struct platform_device fmem_device = {

	.name = "fmem",

	.id = 1,

	.dev = { .platform_data = &fmem_pdata },

};



static struct platform_device *rumi_sim_devices[] __initdata = {

	&msm_device_dmov,

	&msm_device_smd,
@@ -822,7 +810,6 @@ static struct platform_device *common_devices[] __initdata = { 
	&android_pmem_device,

	&android_pmem_adsp_device,

	&android_pmem_audio_device,

	&fmem_device,

	&msm_device_nand,

	&msm_device_snd,

	&msm_device_adspdec,
@@ -965,32 +952,10 @@ static void __init size_pmem_devices(void) 
{

#ifdef CONFIG_ANDROID_PMEM

#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION

	unsigned int i;

	unsigned int reusable_count = 0;



	android_pmem_adsp_pdata.size = pmem_adsp_size;

	android_pmem_pdata.size = pmem_mdp_size;

	android_pmem_audio_pdata.size = pmem_audio_size;



	fmem_pdata.size = 0;

	fmem_pdata.align = PAGE_SIZE;



	/* Find pmem devices that should use FMEM (reusable) memory.

	 */

	for (i = 0; i < ARRAY_SIZE(pmem_pdata_array); ++i) {

		struct android_pmem_platform_data *pdata = pmem_pdata_array[i];



		if (!reusable_count && pdata->reusable)

			fmem_pdata.size += pdata->size;



		reusable_count += (pdata->reusable) ? 1 : 0;



		if (pdata->reusable && reusable_count > 1) {

			pr_err("%s: Too many PMEM devices specified as reusable. PMEM device %s was not configured as reusable.\n",

				__func__, pdata->name);

			pdata->reusable = 0;

		}

	}

#endif

#endif

}

arch/arm/mach-msm/board-qrd7627a.c

+0 −36
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <linux/memblock.h>

#include <linux/input/ft5x06_ts.h>

#include <linux/msm_adc.h>

#include <linux/fmem.h>

#include <linux/regulator/msm-gpio-regulator.h>

#include <linux/ion.h>

#include <asm/mach/mmc.h>
@@ -393,9 +392,6 @@ static struct android_pmem_platform_data android_pmem_adsp_pdata = { 
	.allocator_type = PMEM_ALLOCATORTYPE_BITMAP,

	.cached = 1,

	.memory_type = MEMTYPE_EBI1,

	.request_region = request_fmem_c_region,

	.release_region = release_fmem_c_region,

	.reusable = 1,

};



static struct platform_device android_pmem_adsp_device = {
@@ -638,14 +634,6 @@ static struct platform_device msm_adc_device = { 
	},

};



static struct fmem_platform_data fmem_pdata;



static struct platform_device fmem_device = {

	.name = "fmem",

	.id = 1,

	.dev = { .platform_data = &fmem_pdata },

};



#define GPIO_VREG_INIT(_id, _reg_name, _gpio_label, _gpio, _active_low) \

	[GPIO_VREG_ID_##_id] = { \

		.init_data = { \
@@ -716,7 +704,6 @@ static struct platform_device *common_devices[] __initdata = { 
	&asoc_msm_dai0,

	&asoc_msm_dai1,

	&msm_adc_device,

	&fmem_device,

#ifdef CONFIG_ION_MSM

	&ion_dev,

#endif
@@ -857,32 +844,9 @@ static void __init size_pmem_devices(void) 
{

#ifdef CONFIG_ANDROID_PMEM

#ifndef CONFIG_MSM_MULTIMEDIA_USE_ION

	unsigned int i;

	unsigned int reusable_count = 0;



	android_pmem_adsp_pdata.size = pmem_adsp_size;

	android_pmem_pdata.size = pmem_mdp_size;

	android_pmem_audio_pdata.size = pmem_audio_size;



	fmem_pdata.size = 0;

	fmem_pdata.align = PAGE_SIZE;



	/* Find pmem devices that should use FMEM (reusable) memory.

	 */

	for (i = 0; i < ARRAY_SIZE(pmem_pdata_array); ++i) {

		struct android_pmem_platform_data *pdata = pmem_pdata_array[i];



		if (!reusable_count && pdata->reusable)

			fmem_pdata.size += pdata->size;



		reusable_count += (pdata->reusable) ? 1 : 0;



		if (pdata->reusable && reusable_count > 1) {

			pr_err("%s: Too many PMEM devices specified as reusable. PMEM device %s was not configured as reusable.\n",

				__func__, pdata->name);

			pdata->reusable = 0;

		}

	}

#endif

#endif

}