* [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes
@ 2015-03-18 23:50 Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 1/3] dt: bindings: Add bindings for omap3isp Sakari Ailus
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Sakari Ailus @ 2015-03-18 23:50 UTC (permalink / raw)
To: linux-omap; +Cc: tony, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
Hi folks,
Since v1, I've rebased the set on Tero Kristo's PRCM / SCM cleanup patchset
here:
<URL:http://www.spinics.net/lists/linux-omap/msg116949.html>
v1 can be found here:
<URL:http://www.spinics.net/lists/linux-omap/msg116753.html>
Changes since v1:
- Fixed phy reference (number to name) in the example,
- Dropped the first patch. This is already done by Tero's patch "ARM: dts:
omap3: merge control module features under scrm node".
--
Kind regards,
Sakari
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 1/3] dt: bindings: Add bindings for omap3isp
2015-03-18 23:50 [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Sakari Ailus
@ 2015-03-18 23:50 ` Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 2/3] arm: dts: omap3: Add DT entries for OMAP 3 Sakari Ailus
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2015-03-18 23:50 UTC (permalink / raw)
To: linux-omap; +Cc: tony, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
.../devicetree/bindings/media/ti,omap3isp.txt | 71 ++++++++++++++++++++
MAINTAINERS | 1 +
include/dt-bindings/media/omap3-isp.h | 22 ++++++
3 files changed, 94 insertions(+)
create mode 100644 Documentation/devicetree/bindings/media/ti,omap3isp.txt
create mode 100644 include/dt-bindings/media/omap3-isp.h
diff --git a/Documentation/devicetree/bindings/media/ti,omap3isp.txt b/Documentation/devicetree/bindings/media/ti,omap3isp.txt
new file mode 100644
index 0000000..ac23de8
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/ti,omap3isp.txt
@@ -0,0 +1,71 @@
+OMAP 3 ISP Device Tree bindings
+===============================
+
+The DT definitions can be found in include/dt-bindings/media/omap3-isp.h.
+
+Required properties
+===================
+
+compatible : must contain "ti,omap3-isp"
+
+reg : the two registers sets (physical address and length) for the
+ ISP. The first set contains the core ISP registers up to
+ the end of the SBL block. The second set contains the
+ CSI PHYs and receivers registers.
+interrupts : the ISP interrupt specifier
+iommus : phandle and IOMMU specifier for the IOMMU that serves the ISP
+syscon : the phandle and register offset to the Complex I/O or CSI-PHY
+ register
+ti,phy-type : 0 -- OMAP3ISP_PHY_TYPE_COMPLEX_IO (e.g. 3430)
+ 1 -- OMAP3ISP_PHY_TYPE_CSIPHY (e.g. 3630)
+#clock-cells : Must be 1 --- the ISP provides two external clocks,
+ cam_xclka and cam_xclkb, at indices 0 and 1,
+ respectively. Please find more information on common
+ clock bindings in ../clock/clock-bindings.txt.
+
+Port nodes (optional)
+---------------------
+
+More documentation on these bindings is available in
+video-interfaces.txt in the same directory.
+
+reg : The interface:
+ 0 - parallel (CCDC)
+ 1 - CSIPHY1 -- CSI2C / CCP2B on 3630;
+ CSI1 -- CSIb on 3430
+ 2 - CSIPHY2 -- CSI2A / CCP2B on 3630;
+ CSI2 -- CSIa on 3430
+
+Optional properties
+===================
+
+vdd-csiphy1-supply : voltage supply of the CSI-2 PHY 1
+vdd-csiphy2-supply : voltage supply of the CSI-2 PHY 2
+
+Endpoint nodes
+--------------
+
+lane-polarities : lane polarity (required on CSI-2)
+ 0 -- not inverted; 1 -- inverted
+data-lanes : an array of data lanes from 1 to 3. The length can
+ be either 1 or 2. (required on CSI-2)
+clock-lanes : the clock lane (from 1 to 3). (required on CSI-2)
+
+
+Example
+=======
+
+ isp@480bc000 {
+ compatible = "ti,omap3-isp";
+ reg = <0x480bc000 0x12fc
+ 0x480bd800 0x0600>;
+ interrupts = <24>;
+ iommus = <&mmu_isp>;
+ syscon = <&scm_conf 0x2f0>;
+ ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
+ #clock-cells = <1>;
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
diff --git a/MAINTAINERS b/MAINTAINERS
index 68ad892..3ef938e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7090,6 +7090,7 @@ OMAP IMAGING SUBSYSTEM (OMAP3 ISP and OMAP4 ISS)
M: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
L: linux-media@vger.kernel.org
S: Maintained
+F: Documentation/devicetree/bindings/media/ti,omap3isp.txt
F: drivers/media/platform/omap3isp/
F: drivers/staging/media/omap4iss/
diff --git a/include/dt-bindings/media/omap3-isp.h b/include/dt-bindings/media/omap3-isp.h
new file mode 100644
index 0000000..b18c60e
--- /dev/null
+++ b/include/dt-bindings/media/omap3-isp.h
@@ -0,0 +1,22 @@
+/*
+ * include/dt-bindings/media/omap3-isp.h
+ *
+ * Copyright (C) 2015 Sakari Ailus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ */
+
+#ifndef __DT_BINDINGS_OMAP3_ISP_H__
+#define __DT_BINDINGS_OMAP3_ISP_H__
+
+#define OMAP3ISP_PHY_TYPE_COMPLEX_IO 0
+#define OMAP3ISP_PHY_TYPE_CSIPHY 1
+
+#endif /* __DT_BINDINGS_OMAP3_ISP_H__ */
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 2/3] arm: dts: omap3: Add DT entries for OMAP 3
2015-03-18 23:50 [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 1/3] dt: bindings: Add bindings for omap3isp Sakari Ailus
@ 2015-03-18 23:50 ` Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 3/3] arm: dts: n950, n9: Add primary camera support Sakari Ailus
2015-03-19 17:28 ` [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Tony Lindgren
3 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2015-03-18 23:50 UTC (permalink / raw)
To: linux-omap; +Cc: tony, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
The resources the ISP needs are slightly different on 3[45]xx and 3[67]xx.
Especially the phy-type property is different.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
arch/arm/boot/dts/omap34xx.dtsi | 17 +++++++++++++++++
arch/arm/boot/dts/omap36xx.dtsi | 17 +++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/arch/arm/boot/dts/omap34xx.dtsi b/arch/arm/boot/dts/omap34xx.dtsi
index 3819c1e..4f6b2d5 100644
--- a/arch/arm/boot/dts/omap34xx.dtsi
+++ b/arch/arm/boot/dts/omap34xx.dtsi
@@ -8,6 +8,8 @@
* kind, whether express or implied.
*/
+#include <dt-bindings/media/omap3-isp.h>
+
#include "omap3.dtsi"
/ {
@@ -37,6 +39,21 @@
pinctrl-single,register-width = <16>;
pinctrl-single,function-mask = <0xff1f>;
};
+
+ isp: isp@480bc000 {
+ compatible = "ti,omap3-isp";
+ reg = <0x480bc000 0x12fc
+ 0x480bd800 0x017c>;
+ interrupts = <24>;
+ iommus = <&mmu_isp>;
+ syscon = <&scm_conf 0xdc>;
+ ti,phy-type = <OMAP3ISP_PHY_TYPE_COMPLEX_IO>;
+ #clock-cells = <1>;
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
};
};
diff --git a/arch/arm/boot/dts/omap36xx.dtsi b/arch/arm/boot/dts/omap36xx.dtsi
index 541704a..86253de 100644
--- a/arch/arm/boot/dts/omap36xx.dtsi
+++ b/arch/arm/boot/dts/omap36xx.dtsi
@@ -8,6 +8,8 @@
* kind, whether express or implied.
*/
+#include <dt-bindings/media/omap3-isp.h>
+
#include "omap3.dtsi"
/ {
@@ -69,6 +71,21 @@
pinctrl-single,register-width = <16>;
pinctrl-single,function-mask = <0xff1f>;
};
+
+ isp: isp@480bc000 {
+ compatible = "ti,omap3-isp";
+ reg = <0x480bc000 0x12fc
+ 0x480bd800 0x0600>;
+ interrupts = <24>;
+ iommus = <&mmu_isp>;
+ syscon = <&scm_conf 0x2f0>;
+ ti,phy-type = <OMAP3ISP_PHY_TYPE_CSIPHY>;
+ #clock-cells = <1>;
+ ports {
+ #address-cells = <1>;
+ #size-cells = <0>;
+ };
+ };
};
};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/3] arm: dts: n950, n9: Add primary camera support
2015-03-18 23:50 [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 1/3] dt: bindings: Add bindings for omap3isp Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 2/3] arm: dts: omap3: Add DT entries for OMAP 3 Sakari Ailus
@ 2015-03-18 23:50 ` Sakari Ailus
2015-03-19 17:28 ` [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Tony Lindgren
3 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2015-03-18 23:50 UTC (permalink / raw)
To: linux-omap; +Cc: tony, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
Add support for the primary camera of the Nokia N950 and N9.
Signed-off-by: Sakari Ailus <sakari.ailus@iki.fi>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
---
arch/arm/boot/dts/omap3-n9.dts | 37 +++++++++++++++++++++++++++++++++++++
arch/arm/boot/dts/omap3-n950.dts | 37 +++++++++++++++++++++++++++++++++++++
2 files changed, 74 insertions(+)
diff --git a/arch/arm/boot/dts/omap3-n9.dts b/arch/arm/boot/dts/omap3-n9.dts
index 9938b5d..f2e2139 100644
--- a/arch/arm/boot/dts/omap3-n9.dts
+++ b/arch/arm/boot/dts/omap3-n9.dts
@@ -16,3 +16,40 @@
model = "Nokia N9";
compatible = "nokia,omap3-n9", "ti,omap36xx", "ti,omap3";
};
+
+&i2c2 {
+ smia_1: camera@10 {
+ compatible = "nokia,smia";
+ reg = <0x10>;
+ /* No reset gpio */
+ vana-supply = <&vaux3>;
+ clocks = <&isp 0>;
+ clock-frequency = <9600000>;
+ nokia,nvm-size = <(16 * 64)>;
+ port {
+ smia_1_1: endpoint {
+ link-frequencies = /bits/ 64 <199200000 210000000 499200000>;
+ clock-lanes = <0>;
+ data-lanes = <1 2>;
+ remote-endpoint = <&csi2a_ep>;
+ };
+ };
+ };
+};
+
+&isp {
+ vdd-csiphy1-supply = <&vaux2>;
+ vdd-csiphy2-supply = <&vaux2>;
+ ports {
+ port@2 {
+ reg = <2>;
+ csi2a_ep: endpoint {
+ remote-endpoint = <&smia_1_1>;
+ clock-lanes = <2>;
+ data-lanes = <1 3>;
+ crc = <1>;
+ lane-polarities = <1 1 1>;
+ };
+ };
+ };
+};
diff --git a/arch/arm/boot/dts/omap3-n950.dts b/arch/arm/boot/dts/omap3-n950.dts
index 261c558..0885b34 100644
--- a/arch/arm/boot/dts/omap3-n950.dts
+++ b/arch/arm/boot/dts/omap3-n950.dts
@@ -16,3 +16,40 @@
model = "Nokia N950";
compatible = "nokia,omap3-n950", "ti,omap36xx", "ti,omap3";
};
+
+&i2c2 {
+ smia_1: camera@10 {
+ compatible = "nokia,smia";
+ reg = <0x10>;
+ /* No reset gpio */
+ vana-supply = <&vaux3>;
+ clocks = <&isp 0>;
+ clock-frequency = <9600000>;
+ nokia,nvm-size = <(16 * 64)>;
+ port {
+ smia_1_1: endpoint {
+ link-frequencies = /bits/ 64 <210000000 333600000 398400000>;
+ clock-lanes = <0>;
+ data-lanes = <1 2>;
+ remote-endpoint = <&csi2a_ep>;
+ };
+ };
+ };
+};
+
+&isp {
+ vdd-csiphy1-supply = <&vaux2>;
+ vdd-csiphy2-supply = <&vaux2>;
+ ports {
+ port@2 {
+ reg = <2>;
+ csi2a_ep: endpoint {
+ remote-endpoint = <&smia_1_1>;
+ clock-lanes = <2>;
+ data-lanes = <3 1>;
+ crc = <1>;
+ lane-polarities = <1 1 1>;
+ };
+ };
+ };
+};
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes
2015-03-18 23:50 [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Sakari Ailus
` (2 preceding siblings ...)
2015-03-18 23:50 ` [PATCH v2 3/3] arm: dts: n950, n9: Add primary camera support Sakari Ailus
@ 2015-03-19 17:28 ` Tony Lindgren
2015-03-20 16:57 ` Sakari Ailus
3 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2015-03-19 17:28 UTC (permalink / raw)
To: Sakari Ailus
Cc: linux-omap, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
* Sakari Ailus <sakari.ailus@iki.fi> [150318 16:51]:
> Hi folks,
>
> Since v1, I've rebased the set on Tero Kristo's PRCM / SCM cleanup patchset
> here:
>
> <URL:http://www.spinics.net/lists/linux-omap/msg116949.html>
>
> v1 can be found here:
>
> <URL:http://www.spinics.net/lists/linux-omap/msg116753.html>
>
> Changes since v1:
>
> - Fixed phy reference (number to name) in the example,
>
> - Dropped the first patch. This is already done by Tero's patch "ARM: dts:
> omap3: merge control module features under scrm node".
Applying these into omap-for-v4.1/dt thanks.
Tony
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes
2015-03-19 17:28 ` [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Tony Lindgren
@ 2015-03-20 16:57 ` Sakari Ailus
0 siblings, 0 replies; 6+ messages in thread
From: Sakari Ailus @ 2015-03-20 16:57 UTC (permalink / raw)
To: Tony Lindgren
Cc: linux-omap, sre, pali.rohar, laurent.pinchart, t-kristo, linux-media
On Thu, Mar 19, 2015 at 10:28:44AM -0700, Tony Lindgren wrote:
> * Sakari Ailus <sakari.ailus@iki.fi> [150318 16:51]:
> > Hi folks,
> >
> > Since v1, I've rebased the set on Tero Kristo's PRCM / SCM cleanup patchset
> > here:
> >
> > <URL:http://www.spinics.net/lists/linux-omap/msg116949.html>
> >
> > v1 can be found here:
> >
> > <URL:http://www.spinics.net/lists/linux-omap/msg116753.html>
> >
> > Changes since v1:
> >
> > - Fixed phy reference (number to name) in the example,
> >
> > - Dropped the first patch. This is already done by Tero's patch "ARM: dts:
> > omap3: merge control module features under scrm node".
>
> Applying these into omap-for-v4.1/dt thanks.
Thank you! These patches had been around in some form for way too long
already. It's great to see them going in finally! :-)
--
Cheers,
Sakari Ailus
e-mail: sakari.ailus@iki.fi XMPP: sailus@retiisi.org.uk
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2015-03-20 16:57 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-18 23:50 [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 1/3] dt: bindings: Add bindings for omap3isp Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 2/3] arm: dts: omap3: Add DT entries for OMAP 3 Sakari Ailus
2015-03-18 23:50 ` [PATCH v2 3/3] arm: dts: n950, n9: Add primary camera support Sakari Ailus
2015-03-19 17:28 ` [PATCH v2 0/3] OMAP 3 ISP (and N9/N950 primary camera support) dts changes Tony Lindgren
2015-03-20 16:57 ` Sakari Ailus
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.