From: khilman@baylibre•com (Kevin Hilman)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 02/10] ARM: dts: da850-evm: fix whitespace errors
Date: Mon, 13 Feb 2017 10:28:00 -0800 [thread overview]
Message-ID: <m24lzyeyj3.fsf@baylibre.com> (raw)
In-Reply-To: <1486485683-11427-3-git-send-email-bgolaszewski@baylibre.com> (Bartosz Golaszewski's message of "Tue, 7 Feb 2017 17:41:15 +0100")
Bartosz Golaszewski <bgolaszewski@baylibre•com> writes:
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre•com>
Acked-by: Kevin Hilman <khilman@baylibre•com>
> ---
> 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 <bgolaszewski@baylibre•com> writes:
> 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 <bgolaszewski@baylibre•com>
> ---
> 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 <bgolaszewski@baylibre•com> writes:
> There's a stray tab in da850_vpif_legacy_init(). Remove it.
>
> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre•com>
> ---
> 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;
next prev parent reply other threads:[~2017-02-13 18:28 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-07 16:41 [PATCH 00/10] ARM: davinci: add vpif display support Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 01/10] media: dt-bindings: vpif: fix whitespace errors Bartosz Golaszewski
2017-02-15 22:01 ` Rob Herring
2017-02-07 16:41 ` [PATCH 02/10] ARM: dts: da850-evm: " Bartosz Golaszewski
2017-02-13 18:28 ` Kevin Hilman [this message]
2017-02-13 18:35 ` Kevin Hilman
2017-02-13 21:01 ` Kevin Hilman
2017-02-14 6:30 ` Sekhar Nori
2017-02-07 16:41 ` [PATCH 03/10] media: dt-bindings: vpif: extend the example with an output port Bartosz Golaszewski
2017-02-15 22:03 ` Rob Herring
2017-02-15 22:08 ` Rob Herring
2017-02-16 7:32 ` Laurent Pinchart
2017-02-16 16:06 ` Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 04/10] ARM: dts: da850-evm: add the output port to the vpif node Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 05/10] ARM: dts: da850: add vpif video display pins Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 06/10] ARM: davinci_all_defconfig: enable VPIF display modules Bartosz Golaszewski
2017-02-07 16:41 ` [PATCH 07/10] ARM: davinci: fix a whitespace error Bartosz Golaszewski
2017-02-13 18:36 ` Kevin Hilman
2017-02-13 21:04 ` Kevin Hilman
2017-02-07 16:41 ` [PATCH 08/10] ARM: davinci: fix the DT boot on da850-evm Bartosz Golaszewski
2017-02-07 18:21 ` Kevin Hilman
2017-02-09 15:23 ` Sekhar Nori
2017-02-09 16:44 ` Bartosz Golaszewski
2017-02-13 18:35 ` Kevin Hilman
2017-02-07 16:41 ` [PATCH 09/10] media: vpif: use a configurable i2c_adapter_id for vpif display Bartosz Golaszewski
2017-02-07 18:16 ` Kevin Hilman
2017-02-07 16:41 ` [PATCH 10/10] ARM: davinci: add pdata-quirks for da850-evm " Bartosz Golaszewski
2017-02-07 18:20 ` Kevin Hilman
2017-02-08 13:26 ` Bartosz Golaszewski
2017-02-10 19:40 ` Kevin Hilman
2017-02-13 9:22 ` [PATCH 00/10] ARM: davinci: add vpif display support Sekhar Nori
2017-02-16 17:48 ` Bartosz Golaszewski
2017-03-09 10:53 ` Hans Verkuil
2017-03-09 11:00 ` Bartosz Golaszewski
2017-03-09 12:05 ` Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m24lzyeyj3.fsf@baylibre.com \
--to=khilman@baylibre$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox