Message ID | 1486485683-11427-3-git-send-email-bgolaszewski@baylibre.com (mailing list archive) |
---|---|
State | Changes Requested, archived |
Delegated to: | Hans Verkuil |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.84_2) (envelope-from <linux-media-owner@vger.kernel.org>) id 1cb8qK-0002rL-B6; Tue, 07 Feb 2017 16:42:12 +0000 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.84_2/mailfrontend-7) with esmtp id 1cb8qI-0005IO-15; Tue, 07 Feb 2017 17:42:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755413AbdBGQmF (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Tue, 7 Feb 2017 11:42:05 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:35861 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755373AbdBGQmE (ORCPT <rfc822; linux-media@vger.kernel.org>); Tue, 7 Feb 2017 11:42:04 -0500 Received: by mail-wm0-f51.google.com with SMTP id c85so168569997wmi.1 for <linux-media@vger.kernel.org>; Tue, 07 Feb 2017 08:41:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=IWL2aR1TexJ9CG33prUvw3CI4QDIqlM8WNZWP1kRPKs=; b=ghYyqnsgs3HCy9TzsCF4V8rQCROVfdAdd5D1h7/woYO3fIBbIz0p+Ioe3FDzxY8gDH emhkebeToClRlOlvnXavLvY0iH7mQdm3d0bgN1zcIm9dQ1VxBe5NskBTPGrSH09uxitd b7GfvCA8xvAMJA6NHzfVFIGp6XGPpBxZlWPS76nIFgUreaYQlrJO1koWCxasYFv2VOHy Atjtsxam8l0dRtvxBF9h0Qsu8TKBVU9j1J39+VRBY8m7I6DYL6vAfAlHySGbBZTM8b7i 3HyLd6UOFvzPsRjmCwl5qBbzgwG/Sq++swbcpZAokj+YF7lJPyoHStxhDwlHVmOt+uC1 j7HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=IWL2aR1TexJ9CG33prUvw3CI4QDIqlM8WNZWP1kRPKs=; b=GrO1/y4LtmKmYh/EcaX96UkvdrziEcNftlkN/5wRkK1R4M3RPuuTchORlaV8WpViFt ptvAu6mKtgn68jpRQrbmOEj7Wyc4DQX2T1TRwDJ9N+IbSSoJJLXFIgS6rVoHHx7kn9ST //rko4s9je+JCmUqnRHHAo1kbDRydoqw07iQPkG+Br6D+9apqKiYLlP4sVlnCfRxh79e /lytJTyeUfv7834N1dT+p/mjLt3lhEYR8EkJKSwAUfUvkReJiJpNzf8XgGPyAq6323kv oMhxTV+qfPJuWxA3mBOJ1bqf0NnpzCNLxUrkKbvIqMF/IgbTKMJEP0EorTrNOWN5kIjT o4Qg== X-Gm-Message-State: AMke39lQ6XkAe24CnsaBc5lzDaE1L01gDTDoGDgKMh6Md6eNohWWANpVhz/rgv4fwVIVi8Xz X-Received: by 10.28.17.20 with SMTP id 20mr14529303wmr.106.1486485707717; Tue, 07 Feb 2017 08:41:47 -0800 (PST) Received: from localhost.localdomain ([90.63.244.31]) by smtp.gmail.com with ESMTPSA id 8sm3958185wmg.1.2017.02.07.08.41.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 07 Feb 2017 08:41:47 -0800 (PST) From: Bartosz Golaszewski <bgolaszewski@baylibre.com> To: Kevin Hilman <khilman@kernel.org>, Sekhar Nori <nsekhar@ti.com>, Patrick Titiano <ptitiano@baylibre.com>, Michael Turquette <mturquette@baylibre.com>, Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Russell King <linux@armlinux.org.uk>, Alexandre Bailon <abailon@baylibre.com>, David Lechner <david@lechnology.com>, Laurent Pinchart <laurent.pinchart@ideasonboard.com>, Mauro Carvalho Chehab <mchehab@kernel.org>, Lad Prabhakar <prabhakar.csengg@gmail.com> Cc: devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-media@vger.kernel.org, Bartosz Golaszewski <bgolaszewski@baylibre.com> Subject: [PATCH 02/10] ARM: dts: da850-evm: fix whitespace errors Date: Tue, 7 Feb 2017 17:41:15 +0100 Message-Id: <1486485683-11427-3-git-send-email-bgolaszewski@baylibre.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> References: <1486485683-11427-1-git-send-email-bgolaszewski@baylibre.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2017.2.7.163617 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_LESS 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, BODY_SIZE_800_899 0, DKIM_SIGNATURE 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, NO_URI_HTTPS 0, REFERENCES 0, SINGLE_URI_IN_BODY 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __FROM_DOMAIN_IN_ANY_TO2 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_LIST_ID 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __NO_HTML_TAG_RAW 0, __REFERENCES 0, __SANE_MSGID 0, __SINGLE_URI_TEXT 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0, __YOUTUBE_RCVD 0' |
Commit Message
Bartosz Golaszewski
Feb. 7, 2017, 4:41 p.m. UTC
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>
---
arch/arm/boot/dts/da850-evm.dts | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
Comments
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@0 { > - reg = <0>; > - bus-width = <8>; > + reg = <0>; > + bus-width = <8>; > }; > > vpif_ch1: endpoint@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@0 { > + port@0 { > + vpif_input_ch0: endpoint@0 { > reg = <0>; > bus-width = <8>; > }; > > - vpif_ch1: endpoint@1 { > + vpif_input_ch1: endpoint@1 { > reg = <1>; > bus-width = <8>; > data-shift = <8>; > }; > }; > + > + /* VPIF display port */ > + port@1 { > + vpif_output_ch0: endpoint@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@0 { > + #address-cells = <1>; > + #size-cells = <0>; > + }; > + > + /* VPIF display port */ > + port@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;
Bartosz Golaszewski <bgolaszewski@baylibre.com> writes: > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> I'll fold this one into the original since it's not yet merged. Kevin > --- > 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@0 { > - reg = <0>; > - bus-width = <8>; > + reg = <0>; > + bus-width = <8>; > }; > > vpif_ch1: endpoint@1 { > - reg = <1>; > - bus-width = <8>; > - data-shift = <8>; > + reg = <1>; > + bus-width = <8>; > + data-shift = <8>; > }; > }; > };
Kevin Hilman <khilman@baylibre.com> writes: > Bartosz Golaszewski <bgolaszewski@baylibre.com> writes: > >> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> > > I'll fold this one into the original since it's not yet merged. Oops, Sekhar has already merged this one to his v4.11/dt branch, so he can apply it (or fold it in.) Kevin
On Tuesday 14 February 2017 02:31 AM, Kevin Hilman wrote: > Kevin Hilman <khilman@baylibre.com> writes: > >> Bartosz Golaszewski <bgolaszewski@baylibre.com> writes: >> >>> Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> >> >> I'll fold this one into the original since it's not yet merged. > > Oops, Sekhar has already merged this one to his v4.11/dt branch, so he > can apply it (or fold it in.) Alright, I will apply this. Bartosz, for future, please add a commit description for trivial patches too. Even if its more or less just a rewording of subject line. Thanks, Sekhar
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@0 { - reg = <0>; - bus-width = <8>; + reg = <0>; + bus-width = <8>; }; vpif_ch1: endpoint@1 { - reg = <1>; - bus-width = <8>; - data-shift = <8>; + reg = <1>; + bus-width = <8>; + data-shift = <8>; }; }; };