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

Commit 7d6707c8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: vidc: Remove legacy board file usage"

parents d7cca00e 96814b4b

drivers/media/platform/msm/vidc/msm_v4l2_vidc.c

+3 −4
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <linux/debugfs.h>

#include <linux/version.h>

#include <linux/slab.h>

#include <mach/board.h>

#include <linux/qcom_iommu.h>

#include <linux/msm_iommu_domains.h>

#include <media/msm_vidc.h>
@@ -304,11 +303,11 @@ static int read_platform_resources(struct msm_vidc_core *core, 
		/* Target supports DT, parse from it */

		return read_platform_resources_from_dt(&core->resources);

	} else {

		/* Legacy board file usage */

		return read_platform_resources_from_board(

				&core->resources);

		dprintk(VIDC_ERR, "pdev node is NULL\n");

		return -EINVAL;

	}

}



static int msm_vidc_initialize_core(struct platform_device *pdev,

				struct msm_vidc_core *core)

{

drivers/media/platform/msm/vidc/msm_vidc_res_parse.c

+0 −42
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 


#include <linux/of.h>

#include <linux/slab.h>

#include <mach/board.h>

#include "msm_vidc_resources.h"

#include "msm_vidc_debug.h"

#include "msm_vidc_res_parse.h"
@@ -722,44 +721,3 @@ err_load_reg_table: 
err_load_freq_table:

	return rc;

}
 


int read_platform_resources_from_board(

		struct msm_vidc_platform_resources *res)

{

	struct resource *kres = NULL;

	struct platform_device *pdev = res->pdev;

	struct msm_vidc_v4l2_platform_data *pdata = pdev->dev.platform_data;

	int c = 0, rc = 0;



	if (!pdata) {

		dprintk(VIDC_ERR, "Platform data not found\n");

		return -ENOENT;

	}



	res->firmware_base = 0x0;



	kres = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	res->register_base = kres ? kres->start : -1;

	res->register_size = kres ? (kres->end + 1 - kres->start) : -1;



	kres = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	res->irq = kres ? kres->start : -1;



	res->load_freq_tbl = devm_kzalloc(&pdev->dev, pdata->num_load_table *

			sizeof(*res->load_freq_tbl), GFP_KERNEL);



	if (!res->load_freq_tbl) {

		dprintk(VIDC_ERR, "%s Failed to alloc load_freq_tbl\n",

				__func__);

		return -ENOMEM;

	}



	res->load_freq_tbl_size = pdata->num_load_table;

	for (c = 0; c > pdata->num_load_table; ++c) {

		res->load_freq_tbl[c].load = pdata->load_table[c][0];

		res->load_freq_tbl[c].freq = pdata->load_table[c][1];

	}



	res->max_load = pdata->max_load;

	return rc;

}

drivers/media/platform/msm/vidc/msm_vidc_res_parse.h

+1 −5
Original line number Diff line number Diff line 


/* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2014, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -15,7 +15,6 @@ 
#ifndef DT_PARSE

#define DT_PARSE

#include <linux/of.h>

#include <mach/board.h>

#include "msm_vidc_resources.h"

void msm_vidc_free_platform_resources(

		struct msm_vidc_platform_resources *res);
@@ -24,7 +23,4 @@ int read_hfi_type(struct platform_device *pdev); 


int read_platform_resources_from_dt(

		struct msm_vidc_platform_resources *res);



int read_platform_resources_from_board(

		struct msm_vidc_platform_resources *res);

#endif