Message ID | 1418892667-27428-7-git-send-email-josh.wu@atmel.com (mailing list archive) |
---|---|
State | Superseded, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1Y1Wqa-0002aF-TT; Thu, 18 Dec 2014 09:54:12 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1Y1WqY-00072N-5e; Thu, 18 Dec 2014 09:54:12 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752385AbaLRIyI (ORCPT <rfc822;mkrufky@linuxtv.org> + 1 other); Thu, 18 Dec 2014 03:54:08 -0500 Received: from eusmtp01.atmel.com ([212.144.249.242]:61103 "EHLO eusmtp01.atmel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752377AbaLRIyH (ORCPT <rfc822;linux-media@vger.kernel.org>); Thu, 18 Dec 2014 03:54:07 -0500 Received: from apsmtp01.atmel.com (10.168.254.31) by eusmtp01.atmel.com (10.161.101.30) with Microsoft SMTP Server id 14.2.347.0; Thu, 18 Dec 2014 09:54:00 +0100 Received: from melon.corp.atmel.com (10.168.254.13) by apsmtp01.atmel.com (10.168.254.31) with Microsoft SMTP Server id 14.2.347.0; Thu, 18 Dec 2014 16:56:44 +0800 From: Josh Wu <josh.wu@atmel.com> To: <nicolas.ferre@atmel.com> CC: <voice.shen@atmel.com>, <plagnioj@jcrosoft.com>, <boris.brezillon@free-electrons.com>, <alexandre.belloni@free-electrons.com>, <devicetree@vger.kernel.org>, <robh+dt@kernel.org>, <linux-media@vger.kernel.org>, <g.liakhovetski@gmx.de>, <laurent.pinchart@ideasonboard.com>, Josh Wu <josh.wu@atmel.com> Subject: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support Date: Thu, 18 Dec 2014 16:51:06 +0800 Message-ID: <1418892667-27428-7-git-send-email-josh.wu@atmel.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1418892667-27428-1-git-send-email-josh.wu@atmel.com> References: <1418892667-27428-1-git-send-email-josh.wu@atmel.com> MIME-Version: 1.0 Content-Type: text/plain 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: 2014.12.18.84221 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, MSGID_ADDED_BY_MTA 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, REFERENCES 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' |
Commit Message
Josh Wu
Dec. 18, 2014, 8:51 a.m. UTC
According to v4l2 dt document, we add:
a camera host: ISI port.
a i2c camera sensor: ov2640 port.
to sama5d3xmb.dtsi.
In the ov2640 node, it defines the pinctrls, clocks and isi port.
In the ISI node, it also reference to a ov2640 port.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/boot/dts/sama5d3xmb.dtsi | 32 ++++++++++++++++++++++++++++++++
1 file changed, 32 insertions(+)
Comments
Hi Josh, Thank you for the patch. On Thursday 18 December 2014 16:51:06 Josh Wu wrote: > According to v4l2 dt document, we add: > a camera host: ISI port. > a i2c camera sensor: ov2640 port. > to sama5d3xmb.dtsi. > > In the ov2640 node, it defines the pinctrls, clocks and isi port. > In the ISI node, it also reference to a ov2640 port. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > arch/arm/boot/dts/sama5d3xmb.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi > b/arch/arm/boot/dts/sama5d3xmb.dtsi index 0aaebc6..958a528 100644 > --- a/arch/arm/boot/dts/sama5d3xmb.dtsi > +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi > @@ -52,6 +52,29 @@ > }; > }; > > + i2c1: i2c@f0018000 { > + ov2640: camera@0x30 { > + compatible = "ovti,ov2640"; > + reg = <0x30>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_isi_pck_as_mck > &pinctrl_sensor_power &pinctrl_sensor_reset>; > + resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>; > + pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>; > + /* use pck1 for the master clock of ov2640 */ > + clocks = <&pck1>; > + clock-names = "xvclk"; > + assigned-clocks = <&pck1>; > + assigned-clock-rates = <25000000>; > + > + port { > + ov2640_0: endpoint { > + remote-endpoint = <&isi_0>; > + bus-width = <8>; > + }; > + }; > + }; > + }; > + > usart1: serial@f0020000 { > dmas = <0>, <0>; /* Do not use DMA for usart1 */ > pinctrl-names = "default"; > @@ -60,6 +83,15 @@ > }; > > isi: isi@f0034000 { > + port { > + #address-cells = <1>; > + #size-cells = <0>; > + I would add the port node and those two properties to arch/arm/boot/dts/sama5d3.dtsi, as the isi has a single port. The endpoint, of course, should stay in this file. > + isi_0: endpoint { > + remote-endpoint = <&ov2640_0>; > + bus-width = <8>; > + }; > + }; > }; > > mmc1: mmc@f8000000 {
Hi, Laurent On 12/18/2014 8:32 PM, Laurent Pinchart wrote: > Hi Josh, > > Thank you for the patch. > > On Thursday 18 December 2014 16:51:06 Josh Wu wrote: >> According to v4l2 dt document, we add: >> a camera host: ISI port. >> a i2c camera sensor: ov2640 port. >> to sama5d3xmb.dtsi. >> >> In the ov2640 node, it defines the pinctrls, clocks and isi port. >> In the ISI node, it also reference to a ov2640 port. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> >> --- >> arch/arm/boot/dts/sama5d3xmb.dtsi | 32 ++++++++++++++++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi >> b/arch/arm/boot/dts/sama5d3xmb.dtsi index 0aaebc6..958a528 100644 >> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi >> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi >> @@ -52,6 +52,29 @@ >> }; >> }; >> >> + i2c1: i2c@f0018000 { >> + ov2640: camera@0x30 { >> + compatible = "ovti,ov2640"; >> + reg = <0x30>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_isi_pck_as_mck >> &pinctrl_sensor_power &pinctrl_sensor_reset>; >> + resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>; >> + pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>; >> + /* use pck1 for the master clock of ov2640 */ >> + clocks = <&pck1>; >> + clock-names = "xvclk"; >> + assigned-clocks = <&pck1>; >> + assigned-clock-rates = <25000000>; >> + >> + port { >> + ov2640_0: endpoint { >> + remote-endpoint = <&isi_0>; >> + bus-width = <8>; >> + }; >> + }; >> + }; >> + }; >> + >> usart1: serial@f0020000 { >> dmas = <0>, <0>; /* Do not use DMA for usart1 */ >> pinctrl-names = "default"; >> @@ -60,6 +83,15 @@ >> }; >> >> isi: isi@f0034000 { >> + port { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + > I would add the port node and those two properties to > arch/arm/boot/dts/sama5d3.dtsi, as the isi has a single port. The endpoint, of > course, should stay in this file. That makes sense. I'll fix that. Thanks for the review. Best Regards, Josh Wu > >> + isi_0: endpoint { >> + remote-endpoint = <&ov2640_0>; >> + bus-width = <8>; >> + }; >> + }; >> }; >> >> mmc1: mmc@f8000000 { -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 18/12/2014 at 16:51:06 +0800, Josh Wu wrote : > According to v4l2 dt document, we add: > a camera host: ISI port. > a i2c camera sensor: ov2640 port. > to sama5d3xmb.dtsi. > > In the ov2640 node, it defines the pinctrls, clocks and isi port. > In the ISI node, it also reference to a ov2640 port. > > Signed-off-by: Josh Wu <josh.wu@atmel.com> > --- > arch/arm/boot/dts/sama5d3xmb.dtsi | 32 ++++++++++++++++++++++++++++++++ > 1 file changed, 32 insertions(+) > > diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi > index 0aaebc6..958a528 100644 > --- a/arch/arm/boot/dts/sama5d3xmb.dtsi > +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi > @@ -52,6 +52,29 @@ > }; > }; > > + i2c1: i2c@f0018000 { > + ov2640: camera@0x30 { > + compatible = "ovti,ov2640"; > + reg = <0x30>; > + pinctrl-names = "default"; > + pinctrl-0 = <&pinctrl_isi_pck_as_mck &pinctrl_sensor_power &pinctrl_sensor_reset>; I've acked your previous patch but maybe it should be named pinctrl_isi_pck1_as_mck to be clearer (you used the handle to pck1 below). > + resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>; > + pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>; > + /* use pck1 for the master clock of ov2640 */ > + clocks = <&pck1>; > + clock-names = "xvclk"; > + assigned-clocks = <&pck1>; > + assigned-clock-rates = <25000000>; > + > + port { > + ov2640_0: endpoint { > + remote-endpoint = <&isi_0>; > + bus-width = <8>; > + }; > + }; > + }; > + }; > + > usart1: serial@f0020000 { > dmas = <0>, <0>; /* Do not use DMA for usart1 */ > pinctrl-names = "default"; > @@ -60,6 +83,15 @@ > }; > > isi: isi@f0034000 { > + port { > + #address-cells = <1>; > + #size-cells = <0>; > + > + isi_0: endpoint { > + remote-endpoint = <&ov2640_0>; > + bus-width = <8>; > + }; > + }; > }; > > mmc1: mmc@f8000000 { > -- > 1.9.1 >
Hi, Alexandre Thanks for the review. On 12/20/2014 5:05 AM, Alexandre Belloni wrote: > On 18/12/2014 at 16:51:06 +0800, Josh Wu wrote : >> According to v4l2 dt document, we add: >> a camera host: ISI port. >> a i2c camera sensor: ov2640 port. >> to sama5d3xmb.dtsi. >> >> In the ov2640 node, it defines the pinctrls, clocks and isi port. >> In the ISI node, it also reference to a ov2640 port. >> >> Signed-off-by: Josh Wu <josh.wu@atmel.com> >> --- >> arch/arm/boot/dts/sama5d3xmb.dtsi | 32 ++++++++++++++++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi >> index 0aaebc6..958a528 100644 >> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi >> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi >> @@ -52,6 +52,29 @@ >> }; >> }; >> >> + i2c1: i2c@f0018000 { >> + ov2640: camera@0x30 { >> + compatible = "ovti,ov2640"; >> + reg = <0x30>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_isi_pck_as_mck &pinctrl_sensor_power &pinctrl_sensor_reset>; > I've acked your previous patch but maybe it should be named > pinctrl_isi_pck1_as_mck to be clearer (you used the handle to pck1 > below). It's a good idea. Maybe I prefer to use the name: pinctrl_pck1_as_isi_mck ? If you are ok with this name, in next version, I will add one more patch in the series to do this. And I will keep your acked-by in my previous patch. Best Regards, Josh Wu > >> + resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>; >> + pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>; >> + /* use pck1 for the master clock of ov2640 */ >> + clocks = <&pck1>; >> + clock-names = "xvclk"; >> + assigned-clocks = <&pck1>; >> + assigned-clock-rates = <25000000>; >> + >> + port { >> + ov2640_0: endpoint { >> + remote-endpoint = <&isi_0>; >> + bus-width = <8>; >> + }; >> + }; >> + }; >> + }; >> + >> usart1: serial@f0020000 { >> dmas = <0>, <0>; /* Do not use DMA for usart1 */ >> pinctrl-names = "default"; >> @@ -60,6 +83,15 @@ >> }; >> >> isi: isi@f0034000 { >> + port { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + isi_0: endpoint { >> + remote-endpoint = <&ov2640_0>; >> + bus-width = <8>; >> + }; >> + }; >> }; >> >> mmc1: mmc@f8000000 { >> -- >> 1.9.1 >> -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Hi Josh, On 22/12/2014 at 15:06:07 +0800, Josh Wu wrote : > >I've acked your previous patch but maybe it should be named > >pinctrl_isi_pck1_as_mck to be clearer (you used the handle to pck1 > >below). > It's a good idea. Maybe I prefer to use the name: pinctrl_pck1_as_isi_mck ? > If you are ok with this name, in next version, I will add one more patch in > the series to do this. > And I will keep your acked-by in my previous patch. > Sounds good to me!
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi index 0aaebc6..958a528 100644 --- a/arch/arm/boot/dts/sama5d3xmb.dtsi +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi @@ -52,6 +52,29 @@ }; }; + i2c1: i2c@f0018000 { + ov2640: camera@0x30 { + compatible = "ovti,ov2640"; + reg = <0x30>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_isi_pck_as_mck &pinctrl_sensor_power &pinctrl_sensor_reset>; + resetb-gpios = <&pioE 24 GPIO_ACTIVE_LOW>; + pwdn-gpios = <&pioE 29 GPIO_ACTIVE_HIGH>; + /* use pck1 for the master clock of ov2640 */ + clocks = <&pck1>; + clock-names = "xvclk"; + assigned-clocks = <&pck1>; + assigned-clock-rates = <25000000>; + + port { + ov2640_0: endpoint { + remote-endpoint = <&isi_0>; + bus-width = <8>; + }; + }; + }; + }; + usart1: serial@f0020000 { dmas = <0>, <0>; /* Do not use DMA for usart1 */ pinctrl-names = "default"; @@ -60,6 +83,15 @@ }; isi: isi@f0034000 { + port { + #address-cells = <1>; + #size-cells = <0>; + + isi_0: endpoint { + remote-endpoint = <&ov2640_0>; + bus-width = <8>; + }; + }; }; mmc1: mmc@f8000000 {