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

Commit f7b22111 authored Jun 18, 2017 by Olof Johansson

Merge tag 'davinci-for-v4.13/soc-2' of...

Merge tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci into next/soc

A patch to fix warnings resulting from DT conversion
of VPIF driver.

* tag 'davinci-for-v4.13/soc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/nsekhar/linux-davinci

:
  ARM: davinci: fix const warnings

Signed-off-by: Olof Johansson <olof@lixom.net>

parents da82480d 231ce279

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

+2 −2

Original line number	Diff line number	Diff line
		@@ -641,7 +641,7 @@ static struct vpif_subdev_info vpif_capture_sdev_info[] = {
		},
		};

		static const struct vpif_input dm6467_ch0_inputs[] = {
		static struct vpif_input dm6467_ch0_inputs[] = {
		{
		.input = {
		.index = 0,
		@@ -656,7 +656,7 @@ static const struct vpif_input dm6467_ch0_inputs[] = {
		},
		};

		static const struct vpif_input dm6467_ch1_inputs[] = {
		static struct vpif_input dm6467_ch1_inputs[] = {
		{
		.input = {
		.index = 0,

arch/arm/mach-davinci/pdata-quirks.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ static struct tvp514x_platform_data tvp5146_pdata = {

		#define TVP514X_STD_ALL (V4L2_STD_NTSC \| V4L2_STD_PAL)

		static const struct vpif_input da850_ch0_inputs[] = {
		static struct vpif_input da850_ch0_inputs[] = {
		{
		.input = {
		.index = 0,
		@@ -48,7 +48,7 @@ static const struct vpif_input da850_ch0_inputs[] = {
		},
		};

		static const struct vpif_input da850_ch1_inputs[] = {
		static struct vpif_input da850_ch1_inputs[] = {
		{
		.input = {
		.index = 0,