[PATCH 0/4] ARM: at91: at91sam9x5: enable ISI and ov2640 support

[PATCH 0/4] ARM: at91: at91sam9x5: enable ISI and ov2640 support

[Josh Wu]

This patch series will enable ISI and ov2640 sensor support for
at91sam9g25ek board.


Josh Wu (4):
  ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node,
    pinctrls
  ARM: at91: at91sam9x5ek/dts: add ov2640 support
  ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
  ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support

 arch/arm/boot/dts/at91sam9g25.dtsi    |  1 +
 arch/arm/boot/dts/at91sam9g25ek.dts   | 18 +++++++++++++
 arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +++++++++++++++++++++++++++++++++
 arch/arm/boot/dts/at91sam9x5ek.dtsi   | 48 +++++++++++++++++++++++++++++++++++
 arch/arm/configs/at91_dt_defconfig    |  6 +++++
 5 files changed, 119 insertions(+)

-- 
1.9.1

[PATCH 1/4] ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node, pinctrls

[Josh Wu]

Add a new file: at91sam9x5_isi.dtsi, which includes ISI node and
pinctrls.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---

 arch/arm/boot/dts/at91sam9g25.dtsi    |  1 +
 arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9g25.dtsi b/arch/arm/boot/dts/at91sam9g25.dtsi
index 17b8799..a7da0dd 100644
--- a/arch/arm/boot/dts/at91sam9g25.dtsi
+++ b/arch/arm/boot/dts/at91sam9g25.dtsi
@@ -7,6 +7,7 @@
  */
 
 #include "at91sam9x5.dtsi"
+#include "at91sam9x5_isi.dtsi"
 #include "at91sam9x5_usart3.dtsi"
 #include "at91sam9x5_macb0.dtsi"
 
diff --git a/arch/arm/boot/dts/at91sam9x5_isi.dtsi b/arch/arm/boot/dts/at91sam9x5_isi.dtsi
index 98bc877..be6be94 100644
--- a/arch/arm/boot/dts/at91sam9x5_isi.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5_isi.dtsi
@@ -13,6 +13,37 @@
 / {
 	ahb {
 		apb {
+			pinctrl at fffff400 {
+				isi {
+					pinctrl_isi_data_0_7: isi-0-data-0-7 {
+						atmel,pins =
+							<AT91_PIOC 0 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC0 periph B ISI_D0, conflicts with LCDDAT0 */
+							AT91_PIOC 1 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC1 periph B ISI_D1, conflicts with LCDDAT1 */
+							AT91_PIOC 2 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC2 periph B ISI_D2, conflicts with LCDDAT2 */
+							AT91_PIOC 3 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC3 periph B ISI_D3, conflicts with LCDDAT3 */
+							AT91_PIOC 4 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC4 periph B ISI_D4, conflicts with LCDDAT4 */
+							AT91_PIOC 5 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC5 periph B ISI_D5, conflicts with LCDDAT5 */
+							AT91_PIOC 6 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC6 periph B ISI_D6, conflicts with LCDDAT6 */
+							AT91_PIOC 7 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC7 periph B ISI_D7, conflicts with LCDDAT7 */
+							AT91_PIOC 12 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC12 periph B ISI_PCK, conflicts with LCDDAT12 */
+							AT91_PIOC 14 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC14 periph B ISI_HSYNC, conflicts with LCDDAT14 */
+							AT91_PIOC 13 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC13 periph B ISI_VSYNC, conflicts with LCDDAT13 */
+					};
+
+					pinctrl_isi_data_8_9: isi-0-data-8-9 {
+						atmel,pins =
+							<AT91_PIOC 8 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC8 periph B ISI_D8, conflicts with LCDDAT8 */
+							AT91_PIOC 9 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC9 periph B ISI_D9, conflicts with LCDDAT9 */
+					};
+
+					pinctrl_isi_data_10_11: isi-0-data-10-11 {
+						atmel,pins =
+							<AT91_PIOC 10 AT91_PERIPH_B AT91_PINCTRL_NONE	/* PC10 periph B ISI_D10, conflicts with LCDDAT10 */
+							AT91_PIOC 11 AT91_PERIPH_B AT91_PINCTRL_NONE>;	/* PC11 periph B ISI_D11, conflicts with LCDDAT11 */
+					};
+				};
+			};
+
 			pmc: pmc at fffffc00 {
 				periphck {
 					isi_clk: isi_clk {
@@ -22,5 +53,20 @@
 				};
 			};
 		};
+
+		isi: isi at f8048000 {
+			compatible = "atmel,at91sam9g45-isi";
+			reg = <0xf8048000 0x4000>;
+			interrupts = <25 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>;
+			};
+		};
 	};
 };
-- 
1.9.1

[PATCH 2/4] ARM: at91: at91sam9x5ek/dts: add ov2640 support

[Josh Wu]

Add the camera sensor ov2640 dt support. And connect sensor to isi node
as well.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---

 arch/arm/boot/dts/at91sam9x5ek.dtsi | 48 +++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index bd16bd3..b633b0f 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -66,9 +66,47 @@
 					compatible = "wm8731";
 					reg = <0x1a>;
 				};
+
+				ov2640: camera at 0x30 {
+					compatible = "ovti,ov2640";
+					reg = <0x30>;
+					pinctrl-names = "default";
+					pinctrl-0 = <&pinctrl_pck0_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>;
+					resetb-gpios = <&pioA 7 GPIO_ACTIVE_LOW>;
+					pwdn-gpios = <&pioA 13 GPIO_ACTIVE_HIGH>;
+					clocks = <&pck0>;
+					clock-names = "xvclk";
+					assigned-clocks = <&pck0>;
+					assigned-clock-rates = <25000000>;
+					status = "disabled";
+
+					port {
+						ov2640_0: endpoint {
+							remote-endpoint = <&isi_0>;
+							bus-width = <8>;
+						};
+					};
+				};
 			};
 
 			pinctrl at fffff400 {
+				camera_sensor {
+					pinctrl_pck0_as_isi_mck: pck0_as_isi_mck-0 {
+						atmel,pins =
+							<AT91_PIOC 15 AT91_PERIPH_C AT91_PINCTRL_NONE>;			/* PC15 periph C ISI_MCK */
+					};
+
+					pinctrl_sensor_reset: sensor_reset-0 {
+						atmel,pins =
+							<AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;		/* PA7 gpio */
+					};
+
+					pinctrl_sensor_power: sensor_power-0 {
+						atmel,pins =
+							<AT91_PIOA 13 AT91_PERIPH_GPIO AT91_PINCTRL_NONE>;		/* PA13 gpio */
+					};
+				};
+
 				mmc0 {
 					pinctrl_board_mmc0: mmc0-board {
 						atmel,pins =
@@ -122,6 +160,16 @@
 		usb1: ehci at 00700000 {
 			status = "okay";
 		};
+
+		isi: isi at f8048000 {
+			status = "disabled";
+			port {
+				isi_0: endpoint at 0 {
+					remote-endpoint = <&ov2640_0>;
+					bus-width = <8>;
+				};
+			};
+		};
 	};
 
 	sound {
-- 
1.9.1

[PATCH 3/4] ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640

[Josh Wu]

Enable ISI and ov2640 for at91sam9g25ek board.
Meantime, we need to disable the mmc1 and spi0 as they have pin conflict
with ISI.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---

 arch/arm/boot/dts/at91sam9g25ek.dts | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts
index 1e4c49c..9808990 100644
--- a/arch/arm/boot/dts/at91sam9g25ek.dts
+++ b/arch/arm/boot/dts/at91sam9g25ek.dts
@@ -16,10 +16,28 @@
 
 	ahb {
 		apb {
+			spi0: spi at f0000000 {
+				status = "disabled";
+			};
+
+			mmc1: mmc at f000c000 {
+				status = "disabled";
+			};
+
+			i2c0: i2c at f8010000 {
+				ov2640: camera at 0x30 {
+					status = "okay";
+				};
+			};
+
 			macb0: ethernet at f802c000 {
 				phy-mode = "rmii";
 				status = "okay";
 			};
 		};
+
+		isi: isi at f8048000 {
+			status = "okay";
+		};
 	};
 };
-- 
1.9.1

[PATCH 4/4] ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support

[Josh Wu]

Add ISI and ov2640 support in at91_dt_defconfig file.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---

 arch/arm/configs/at91_dt_defconfig | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index a67375f..de4e1a5 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -135,6 +135,12 @@ CONFIG_POWER_RESET=y
 CONFIG_WATCHDOG=y
 CONFIG_AT91SAM9X_WATCHDOG=y
 CONFIG_SSB=m
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_ATMEL_ISI=y
+CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_FB=y
 CONFIG_FB_ATMEL=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
-- 
1.9.1

[PATCH 0/4] ARM: at91: at91sam9x5: enable ISI and ov2640 support

[Boris Brezillon]

On Thu, 12 Feb 2015 16:06:22 +0800
Josh Wu <josh.wu@atmel.com> wrote:

> This patch series will enable ISI and ov2640 sensor support for
> at91sam9g25ek board.

This series looks good to me.

Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

> 
> 
> Josh Wu (4):
>   ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node,
>     pinctrls
>   ARM: at91: at91sam9x5ek/dts: add ov2640 support
>   ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
>   ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
> 
>  arch/arm/boot/dts/at91sam9g25.dtsi    |  1 +
>  arch/arm/boot/dts/at91sam9g25ek.dts   | 18 +++++++++++++
>  arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +++++++++++++++++++++++++++++++++
>  arch/arm/boot/dts/at91sam9x5ek.dtsi   | 48 +++++++++++++++++++++++++++++++++++
>  arch/arm/configs/at91_dt_defconfig    |  6 +++++
>  5 files changed, 119 insertions(+)
> 



-- 
Boris Brezillon, Free Electrons
Embedded Linux and Kernel engineering
http://free-electrons.com

[PATCH 0/4] ARM: at91: at91sam9x5: enable ISI and ov2640 support

[Nicolas Ferre]

Le 12/02/2015 10:08, Boris Brezillon a ?crit :
> On Thu, 12 Feb 2015 16:06:22 +0800
> Josh Wu <josh.wu@atmel.com> wrote:
> 
>> This patch series will enable ISI and ov2640 sensor support for
>> at91sam9g25ek board.
> 
> This series looks good to me.
> 
> Acked-by: Boris Brezillon <boris.brezillon@free-electrons.com>

Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>


3 first patches stacked on top of at91-4.1-dt. Last one on
at91-4.1-defconfig.

Thank, bye.


>> Josh Wu (4):
>>   ARM: at91: at91sam9x5/dts: add ISI dt support, include isi node,
>>     pinctrls
>>   ARM: at91: at91sam9x5ek/dts: add ov2640 support
>>   ARM: at91: at91sam9g25ek/dts: enable ISI and ov2640
>>   ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
>>
>>  arch/arm/boot/dts/at91sam9g25.dtsi    |  1 +
>>  arch/arm/boot/dts/at91sam9g25ek.dts   | 18 +++++++++++++
>>  arch/arm/boot/dts/at91sam9x5_isi.dtsi | 46 +++++++++++++++++++++++++++++++++
>>  arch/arm/boot/dts/at91sam9x5ek.dtsi   | 48 +++++++++++++++++++++++++++++++++++
>>  arch/arm/configs/at91_dt_defconfig    |  6 +++++
>>  5 files changed, 119 insertions(+)
>>
> 
> 
> 


-- 
Nicolas Ferre