[PATCH 0/7] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor

[PATCH 0/7] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor

[Josh Wu]

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.

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 (4):
  ARM: at91: dts: sama5d3: add isi clock
  ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
  ARM: at91: dts: sama5d3: add ov2640 camera sensor support
  ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig

 arch/arm/boot/dts/sama5d3.dtsi    | 20 +++++++++++++-----
 arch/arm/boot/dts/sama5d3xmb.dtsi | 43 +++++++++++++++++++++++++++++++++++----
 arch/arm/configs/sama5_defconfig  |  6 ++++++
 3 files changed, 60 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH 0/7] ARM: at91: dts: sama5d3: add dt support for atmel isi and ov2640 sensor

[Josh Wu]

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.

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 (4):
  ARM: at91: dts: sama5d3: add isi clock
  ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}
  ARM: at91: dts: sama5d3: add ov2640 camera sensor support
  ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig

 arch/arm/boot/dts/sama5d3.dtsi    | 20 +++++++++++++-----
 arch/arm/boot/dts/sama5d3xmb.dtsi | 43 +++++++++++++++++++++++++++++++++++----
 arch/arm/configs/sama5_defconfig  |  6 ++++++
 3 files changed, 60 insertions(+), 9 deletions(-)

-- 
1.9.1

[PATCH 1/7] ARM: at91: dts: sama5d3: add isi clock

[Josh Wu]

Add ISI peripheral clock in sama5d3.dtsi.

Signed-off-by: Josh Wu <josh.wu@atmel.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

[PATCH 1/7] ARM: at91: dts: sama5d3: add isi clock

[Josh Wu]

Add ISI peripheral clock in sama5d3.dtsi.

Signed-off-by: Josh Wu <josh.wu@atmel.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

[PATCH 2/7] ARM: at91: dts: sama5d3: split isi pinctrl

[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>
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

[PATCH 2/7] ARM: at91: dts: sama5d3: split isi pinctrl

[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>
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

[PATCH 3/7] ARM: at91: dts: sama5d3: add missing pins of isi

[Josh Wu]

From: Bo Shen <voice.shen@atmel.com>

The ISI has 12 data lines, add the missing two data lines.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 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

[PATCH 3/7] ARM: at91: dts: sama5d3: add missing pins of isi

[Josh Wu]

From: Bo Shen <voice.shen@atmel.com>

The ISI has 12 data lines, add the missing two data lines.

Signed-off-by: Bo Shen <voice.shen@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 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

[PATCH 4/7] ARM: at91: dts: sama5d3: move the isi mck pin to mb

[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>
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

[PATCH 4/7] ARM: at91: dts: sama5d3: move the isi mck pin to mb

[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>
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

[PATCH 5/7] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}

[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}.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 arch/arm/boot/dts/sama5d3.dtsi    | 2 ++
 arch/arm/boot/dts/sama5d3xmb.dtsi | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index ed734e9..ff0fa3a 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>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_isi_data_0_7>;
 				clocks = <&isi_clk>;
 				clock-names = "isi_clk";
 				status = "disabled";
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 6af1cba..0aaebc6 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -60,8 +60,6 @@
 			};
 
 			isi: isi@f0034000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
 			};
 
 			mmc1: mmc@f8000000 {
@@ -122,12 +120,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

[PATCH 5/7] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}

[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}.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
 arch/arm/boot/dts/sama5d3.dtsi    | 2 ++
 arch/arm/boot/dts/sama5d3xmb.dtsi | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index ed734e9..ff0fa3a 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>;
+				pinctrl-names = "default";
+				pinctrl-0 = <&pinctrl_isi_data_0_7>;
 				clocks = <&isi_clk>;
 				clock-names = "isi_clk";
 				status = "disabled";
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 6af1cba..0aaebc6 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -60,8 +60,6 @@
 			};
 
 			isi: isi@f0034000 {
-				pinctrl-names = "default";
-				pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
 			};
 
 			mmc1: mmc@f8000000 {
@@ -122,12 +120,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

[PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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>;
+
+					isi_0: endpoint {
+						remote-endpoint = <&ov2640_0>;
+						bus-width = <8>;
+					};
+				};
 			};
 
 			mmc1: mmc@f8000000 {
-- 
1.9.1

[PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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>;
+
+					isi_0: endpoint {
+						remote-endpoint = <&ov2640_0>;
+						bus-width = <8>;
+					};
+				};
 			};
 
 			mmc1: mmc@f8000000 {
-- 
1.9.1

[PATCH 7/7] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig

[Josh Wu]

Signed-off-by: Josh Wu <josh.wu@atmel.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

[PATCH 7/7] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig

[Josh Wu]

Signed-off-by: Josh Wu <josh.wu@atmel.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

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Laurent Pinchart]

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 {

-- 
Regards,

Laurent Pinchart

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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 {

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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 {

Re: [PATCH 5/7] ARM: at91: dts: sama5d3: change name of pinctrl_isi_{power,reset}

[Alexandre Belloni]

Hi Josh,

On 18/12/2014 at 16:51:05 +0800, Josh Wu wrote :
> 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}.
> 
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>  arch/arm/boot/dts/sama5d3.dtsi    | 2 ++
>  arch/arm/boot/dts/sama5d3xmb.dtsi | 6 ++----
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
> index ed734e9..ff0fa3a 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>;
> +				pinctrl-names = "default";
> +				pinctrl-0 = <&pinctrl_isi_data_0_7>;

This should probably not be is that patch.

>  				clocks = <&isi_clk>;
>  				clock-names = "isi_clk";
>  				status = "disabled";
> diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
> index 6af1cba..0aaebc6 100644
> --- a/arch/arm/boot/dts/sama5d3xmb.dtsi
> +++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
> @@ -60,8 +60,6 @@
>  			};
>  
>  			isi: isi@f0034000 {
> -				pinctrl-names = "default";
> -				pinctrl-0 = <&pinctrl_isi_data_0_7 &pinctrl_isi_pck_as_mck &pinctrl_isi_power &pinctrl_isi_reset>;
>  			};
>  
>  			mmc1: mmc@f8000000 {
> @@ -122,12 +120,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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 1/7] ARM: at91: dts: sama5d3: add isi clock

[Alexandre Belloni]

On 18/12/2014 at 16:51:01 +0800, Josh Wu wrote :
> 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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 2/7] ARM: at91: dts: sama5d3: split isi pinctrl

[Alexandre Belloni]

On 18/12/2014 at 16:51:02 +0800, Josh Wu wrote :
> 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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 3/7] ARM: at91: dts: sama5d3: add missing pins of isi

[Alexandre Belloni]

On 18/12/2014 at 16:51:03 +0800, Josh Wu wrote :
> From: Bo Shen <voice.shen@atmel.com>
> 
> The ISI has 12 data lines, add the missing two data lines.
> 
> 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>

> ---
>  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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 4/7] ARM: at91: dts: sama5d3: move the isi mck pin to mb

[Alexandre Belloni]

On 18/12/2014 at 16:51:04 +0800, Josh Wu wrote :
> 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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Alexandre Belloni]

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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 7/7] ARM: at91: sama5: enable atmel-isi and ov2640 in defconfig

[Alexandre Belloni]

On 18/12/2014 at 16:51:07 +0800, Josh Wu wrote :
> 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
> 

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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
>>

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Josh Wu]

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
>>

Re: [PATCH 6/7] ARM: at91: dts: sama5d3: add ov2640 camera sensor support

[Alexandre Belloni]

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!

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com