[PATCH 0/2] ARM: davinci: misc. VPIF cleanups

[PATCH 0/2] ARM: davinci: misc. VPIF cleanups

[Kevin Hilman]

This are the platforms-specific cleanups needed to go along with the
VPIF cleanups for raw capture support here:

   https://marc.info/?l=linux-arm-kernel&m=149643932427173

Kevin Hilman (2):
  ARM: davinci: pdata-quirks: fix const warnings
  ARM: dts: da850-evm: drop VPIF endpoints

 arch/arm/boot/dts/da850-evm.dts      | 21 ---------------------
 arch/arm/mach-davinci/pdata-quirks.c |  4 ++--
 2 files changed, 2 insertions(+), 23 deletions(-)

-- 
2.9.3

[PATCH 1/2] ARM: davinci: pdata-quirks: fix const warnings

[Kevin Hilman]

After VPIF was converted to enable getting subdevs from DT, the
pdata is no longer const, so remove these to avoid compiler warnings.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 arch/arm/mach-davinci/pdata-quirks.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c
index 329f5402ad1d..4858b1cdf31b 100644
--- a/arch/arm/mach-davinci/pdata-quirks.c
+++ b/arch/arm/mach-davinci/pdata-quirks.c
@@ -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,
-- 
2.9.3

[PATCH 2/2] ARM: dts: da850-evm: drop VPIF endpoints

[Kevin Hilman]

Drop the unused endpoints.  They should only be used when there is
an actual remote-endpoint connected.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
---
 arch/arm/boot/dts/da850-evm.dts | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index a423e8ebfb37..67e72bc72e80 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -301,25 +301,4 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&vpif_capture_pins>, <&vpif_display_pins>;
 	status = "okay";
-
-	/* VPIF capture port */
-	port at 0 {
-		vpif_input_ch0: endpoint at 0 {
-			reg = <0>;
-			bus-width = <8>;
-		};
-
-		vpif_input_ch1: endpoint at 1 {
-			reg = <1>;
-			bus-width = <8>;
-			data-shift = <8>;
-		};
-	};
-
-	/* VPIF display port */
-	port at 1 {
-		vpif_output_ch0: endpoint {
-			bus-width = <8>;
-		};
-	};
 };
-- 
2.9.3

[PATCH 1/2] ARM: davinci: pdata-quirks: fix const warnings

[Sekhar Nori]

Hi Kevin,

On Saturday 03 June 2017 04:42 AM, Kevin Hilman wrote:
> After VPIF was converted to enable getting subdevs from DT, the
> pdata is no longer const, so remove these to avoid compiler warnings.
> 
> Signed-off-by: Kevin Hilman <khilman@baylibre.com>

I think this should be squashed into patch 2/4 of "davinci:
vpif_capture: raw camera support" series where the warning is
introduced. That does mix the platform and driver parts in one patch,
but I think its better that way so that no patch introduces a warning.

The patch does not clash with anything queued in davinci tree, so I
think it should be fine.

Also, there is a warning introduced in
arch/arm/mach-davinci/board-dm646x-evm.c that should be fixed as well.

Thanks,
Sekhar

[PATCH 1/2] ARM: davinci: pdata-quirks: fix const warnings

[Kevin Hilman]

Sekhar Nori <nsekhar@ti.com> writes:

> Hi Kevin,
>
> On Saturday 03 June 2017 04:42 AM, Kevin Hilman wrote:
>> After VPIF was converted to enable getting subdevs from DT, the
>> pdata is no longer const, so remove these to avoid compiler warnings.
>> 
>> Signed-off-by: Kevin Hilman <khilman@baylibre.com>
>
> I think this should be squashed into patch 2/4 of "davinci:
> vpif_capture: raw camera support" series where the warning is
> introduced. That does mix the platform and driver parts in one patch,
> but I think its better that way so that no patch introduces a warning.

Well, media maintainers have already taken that patch, and probably
won't want to take this as a separate patch now.  So, IMO, as long as
this goes in the same merge window, a couple warnings in -next while
things are settling will be OK.

> The patch does not clash with anything queued in davinci tree, so I
> think it should be fine.
>
> Also, there is a warning introduced in
> arch/arm/mach-davinci/board-dm646x-evm.c that should be fixed as well.

I'll fix that and resend the series (this time with DT maintainers in
copy for PATCH 2/2.

Kevin