[PATCH 02/10] ARM: dts: da850-evm: fix whitespace errors
From: khilman@baylibre.com (Kevin Hilman)
Date: 2017-02-13 18:28:06
Also in:
linux-devicetree, linux-media, lkml
Bartosz Golaszewski [off-list ref] writes:
Signed-off-by: Bartosz Golaszewski <redacted>
Acked-by: Kevin Hilman <khilman@baylibre.com>
quoted hunk
--- arch/arm/boot/dts/da850-evm.dts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index c970b6e..94938a3 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts@@ -301,14 +301,14 @@ /* VPIF capture port */ port { vpif_ch0: endpoint at 0 { - reg = <0>; - bus-width = <8>; + reg = <0>; + bus-width = <8>; }; vpif_ch1: endpoint at 1 { - reg = <1>; - bus-width = <8>; - data-shift = <8>; + reg = <1>; + bus-width = <8>; + data-shift = <8>; }; }; };
Bartosz Golaszewski [off-list ref] writes:
quoted hunk
Extend the vpif node with an output port with a single channel. NOTE: this is still just hardware description - the actual driver is registered using pdata-quirks. Signed-off-by: Bartosz Golaszewski <redacted> --- arch/arm/boot/dts/da850-evm.dts | 14 +++++++++++--- arch/arm/boot/dts/da850.dtsi | 8 +++++++- 2 files changed, 18 insertions(+), 4 deletions(-)diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts index 94938a3..3d6dd66 100644 --- a/arch/arm/boot/dts/da850-evm.dts +++ b/arch/arm/boot/dts/da850-evm.dts@@ -299,16 +299,24 @@ status = "okay"; /* VPIF capture port */ - port { - vpif_ch0: endpoint at 0 { + port at 0 { + vpif_input_ch0: endpoint at 0 { reg = <0>; bus-width = <8>; }; - vpif_ch1: endpoint at 1 { + vpif_input_ch1: endpoint at 1 { reg = <1>; bus-width = <8>; data-shift = <8>; }; }; + + /* VPIF display port */ + port at 1 { + vpif_output_ch0: endpoint at 0 { + reg = <0>; + bus-width = <8>; + }; + }; };diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi index 69ec5e7..768a58c 100644 --- a/arch/arm/boot/dts/da850.dtsi +++ b/arch/arm/boot/dts/da850.dtsi@@ -494,7 +494,13 @@ status = "disabled"; /* VPIF capture port */ - port { + port at 0 { + #address-cells = <1>; + #size-cells = <0>; + }; + + /* VPIF display port */ + port at 1 { #address-cells = <1>; #size-cells = <0>; };
Bartosz Golaszewski [off-list ref] writes:
quoted hunk
There's a stray tab in da850_vpif_legacy_init(). Remove it. Signed-off-by: Bartosz Golaszewski <redacted> --- arch/arm/mach-davinci/pdata-quirks.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)diff --git a/arch/arm/mach-davinci/pdata-quirks.c b/arch/arm/mach-davinci/pdata-quirks.c index a186513..94948c1 100644 --- a/arch/arm/mach-davinci/pdata-quirks.c +++ b/arch/arm/mach-davinci/pdata-quirks.c@@ -111,7 +111,7 @@ static struct vpif_capture_config da850_vpif_capture_config = { static void __init da850_vpif_legacy_init(void) { int ret; - + /* LCDK doesn't have the 2nd TVP514x on CH1 */ if (of_machine_is_compatible("ti,da850-lcdk")) da850_vpif_capture_config.subdev_count = 1;