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

Commit a7be67b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'davinci-fixes-for-v4.17-part-2' of... 

Merge tag 'davinci-fixes-for-v4.17-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into fixes

Second set of fixes for TI DaVinci.

They are needed for DM6467 EVM to work. The first patch fixes an
issue with timer interrupt and the second two are needed for video
driver to probe successfully.

* tag 'davinci-fixes-for-v4.17-part-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: board-dm646x-evm: set VPIF capture card name
  ARM: davinci: board-dm646x-evm: pass correct I2C adapter id for VPIF
  ARM: davinci: dm646x: fix timer interrupt generation

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ae93870f bb7298a7

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

+4 −1
Original line number Diff line number Diff line
@@ -532,11 +532,12 @@ static struct vpif_display_config dm646x_vpif_display_config = { 
	.set_clock	= set_vpif_clock,

	.subdevinfo	= dm646x_vpif_subdev,

	.subdev_count	= ARRAY_SIZE(dm646x_vpif_subdev),

	.i2c_adapter_id = 1,

	.chan_config[0] = {

		.outputs = dm6467_ch0_outputs,

		.output_count = ARRAY_SIZE(dm6467_ch0_outputs),

	},

	.card_name	= "DM646x EVM",

	.card_name	= "DM646x EVM Video Display",

};



/**
@@ -674,6 +675,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 
	.setup_input_channel_mode = setup_vpif_input_channel_mode,

	.subdev_info = vpif_capture_sdev_info,

	.subdev_count = ARRAY_SIZE(vpif_capture_sdev_info),

	.i2c_adapter_id = 1,

	.chan_config[0] = {

		.inputs = dm6467_ch0_inputs,

		.input_count = ARRAY_SIZE(dm6467_ch0_inputs),
@@ -694,6 +696,7 @@ static struct vpif_capture_config dm646x_vpif_capture_cfg = { 
			.fid_pol = 0,

		},

	},

	.card_name = "DM646x EVM Video Capture",

};



static void __init evm_init_video(void)

arch/arm/mach-davinci/dm646x.c

+2 −1
Original line number Diff line number Diff line
@@ -488,7 +488,8 @@ static u8 dm646x_default_priorities[DAVINCI_N_AINTC_IRQ] = { 
	[IRQ_DM646X_MCASP0TXINT]        = 7,

	[IRQ_DM646X_MCASP0RXINT]        = 7,

	[IRQ_DM646X_RESERVED_3]         = 7,

	[IRQ_DM646X_MCASP1TXINT]        = 7,    /* clockevent */

	[IRQ_DM646X_MCASP1TXINT]        = 7,

	[IRQ_TINT0_TINT12]              = 7,    /* clockevent */

	[IRQ_TINT0_TINT34]              = 7,    /* clocksource */

	[IRQ_TINT1_TINT12]              = 7,    /* DSP timer */

	[IRQ_TINT1_TINT34]              = 7,    /* system tick */