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

Commit ced9b21f authored by Lad, Prabhakar's avatar Lad, Prabhakar Committed by Mauro Carvalho Chehab
Browse files

[media] davinci: vpif: Fix module build for capture and display 



export the symbols which are used by two modules vpif_capture and
vpif_display. renamed "ch_params" to "vpif_ch_params" so as to avoid
name collision.
This patch fixes following error:
ERROR: "ch_params" [drivers/media/platform/davinci/vpif_display.ko] undefined!
ERROR: "vpif_ch_params_count" [drivers/media/platform/davinci/vpif_display.ko] undefined!
ERROR: "vpif_base" [drivers/media/platform/davinci/vpif_display.ko] undefined!
ERROR: "ch_params" [drivers/media/platform/davinci/vpif_capture.ko] undefined!
ERROR: "vpif_ch_params_count" [drivers/media/platform/davinci/vpif_capture.ko] undefined!
ERROR: "vpif_base" [drivers/media/platform/davinci/vpif_capture.ko] undefined!
make[1]: *** [__modpost] Error 1

Reported-by: default avatarSekhar Nori <nsekhar@ti.com>
Signed-off-by: default avatarLad, Prabhakar <prabhakar.csengg@gmail.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 1c3fc152

drivers/media/platform/davinci/vpif.c

+7 −3
Original line number Diff line number Diff line
@@ -44,13 +44,15 @@ static struct resource *res; 
spinlock_t vpif_lock;



void __iomem *vpif_base;

EXPORT_SYMBOL_GPL(vpif_base);



struct clk *vpif_clk;



/**

 * ch_params: video standard configuration parameters for vpif

 * vpif_ch_params: video standard configuration parameters for vpif

 * The table must include all presets from supported subdevices.

 */

const struct vpif_channel_config_params ch_params[] = {

const struct vpif_channel_config_params vpif_ch_params[] = {

	/* HDTV formats */

	{

		.name = "480p59_94",
@@ -220,8 +222,10 @@ const struct vpif_channel_config_params ch_params[] = { 
		.stdid = V4L2_STD_625_50,

	},

};

EXPORT_SYMBOL_GPL(vpif_ch_params);



const unsigned int vpif_ch_params_count = ARRAY_SIZE(ch_params);

const unsigned int vpif_ch_params_count = ARRAY_SIZE(vpif_ch_params);

EXPORT_SYMBOL_GPL(vpif_ch_params_count);



static inline void vpif_wr_bit(u32 reg, u32 bit, u32 val)

{

drivers/media/platform/davinci/vpif.h

+1 −1
Original line number Diff line number Diff line
@@ -638,7 +638,7 @@ struct vpif_channel_config_params { 
};



extern const unsigned int vpif_ch_params_count;

extern const struct vpif_channel_config_params ch_params[];

extern const struct vpif_channel_config_params vpif_ch_params[];



struct vpif_video_params;

struct vpif_params;

drivers/media/platform/davinci/vpif_capture.c

+1 −1
Original line number Diff line number Diff line
@@ -563,7 +563,7 @@ static int vpif_update_std_info(struct channel_obj *ch) 
	vpif_dbg(2, debug, "vpif_update_std_info\n");



	for (index = 0; index < vpif_ch_params_count; index++) {

		config = &ch_params[index];

		config = &vpif_ch_params[index];

		if (config->hd_sd == 0) {

			vpif_dbg(2, debug, "SD format\n");

			if (config->stdid & vid_ch->stdid) {

drivers/media/platform/davinci/vpif_display.c

+1 −1
Original line number Diff line number Diff line
@@ -511,7 +511,7 @@ static int vpif_update_std_info(struct channel_obj *ch) 
	int i;



	for (i = 0; i < vpif_ch_params_count; i++) {

		config = &ch_params[i];

		config = &vpif_ch_params[i];

		if (config->hd_sd == 0) {

			vpif_dbg(2, debug, "SD format\n");

			if (config->stdid & vid_ch->stdid) {