diff options
-rw-r--r-- | arch/arm/boot/dts/at91sam9g25ek.dts | 25 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5ek.dtsi | 33 |
2 files changed, 25 insertions, 33 deletions
diff --git a/arch/arm/boot/dts/at91sam9g25ek.dts b/arch/arm/boot/dts/at91sam9g25ek.dts index 707fd4ea58f5..30bfd2e12cae 100644 --- a/arch/arm/boot/dts/at91sam9g25ek.dts +++ b/arch/arm/boot/dts/at91sam9g25ek.dts | |||
@@ -26,7 +26,24 @@ | |||
26 | 26 | ||
27 | i2c0: i2c@f8010000 { | 27 | i2c0: i2c@f8010000 { |
28 | ov2640: camera@0x30 { | 28 | ov2640: camera@0x30 { |
29 | compatible = "ovti,ov2640"; | ||
30 | reg = <0x30>; | ||
31 | pinctrl-names = "default"; | ||
32 | pinctrl-0 = <&pinctrl_pck0_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>; | ||
33 | resetb-gpios = <&pioA 7 GPIO_ACTIVE_LOW>; | ||
34 | pwdn-gpios = <&pioA 13 GPIO_ACTIVE_HIGH>; | ||
35 | clocks = <&pck0>; | ||
36 | clock-names = "xvclk"; | ||
37 | assigned-clocks = <&pck0>; | ||
38 | assigned-clock-rates = <25000000>; | ||
29 | status = "okay"; | 39 | status = "okay"; |
40 | |||
41 | port { | ||
42 | ov2640_0: endpoint { | ||
43 | remote-endpoint = <&isi_0>; | ||
44 | bus-width = <8>; | ||
45 | }; | ||
46 | }; | ||
30 | }; | 47 | }; |
31 | }; | 48 | }; |
32 | 49 | ||
@@ -37,6 +54,14 @@ | |||
37 | 54 | ||
38 | isi: isi@f8048000 { | 55 | isi: isi@f8048000 { |
39 | status = "okay"; | 56 | status = "okay"; |
57 | port { | ||
58 | isi_0: endpoint@0 { | ||
59 | remote-endpoint = <&ov2640_0>; | ||
60 | bus-width = <8>; | ||
61 | vsync-active = <1>; | ||
62 | hsync-active = <1>; | ||
63 | }; | ||
64 | }; | ||
40 | }; | 65 | }; |
41 | }; | 66 | }; |
42 | }; | 67 | }; |
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi index 52425a4ca97e..696b8ba064a6 100644 --- a/arch/arm/boot/dts/at91sam9x5ek.dtsi +++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi | |||
@@ -60,18 +60,6 @@ | |||
60 | status = "okay"; | 60 | status = "okay"; |
61 | }; | 61 | }; |
62 | 62 | ||
63 | isi: isi@f8048000 { | ||
64 | status = "disabled"; | ||
65 | port { | ||
66 | isi_0: endpoint@0 { | ||
67 | remote-endpoint = <&ov2640_0>; | ||
68 | bus-width = <8>; | ||
69 | vsync-active = <1>; | ||
70 | hsync-active = <1>; | ||
71 | }; | ||
72 | }; | ||
73 | }; | ||
74 | |||
75 | i2c0: i2c@f8010000 { | 63 | i2c0: i2c@f8010000 { |
76 | status = "okay"; | 64 | status = "okay"; |
77 | 65 | ||
@@ -79,27 +67,6 @@ | |||
79 | compatible = "wm8731"; | 67 | compatible = "wm8731"; |
80 | reg = <0x1a>; | 68 | reg = <0x1a>; |
81 | }; | 69 | }; |
82 | |||
83 | ov2640: camera@0x30 { | ||
84 | compatible = "ovti,ov2640"; | ||
85 | reg = <0x30>; | ||
86 | pinctrl-names = "default"; | ||
87 | pinctrl-0 = <&pinctrl_pck0_as_isi_mck &pinctrl_sensor_power &pinctrl_sensor_reset>; | ||
88 | resetb-gpios = <&pioA 7 GPIO_ACTIVE_LOW>; | ||
89 | pwdn-gpios = <&pioA 13 GPIO_ACTIVE_HIGH>; | ||
90 | clocks = <&pck0>; | ||
91 | clock-names = "xvclk"; | ||
92 | assigned-clocks = <&pck0>; | ||
93 | assigned-clock-rates = <25000000>; | ||
94 | status = "disabled"; | ||
95 | |||
96 | port { | ||
97 | ov2640_0: endpoint { | ||
98 | remote-endpoint = <&isi_0>; | ||
99 | bus-width = <8>; | ||
100 | }; | ||
101 | }; | ||
102 | }; | ||
103 | }; | 70 | }; |
104 | 71 | ||
105 | adc0: adc@f804c000 { | 72 | adc0: adc@f804c000 { |