* [PATCH v2 1/8] ARM: at91: dts: sama5d3: add isi clock
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
@ 2015-01-04 9:02 ` Josh Wu
2015-01-04 9:02 ` [PATCH v2 2/8] ARM: at91: dts: sama5d3: split isi pinctrl Josh Wu
` (6 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski, Josh Wu
Add ISI peripheral clock in sama5d3.dtsi.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/boot/dts/sama5d3.dtsi | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 5f4144d..61746ef 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -214,6 +214,8 @@
compatible = "atmel,at91sam9g45-isi";
reg = <0xf0034000 0x4000>;
interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
+ clocks = <&isi_clk>;
+ clock-names = "isi_clk";
status = "disabled";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 2/8] ARM: at91: dts: sama5d3: split isi pinctrl
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
2015-01-04 9:02 ` [PATCH v2 1/8] ARM: at91: dts: sama5d3: add isi clock Josh Wu
@ 2015-01-04 9:02 ` Josh Wu
[not found] ` <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
` (5 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski, Josh Wu
From: Bo Shen <voice.shen@atmel.com>
As the ISI has 12 data lines, however we only use 8 data lines with
sensor module. So, split the data line into two groups which make
it can be choosed depends on the hardware design.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/boot/dts/sama5d3.dtsi | 11 ++++++++---
arch/arm/boot/dts/sama5d3xmb.dtsi | 2 +-
2 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 61746ef..595609f 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -547,7 +547,7 @@
};
isi {
- pinctrl_isi: isi-0 {
+ pinctrl_isi_data_0_7: isi-0-data-0-7 {
atmel,pins =
<AT91_PIOA 16 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA16 periph C ISI_D0, conflicts with LCDDAT16 */
AT91_PIOA 17 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA17 periph C ISI_D1, conflicts with LCDDAT17 */
@@ -559,10 +559,15 @@
AT91_PIOA 23 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA23 periph C ISI_D7, conflicts with LCDDAT23, PWML1 */
AT91_PIOC 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC30 periph C ISI_PCK, conflicts with UTXD0 */
AT91_PIOA 31 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA31 periph C ISI_HSYNC, conflicts with TWCK0, UTXD1 */
- AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
- AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
+ AT91_PIOA 30 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PA30 periph C ISI_VSYNC, conflicts with TWD0, URXD1 */
+ };
+
+ pinctrl_isi_data_8_9: isi-0-data-8-9 {
+ atmel,pins =
+ <AT91_PIOC 29 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC29 periph C ISI_PD8, conflicts with URXD0, PWMFI2 */
AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
};
+
pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
atmel,pins =
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 49c10d3..2530541 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -61,7 +61,7 @@
isi: isi@f0034000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
+ pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
};
mmc1: mmc@f8000000 {
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
[parent not found: <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>]
* [PATCH v2 3/8] ARM: at91: dts: sama5d3: add missing pins of isi
[not found] ` <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
@ 2015-01-04 9:02 ` Josh Wu
2015-01-14 2:41 ` [PATCH v2 7/8] ARM: at91: dts: sama5d3: add ov2640 camera sensor support Josh Wu
1 sibling, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA,
nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w
Cc: grant.likely-QSEj5FYQhm4dnm+yROfE0A, galak-sgV2jX0FEOL9JmXXK+q4OQ,
rob-VoJi6FS/r0vR7s880joybQ, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg, pawel.moll-5wv7dgnIgG8,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
voice.shen-AIFe0yeh4nAAvxtiuMwx3w,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
plagnioj-sclMFOaUSTBWk0Htik3J/w,
boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
linux-media-u79uwXL29TY76Z2rM5mHXA, g.liakhovetski-Mmb7MZpHnFY
From: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
The ISI has 12 data lines, add the missing two data lines.
Signed-off-by: Bo Shen <voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
Acked-by: Nicolas Ferre <nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
Acked-by: Alexandre Belloni <alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>
---
arch/arm/boot/dts/sama5d3.dtsi | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 595609f..b3ac156 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -568,6 +568,12 @@
AT91_PIOC 28 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC28 periph C ISI_PD9, conflicts with SPI1_NPCS3, PWMFI0 */
};
+ pinctrl_isi_data_10_11: isi-0-data-10-11 {
+ atmel,pins =
+ <AT91_PIOC 27 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC27 periph C ISI_PD10, conflicts with SPI1_NPCS2, TWCK1 */
+ AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC26 periph C ISI_PD11, conflicts with SPI1_NPCS1, TWD1 */
+ };
+
pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
atmel,pins =
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 7/8] ARM: at91: dts: sama5d3: add ov2640 camera sensor support
[not found] ` <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2015-01-04 9:02 ` [PATCH v2 3/8] ARM: at91: dts: sama5d3: add missing pins of isi Josh Wu
@ 2015-01-14 2:41 ` Josh Wu
2015-01-14 2:41 ` [PATCH v2 8/8] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig Josh Wu
1 sibling, 1 reply; 13+ messages in thread
From: Josh Wu @ 2015-01-14 2:41 UTC (permalink / raw)
To: devicetree-u79uwXL29TY76Z2rM5mHXA,
nicolas.ferre-AIFe0yeh4nAAvxtiuMwx3w
Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
grant.likely-QSEj5FYQhm4dnm+yROfE0A, galak-sgV2jX0FEOL9JmXXK+q4OQ,
rob-VoJi6FS/r0vR7s880joybQ, robh+dt-DgEjT+Ai2ygdnm+yROfE0A,
ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg, pawel.moll-5wv7dgnIgG8,
voice.shen-AIFe0yeh4nAAvxtiuMwx3w, g.liakhovetski-Mmb7MZpHnFY,
laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw,
linux-media-u79uwXL29TY76Z2rM5mHXA,
plagnioj-sclMFOaUSTBWk0Htik3J/w,
alexandre.belloni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8,
boris.brezillon-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8, Josh Wu
According to v4l2 dt document, we add:
a camera host: ISI port.
a i2c camera sensor: ov2640 port.
to sama5d3xmb.dtsi.
The ov2640 node defines the pinctrls, clocks and refer to isi port.
The ISI node also has a reference to the ov2640 port.
Signed-off-by: Josh Wu <josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
---
v1 -> v2:
1. move the chip common part of ISI DT node to sama5d3.dtsi.
2. the pck1 pinctrl name is changed.
arch/arm/boot/dts/sama5d3.dtsi | 6 ++++++
arch/arm/boot/dts/sama5d3xmb.dtsi | 31 +++++++++++++++++++++++++++++--
2 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index ed734e9..af61d55 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -214,9 +214,15 @@
compatible = "atmel,at91sam9g45-isi";
reg = <0xf0034000 0x4000>;
interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_isi_data_0_7>;
clocks = <&isi_clk>;
clock-names = "isi_clk";
status = "disabled";
+ port {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
};
mmc1: mmc@f8000000 {
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index d9464fc..9fdb8a0 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_pck1_as_isi_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,8 +83,12 @@
};
isi: isi@f0034000 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi_data_0_7>;
+ port {
+ 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 devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 8/8] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
2015-01-14 2:41 ` [PATCH v2 7/8] ARM: at91: dts: sama5d3: add ov2640 camera sensor support Josh Wu
@ 2015-01-14 2:41 ` Josh Wu
0 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-14 2:41 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: linux-arm-kernel, grant.likely, galak, rob, robh+dt,
ijc+devicetree, pawel.moll, voice.shen, g.liakhovetski,
laurent.pinchart, linux-media, plagnioj, alexandre.belloni,
boris.brezillon, Josh Wu
Signed-off-by: Josh Wu <josh.wu@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
---
arch/arm/configs/sama5_defconfig | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/arch/arm/configs/sama5_defconfig b/arch/arm/configs/sama5_defconfig
index b58fb32..92f1d71 100644
--- a/arch/arm/configs/sama5_defconfig
+++ b/arch/arm/configs/sama5_defconfig
@@ -139,6 +139,12 @@ CONFIG_POWER_RESET=y
CONFIG_SSB=m
CONFIG_REGULATOR=y
CONFIG_REGULATOR_ACT8865=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_SOC_CAMERA_OV2640=y
+CONFIG_VIDEO_ATMEL_ISI=y
CONFIG_FB=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
# CONFIG_LCD_CLASS_DEVICE is not set
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 4/8] ARM: at91: dts: sama5d3: move the isi mck pin to mb
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
` (2 preceding siblings ...)
[not found] ` <1420362153-500-1-git-send-email-josh.wu-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
@ 2015-01-04 9:02 ` Josh Wu
2015-01-04 9:02 ` [PATCH v2 5/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset} Josh Wu
` (3 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski, Josh Wu
From: Bo Shen <voice.shen@atmel.com>
The mck is decided by the board design, move it to mb related
dtsi file.
Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
arch/arm/boot/dts/sama5d3.dtsi | 5 -----
arch/arm/boot/dts/sama5d3xmb.dtsi | 5 +++++
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index b3ac156..ed734e9 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -573,11 +573,6 @@
<AT91_PIOC 27 AT91_PERIPH_C AT91_PINCTRL_NONE /* PC27 periph C ISI_PD10, conflicts with SPI1_NPCS2, TWCK1 */
AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC26 periph C ISI_PD11, conflicts with SPI1_NPCS1, TWD1 */
};
-
- pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
- atmel,pins =
- <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
- };
};
mmc0 {
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 2530541..6af1cba 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -117,6 +117,11 @@
<AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
};
+ pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
+ atmel,pins =
+ <AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
+ };
+
pinctrl_isi_reset: isi_reset-0 {
atmel,pins =
<AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE24 gpio */
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 5/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
` (3 preceding siblings ...)
2015-01-04 9:02 ` [PATCH v2 4/8] ARM: at91: dts: sama5d3: move the isi mck pin to mb Josh Wu
@ 2015-01-04 9:02 ` Josh Wu
2015-01-04 9:02 ` [PATCH v2 6/8] ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK Josh Wu
` (2 subsequent siblings)
7 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski, Josh Wu
For sama5d3xmb board, the pins: pinctrl_isi_{power,reset} is used to
power-down or reset camera sensor.
So we should let camera sensor instead of ISI to configure the pins.
This patch will change pinctrl name from pinctrl_isi_{power,reset} to
pinctrl_sensor_{power,reset}. And remove these two pinctrl from ISI's
DT node. We will add these two pinctrl to sensor's DT node.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
v1 -> v2:
1. only do things that mentioned in commit message.
arch/arm/boot/dts/sama5d3xmb.dtsi | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 6af1cba..db47f8b 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -61,7 +61,7 @@
isi: isi@f0034000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
+ pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck>;
};
mmc1: mmc@f8000000 {
@@ -122,12 +122,12 @@
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
};
- pinctrl_isi_reset: isi_reset-0 {
+ pinctrl_sensor_reset: sensor_reset-0 {
atmel,pins =
<AT91_PIOE 24 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE24 gpio */
};
- pinctrl_isi_power: isi_power-0 {
+ pinctrl_sensor_power: sensor_power-0 {
atmel,pins =
<AT91_PIOE 29 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>; /* PE29 gpio */
};
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH v2 6/8] ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
` (4 preceding siblings ...)
2015-01-04 9:02 ` [PATCH v2 5/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset} Josh Wu
@ 2015-01-04 9:02 ` Josh Wu
2015-01-13 15:05 ` [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Nicolas Ferre
2015-01-15 15:16 ` Nicolas Ferre
7 siblings, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-04 9:02 UTC (permalink / raw)
To: devicetree, nicolas.ferre
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski, Josh Wu
For sama5d3xmb board, the pins: pinctrl_isi_pck_as_mck is pck1, and
used to provide MCK for camera sensor.
We change its name to: pinctrl_pck1_as_isi_mck.
As we want camera sensor instead of ISI to configure the pck1 (ISI_MCK) pin.
So we remove this pinctrl from ISI DT node. It will be added in sensor's
DT node.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
new added in v2.
arch/arm/boot/dts/sama5d3xmb.dtsi | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index db47f8b..d9464fc 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -61,7 +61,7 @@
isi: isi@f0034000 {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck>;
+ pinctrl-0 = <&pinctrl_isi_data_0_7>;
};
mmc1: mmc@f8000000 {
@@ -117,7 +117,7 @@
<AT91_PIOD 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD30 periph B */
};
- pinctrl_isi_pck_as_mck: isi_pck_as_mck-0 {
+ pinctrl_pck1_as_isi_mck: pck1_as_isi_mck-0 {
atmel,pins =
<AT91_PIOD 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PD31 periph B ISI_MCK */
};
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
` (5 preceding siblings ...)
2015-01-04 9:02 ` [PATCH v2 6/8] ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK Josh Wu
@ 2015-01-13 15:05 ` Nicolas Ferre
2015-01-14 2:48 ` Josh Wu
2015-01-14 8:30 ` Alexandre Belloni
2015-01-15 15:16 ` Nicolas Ferre
7 siblings, 2 replies; 13+ messages in thread
From: Nicolas Ferre @ 2015-01-13 15:05 UTC (permalink / raw)
To: Josh Wu, devicetree
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski
Le 04/01/2015 10:02, Josh Wu a écrit :
> This patch series add ISI and ov2640 support on dts files.
>
> As the ov2640 driver dt is still in review. The patch is in: https://patchwork.linuxtv.org/patch/27554/
> So I want to send this dt patch early for a review.
>
> v1 -> v2:
> 1. add one more patch to change the pin name of ISI_MCK
> 2. rewrite the commit [4/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}.
> 3. move the common chip parts of ISI node to sama5d3.dtsi.
>
> Bo Shen (3):
> ARM: at91: dts: sama5d3: split isi pinctrl
> ARM: at91: dts: sama5d3: add missing pins of isi
> ARM: at91: dts: sama5d3: move the isi mck pin to mb
>
> Josh Wu (5):
> ARM: at91: dts: sama5d3: add isi clock
> ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
> ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
> ARM: at91: dts: sama5d3: add ov2640 camera sensor support
> ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
Josh,
It seems that this patch doesn't show up in the series: I only received
up to 6/8 patches (2 missing?). Can you please send it(them?)?
Bye,
> arch/arm/boot/dts/sama5d3.dtsi | 24 ++++++++++++++++++-----
> arch/arm/boot/dts/sama5d3xmb.dtsi | 40 +++++++++++++++++++++++++++++++++++----
> arch/arm/configs/sama5_defconfig | 6 ++++++
> 3 files changed, 61 insertions(+), 9 deletions(-)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor
2015-01-13 15:05 ` [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Nicolas Ferre
@ 2015-01-14 2:48 ` Josh Wu
2015-01-14 8:30 ` Alexandre Belloni
1 sibling, 0 replies; 13+ messages in thread
From: Josh Wu @ 2015-01-14 2:48 UTC (permalink / raw)
To: Nicolas Ferre, devicetree
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski
On 1/13/2015 11:05 PM, Nicolas Ferre wrote:
> Le 04/01/2015 10:02, Josh Wu a écrit :
>> This patch series add ISI and ov2640 support on dts files.
>>
>> As the ov2640 driver dt is still in review. The patch is in: https://patchwork.linuxtv.org/patch/27554/
>> So I want to send this dt patch early for a review.
>>
>> v1 -> v2:
>> 1. add one more patch to change the pin name of ISI_MCK
>> 2. rewrite the commit [4/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}.
>> 3. move the common chip parts of ISI node to sama5d3.dtsi.
>>
>> Bo Shen (3):
>> ARM: at91: dts: sama5d3: split isi pinctrl
>> ARM: at91: dts: sama5d3: add missing pins of isi
>> ARM: at91: dts: sama5d3: move the isi mck pin to mb
>>
>> Josh Wu (5):
>> ARM: at91: dts: sama5d3: add isi clock
>> ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
>> ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
>> ARM: at91: dts: sama5d3: add ov2640 camera sensor support
>> ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
> Josh,
>
> It seems that this patch doesn't show up in the series: I only received
> up to 6/8 patches (2 missing?). Can you please send it(them?)?
Thanks you, Nicolas. I am not aware that.
I just sent out the missing 7/8, 8/8 patches right now.
Best Regards,
Josh Wu
>
> Bye,
>
>> arch/arm/boot/dts/sama5d3.dtsi | 24 ++++++++++++++++++-----
>> arch/arm/boot/dts/sama5d3xmb.dtsi | 40 +++++++++++++++++++++++++++++++++++----
>> arch/arm/configs/sama5_defconfig | 6 ++++++
>> 3 files changed, 61 insertions(+), 9 deletions(-)
>>
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor
2015-01-13 15:05 ` [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Nicolas Ferre
2015-01-14 2:48 ` Josh Wu
@ 2015-01-14 8:30 ` Alexandre Belloni
1 sibling, 0 replies; 13+ messages in thread
From: Alexandre Belloni @ 2015-01-14 8:30 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Josh Wu, devicetree, grant.likely, galak, rob, robh+dt,
ijc+devicetree, pawel.moll, linux-arm-kernel, voice.shen,
laurent.pinchart, plagnioj, boris.brezillon, linux-media,
g.liakhovetski
Hi Nicolas,
BTW, you can add my ack on the remaining patches (5-7).
On 13/01/2015 at 16:05:57 +0100, Nicolas Ferre wrote :
> Le 04/01/2015 10:02, Josh Wu a écrit :
> > This patch series add ISI and ov2640 support on dts files.
> >
> > As the ov2640 driver dt is still in review. The patch is in: https://patchwork.linuxtv.org/patch/27554/
> > So I want to send this dt patch early for a review.
> >
> > v1 -> v2:
> > 1. add one more patch to change the pin name of ISI_MCK
> > 2. rewrite the commit [4/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}.
> > 3. move the common chip parts of ISI node to sama5d3.dtsi.
> >
> > Bo Shen (3):
> > ARM: at91: dts: sama5d3: split isi pinctrl
> > ARM: at91: dts: sama5d3: add missing pins of isi
> > ARM: at91: dts: sama5d3: move the isi mck pin to mb
> >
> > Josh Wu (5):
> > ARM: at91: dts: sama5d3: add isi clock
> > ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
> > ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
> > ARM: at91: dts: sama5d3: add ov2640 camera sensor support
> > ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
>
> Josh,
>
> It seems that this patch doesn't show up in the series: I only received
> up to 6/8 patches (2 missing?). Can you please send it(them?)?
>
> Bye,
>
> > arch/arm/boot/dts/sama5d3.dtsi | 24 ++++++++++++++++++-----
> > arch/arm/boot/dts/sama5d3xmb.dtsi | 40 +++++++++++++++++++++++++++++++++++----
> > arch/arm/configs/sama5_defconfig | 6 ++++++
> > 3 files changed, 61 insertions(+), 9 deletions(-)
> >
>
>
> --
> Nicolas Ferre
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor
2015-01-04 9:02 [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Josh Wu
` (6 preceding siblings ...)
2015-01-13 15:05 ` [PATCH v2 0/8] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor Nicolas Ferre
@ 2015-01-15 15:16 ` Nicolas Ferre
7 siblings, 0 replies; 13+ messages in thread
From: Nicolas Ferre @ 2015-01-15 15:16 UTC (permalink / raw)
To: Josh Wu, devicetree
Cc: grant.likely, galak, rob, robh+dt, ijc+devicetree, pawel.moll,
linux-arm-kernel, voice.shen, laurent.pinchart, alexandre.belloni,
plagnioj, boris.brezillon, linux-media, g.liakhovetski
Le 04/01/2015 10:02, Josh Wu a écrit :
> This patch series add ISI and ov2640 support on dts files.
>
> As the ov2640 driver dt is still in review. The patch is in: https://patchwork.linuxtv.org/patch/27554/
> So I want to send this dt patch early for a review.
>
> v1 -> v2:
> 1. add one more patch to change the pin name of ISI_MCK
> 2. rewrite the commit [4/8] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}.
> 3. move the common chip parts of ISI node to sama5d3.dtsi.
>
> Bo Shen (3):
> ARM: at91: dts: sama5d3: split isi pinctrl
> ARM: at91: dts: sama5d3: add missing pins of isi
> ARM: at91: dts: sama5d3: move the isi mck pin to mb
>
> Josh Wu (5):
> ARM: at91: dts: sama5d3: add isi clock
> ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
> ARM: at91: dts: sama5d3: change name of pinctrl of ISI_MCK
> ARM: at91: dts: sama5d3: add ov2640 camera sensor support
> ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig
The whole series:
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
stacked on top of at91-3.20-dt.
The defconfig update on his side on at91-3.20-defconfig
Bye,
> arch/arm/boot/dts/sama5d3.dtsi | 24 ++++++++++++++++++-----
> arch/arm/boot/dts/sama5d3xmb.dtsi | 40 +++++++++++++++++++++++++++++++++++----
> arch/arm/configs/sama5_defconfig | 6 ++++++
> 3 files changed, 61 insertions(+), 9 deletions(-)
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 13+ messages in thread