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

Commit e594a97c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci into next/drivers 

* 'v3.4/features' of git://gitorious.org/linux-davinci/linux-davinci

:
  ARM: davinci: dm644x evm: add support for VPBE display
  ARM: davinci: dm644x: add support for v4l2 video display

* included from the davinci/cleanup branch:
  ARM: davinci: dm644x: don't force vpfe registeration on all boards
  ARM: davinci: dm644x: fix inconsistent variable naming
  ARM: davinci: dm644x: improve readability using macro
  ARM: davinci: streamline sysmod access
  ARM: davinci: create new common platform header for davinci
  ARM: davinci: dm646x: move private definitions to C file
  ARM: davinci: dm365: move private definitions to C file
  ARM: davinci: dm644x: move private definitions to C file

Conflicts:
	arch/arm/mach-davinci/board-dm644x-evm.c
	arch/arm/mach-davinci/board-neuros-osd2.c
	arch/arm/mach-davinci/board-sffsdr.c

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents f66f9bdf d5be5f54

arch/arm/mach-davinci/board-dm355-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -26,13 +26,14 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm355.h>

#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>

#include <mach/usb.h>



#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed

 * 2 GByte Micron NAND (MT29F16G08FAA) using 128KB sectors.  If you

 * swap chips, maybe with a different block size, partitioning may

arch/arm/mach-davinci/board-dm355-leopard.c

+2 −1
Original line number Diff line number Diff line
@@ -23,13 +23,14 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm355.h>

#include <mach/i2c.h>

#include <mach/serial.h>

#include <mach/nand.h>

#include <mach/mmc.h>

#include <mach/usb.h>



#include "davinci.h"



/* NOTE:  this is geared for the standard config, with a socketed

 * 2 GByte Micron NAND (MT29F16G08FAA) using 128KB sectors.  If you

 * swap chips, maybe with a different block size, partitioning may

arch/arm/mach-davinci/board-dm365-evm.c

+2 −1
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ 
#include <asm/mach/arch.h>



#include <mach/mux.h>

#include <mach/dm365.h>

#include <mach/common.h>

#include <mach/i2c.h>

#include <mach/serial.h>
@@ -42,6 +41,8 @@ 


#include <media/tvp514x.h>



#include "davinci.h"



static inline int have_imager(void)

{

	/* REVISIT when it's supported, trigger via Kconfig */

arch/arm/mach-davinci/board-dm644x-evm.c

+121 −14
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm644x.h>

#include <mach/common.h>

#include <mach/i2c.h>

#include <mach/serial.h>
@@ -40,6 +39,8 @@ 
#include <mach/usb.h>

#include <mach/aemif.h>



#include "davinci.h"



#define DM644X_EVM_PHY_ID		"davinci_mdio-0:01"

#define LXT971_PHY_ID	(0x001378e2)

#define LXT971_PHY_MASK	(0xfffffff0)
@@ -189,7 +190,7 @@ static struct platform_device davinci_fb_device = { 
	.num_resources = 0,

};



static struct tvp514x_platform_data tvp5146_pdata = {

static struct tvp514x_platform_data dm644xevm_tvp5146_pdata = {

	.clk_polarity = 0,

	.hs_polarity = 1,

	.vs_polarity = 1
@@ -197,7 +198,7 @@ static struct tvp514x_platform_data tvp5146_pdata = { 


#define TVP514X_STD_ALL	(V4L2_STD_NTSC | V4L2_STD_PAL)

/* Inputs available at the TVP5146 */

static struct v4l2_input tvp5146_inputs[] = {

static struct v4l2_input dm644xevm_tvp5146_inputs[] = {

	{

		.index = 0,

		.name = "Composite",
@@ -217,7 +218,7 @@ static struct v4l2_input tvp5146_inputs[] = { 
 * ouput that goes to vpfe. There is a one to one correspondence

 * with tvp5146_inputs

 */

static struct vpfe_route tvp5146_routes[] = {

static struct vpfe_route dm644xevm_tvp5146_routes[] = {

	{

		.input = INPUT_CVBS_VI2B,

		.output = OUTPUT_10BIT_422_EMBEDDED_SYNC,
@@ -228,13 +229,13 @@ static struct vpfe_route tvp5146_routes[] = { 
	},

};



static struct vpfe_subdev_info vpfe_sub_devs[] = {

static struct vpfe_subdev_info dm644xevm_vpfe_sub_devs[] = {

	{

		.name = "tvp5146",

		.grp_id = 0,

		.num_inputs = ARRAY_SIZE(tvp5146_inputs),

		.inputs = tvp5146_inputs,

		.routes = tvp5146_routes,

		.num_inputs = ARRAY_SIZE(dm644xevm_tvp5146_inputs),

		.inputs = dm644xevm_tvp5146_inputs,

		.routes = dm644xevm_tvp5146_routes,

		.can_route = 1,

		.ccdc_if_params = {

			.if_type = VPFE_BT656,
@@ -243,15 +244,15 @@ static struct vpfe_subdev_info vpfe_sub_devs[] = { 
		},

		.board_info = {

			I2C_BOARD_INFO("tvp5146", 0x5d),

			.platform_data = &tvp5146_pdata,

			.platform_data = &dm644xevm_tvp5146_pdata,

		},

	},

};



static struct vpfe_config vpfe_cfg = {

	.num_subdevs = ARRAY_SIZE(vpfe_sub_devs),

static struct vpfe_config dm644xevm_capture_cfg = {

	.num_subdevs = ARRAY_SIZE(dm644xevm_vpfe_sub_devs),

	.i2c_adapter_id = 1,

	.sub_devs = vpfe_sub_devs,

	.sub_devs = dm644xevm_vpfe_sub_devs,

	.card_name = "DM6446 EVM",

	.ccdc = "DM6446 CCDC",

};
@@ -612,6 +613,113 @@ static void __init evm_init_i2c(void) 
	i2c_register_board_info(1, i2c_info, ARRAY_SIZE(i2c_info));

}



#define VENC_STD_ALL	(V4L2_STD_NTSC | V4L2_STD_PAL)



/* venc standard timings */

static struct vpbe_enc_mode_info dm644xevm_enc_std_timing[] = {

	{

		.name		= "ntsc",

		.timings_type	= VPBE_ENC_STD,

		.timings	= {V4L2_STD_525_60},

		.interlaced	= 1,

		.xres		= 720,

		.yres		= 480,

		.aspect		= {11, 10},

		.fps		= {30000, 1001},

		.left_margin	= 0x79,

		.upper_margin	= 0x10,

	},

	{

		.name		= "pal",

		.timings_type	= VPBE_ENC_STD,

		.timings	= {V4L2_STD_625_50},

		.interlaced	= 1,

		.xres		= 720,

		.yres		= 576,

		.aspect		= {54, 59},

		.fps		= {25, 1},

		.left_margin	= 0x7e,

		.upper_margin	= 0x16,

	},

};



/* venc dv preset timings */

static struct vpbe_enc_mode_info dm644xevm_enc_preset_timing[] = {

	{

		.name		= "480p59_94",

		.timings_type	= VPBE_ENC_DV_PRESET,

		.timings	= {V4L2_DV_480P59_94},

		.interlaced	= 0,

		.xres		= 720,

		.yres		= 480,

		.aspect		= {1, 1},

		.fps		= {5994, 100},

		.left_margin	= 0x80,

		.upper_margin	= 0x20,

	},

	{

		.name		= "576p50",

		.timings_type	= VPBE_ENC_DV_PRESET,

		.timings	= {V4L2_DV_576P50},

		.interlaced	= 0,

		.xres		= 720,

		.yres		= 576,

		.aspect		= {1, 1},

		.fps		= {50, 1},

		.left_margin	= 0x7e,

		.upper_margin	= 0x30,

	},

};



/*

 * The outputs available from VPBE + encoders. Keep the order same

 * as that of encoders. First those from venc followed by that from

 * encoders. Index in the output refers to index on a particular encoder.

 * Driver uses this index to pass it to encoder when it supports more

 * than one output. Userspace applications use index of the array to

 * set an output.

 */

static struct vpbe_output dm644xevm_vpbe_outputs[] = {

	{

		.output		= {

			.index		= 0,

			.name		= "Composite",

			.type		= V4L2_OUTPUT_TYPE_ANALOG,

			.std		= VENC_STD_ALL,

			.capabilities	= V4L2_OUT_CAP_STD,

		},

		.subdev_name	= VPBE_VENC_SUBDEV_NAME,

		.default_mode	= "ntsc",

		.num_modes	= ARRAY_SIZE(dm644xevm_enc_std_timing),

		.modes		= dm644xevm_enc_std_timing,

	},

	{

		.output		= {

			.index		= 1,

			.name		= "Component",

			.type		= V4L2_OUTPUT_TYPE_ANALOG,

			.capabilities	= V4L2_OUT_CAP_PRESETS,

		},

		.subdev_name	= VPBE_VENC_SUBDEV_NAME,

		.default_mode	= "480p59_94",

		.num_modes	= ARRAY_SIZE(dm644xevm_enc_preset_timing),

		.modes		= dm644xevm_enc_preset_timing,

	},

};



static struct vpbe_config dm644xevm_display_cfg = {

	.module_name	= "dm644x-vpbe-display",

	.i2c_adapter_id	= 1,

	.osd		= {

		.module_name	= VPBE_OSD_SUBDEV_NAME,

	},

	.venc		= {

		.module_name	= VPBE_VENC_SUBDEV_NAME,

	},

	.num_outputs	= ARRAY_SIZE(dm644xevm_vpbe_outputs),

	.outputs	= dm644xevm_vpbe_outputs,

};



static struct platform_device *davinci_evm_devices[] __initdata = {

	&davinci_fb_device,

	&rtc_dev,
@@ -624,8 +732,6 @@ static struct davinci_uart_config uart_config __initdata = { 
static void __init

davinci_evm_map_io(void)

{

	/* setup input configuration for VPFE input devices */

	dm644x_set_vpfe_config(&vpfe_cfg);

	dm644x_init();

}
@@ -697,6 +803,7 @@ static __init void davinci_evm_init(void) 
	evm_init_i2c();



	davinci_setup_mmc(0, &dm6446evm_mmc_config);

	dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg);



	davinci_serial_init(&uart_config);

	dm644x_init_asp(&dm644x_evm_snd_data);

arch/arm/mach-davinci/board-dm646x-evm.c

+11 −21
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ 
#include <asm/mach-types.h>

#include <asm/mach/arch.h>



#include <mach/dm646x.h>

#include <mach/common.h>

#include <mach/serial.h>

#include <mach/i2c.h>
@@ -45,6 +44,7 @@ 
#include <mach/cdce949.h>

#include <mach/aemif.h>



#include "davinci.h"

#include "clock.h"



#define NAND_BLOCK_SIZE		SZ_128K
@@ -410,8 +410,6 @@ static struct davinci_i2c_platform_data i2c_pdata = { 
	.bus_delay      = 0 /* usec */,

};



#define VIDCLKCTL_OFFSET	(DAVINCI_SYSTEM_MODULE_BASE + 0x38)

#define VSCLKDIS_OFFSET		(DAVINCI_SYSTEM_MODULE_BASE + 0x6c)

#define VCH2CLK_MASK		(BIT_MASK(10) | BIT_MASK(9) | BIT_MASK(8))

#define VCH2CLK_SYSCLK8		(BIT(9))

#define VCH2CLK_AUXCLK		(BIT(9) | BIT(8))
@@ -429,8 +427,6 @@ static struct davinci_i2c_platform_data i2c_pdata = { 
#define TVP5147_CH0		"tvp514x-0"

#define TVP5147_CH1		"tvp514x-1"



static void __iomem *vpif_vidclkctl_reg;

static void __iomem *vpif_vsclkdis_reg;

/* spin lock for updating above registers */

static spinlock_t vpif_reg_lock;
@@ -441,14 +437,14 @@ static int set_vpif_clock(int mux_mode, int hd) 
	int val = 0;

	int err = 0;



	if (!vpif_vidclkctl_reg || !vpif_vsclkdis_reg || !cpld_client)

	if (!cpld_client)

		return -ENXIO;



	/* disable the clock */

	spin_lock_irqsave(&vpif_reg_lock, flags);

	value = __raw_readl(vpif_vsclkdis_reg);

	value = __raw_readl(DAVINCI_SYSMOD_VIRT(SYSMOD_VSCLKDIS));

	value |= (VIDCH3CLK | VIDCH2CLK);

	__raw_writel(value, vpif_vsclkdis_reg);

	__raw_writel(value, DAVINCI_SYSMOD_VIRT(SYSMOD_VSCLKDIS));

	spin_unlock_irqrestore(&vpif_reg_lock, flags);



	val = i2c_smbus_read_byte(cpld_client);
@@ -464,7 +460,7 @@ static int set_vpif_clock(int mux_mode, int hd) 
	if (err)

		return err;



	value = __raw_readl(vpif_vidclkctl_reg);

	value = __raw_readl(DAVINCI_SYSMOD_VIRT(SYSMOD_VIDCLKCTL));

	value &= ~(VCH2CLK_MASK);

	value &= ~(VCH3CLK_MASK);
@@ -473,13 +469,13 @@ static int set_vpif_clock(int mux_mode, int hd) 
	else

		value |= (VCH2CLK_AUXCLK | VCH3CLK_AUXCLK);



	__raw_writel(value, vpif_vidclkctl_reg);

	__raw_writel(value, DAVINCI_SYSMOD_VIRT(SYSMOD_VIDCLKCTL));



	spin_lock_irqsave(&vpif_reg_lock, flags);

	value = __raw_readl(vpif_vsclkdis_reg);

	value = __raw_readl(DAVINCI_SYSMOD_VIRT(SYSMOD_VSCLKDIS));

	/* enable the clock */

	value &= ~(VIDCH3CLK | VIDCH2CLK);

	__raw_writel(value, vpif_vsclkdis_reg);

	__raw_writel(value, DAVINCI_SYSMOD_VIRT(SYSMOD_VSCLKDIS));

	spin_unlock_irqrestore(&vpif_reg_lock, flags);



	return 0;
@@ -564,7 +560,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
	int val;

	u32 value;



	if (!vpif_vidclkctl_reg || !cpld_client)

	if (!cpld_client)

		return -ENXIO;



	val = i2c_smbus_read_byte(cpld_client);
@@ -572,7 +568,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
		return val;



	spin_lock_irqsave(&vpif_reg_lock, flags);

	value = __raw_readl(vpif_vidclkctl_reg);

	value = __raw_readl(DAVINCI_SYSMOD_VIRT(SYSMOD_VIDCLKCTL));

	if (mux_mode) {

		val &= VPIF_INPUT_TWO_CHANNEL;

		value |= VIDCH1CLK;
@@ -580,7 +576,7 @@ static int setup_vpif_input_channel_mode(int mux_mode) 
		val |= VPIF_INPUT_ONE_CHANNEL;

		value &= ~VIDCH1CLK;

	}

	__raw_writel(value, vpif_vidclkctl_reg);

	__raw_writel(value, DAVINCI_SYSMOD_VIRT(SYSMOD_VIDCLKCTL));

	spin_unlock_irqrestore(&vpif_reg_lock, flags);



	err = i2c_smbus_write_byte(cpld_client, val);
@@ -674,12 +670,6 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 


static void __init evm_init_video(void)

{

	vpif_vidclkctl_reg = ioremap(VIDCLKCTL_OFFSET, 4);

	vpif_vsclkdis_reg = ioremap(VSCLKDIS_OFFSET, 4);

	if (!vpif_vidclkctl_reg || !vpif_vsclkdis_reg) {

		pr_err("Can't map VPIF VIDCLKCTL or VSCLKDIS registers\n");

		return;

	}

	spin_lock_init(&vpif_reg_lock);



	dm646x_setup_vpif(&dm646x_vpif_display_config,