Commit 30ecc84e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'omap/dt' into next/late 



As pointed out by Stephen Rothwell, commit e5211763 ("ARM: dts:
omap3: Add DT entries for OMAP 3 ISP") conflicts with b8845074
("ARM: dts: omap3: add minimal l4 bus layout with control module support")
in non-obvious ways, causing a build failure when both patches
are present.

This merges the two branches that introduce the respective changes
into the next/late branch to resolve the way that Stephen suggested,
as confirmed by Tony.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lkml.org/lkml/2015/4/6/436


Acked-by: default avatarTony Lindgren <tony@atomide.com>
parents 9705feac 10709c08

Documentation/devicetree/bindings/media/ti,omap3isp.txt

0 → 100644
+71 −0
Original line number Diff line number Diff line 
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>;

			};

		};

Documentation/devicetree/bindings/serial/omap_serial.txt

+20 −0
Original line number Diff line number Diff line
@@ -4,7 +4,27 @@ Required properties: 
- compatible : should be "ti,omap2-uart" for OMAP2 controllers

- compatible : should be "ti,omap3-uart" for OMAP3 controllers

- compatible : should be "ti,omap4-uart" for OMAP4 controllers

- reg : address and length of the register space

- interrupts or interrupts-extended : Should contain the uart interrupt

                                      specifier or both the interrupt

                                      controller phandle and interrupt

                                      specifier.

- ti,hwmods : Must be "uart<n>", n being the instance number (1-based)



Optional properties:

- clock-frequency : frequency of the clock input to the UART

- dmas : DMA specifier, consisting of a phandle to the DMA controller

         node and a DMA channel number.

- dma-names : "rx" for receive channel, "tx" for transmit channel.



Example:



                uart4: serial@49042000 {

                        compatible = "ti,omap3-uart";

                        reg = <0x49042000 0x400>;

                        interrupts = <80>;

                        dmas = <&sdma 81 &sdma 82>;

                        dma-names = "tx", "rx";

                        ti,hwmods = "uart4";

                        clock-frequency = <48000000>;

                };

Documentation/devicetree/bindings/sound/omap-twl4030.txt

+1 −2
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ Required properties: 
- compatible: "ti,omap-twl4030"

- ti,model: Name of the sound card (for example "omap3beagle")

- ti,mcbsp: phandle for the McBSP node

- ti,codec: phandle for the twl4030 audio node



Optional properties:

- ti,codec: phandle for the twl4030 audio node

- ti,mcbsp-voice: phandle for the McBSP node connected to the voice port of twl

- ti, jack-det-gpio: Jack detect GPIO

- ti,audio-routing: List of connections between audio components.
@@ -59,5 +59,4 @@ sound { 
	ti,model = "omap3beagle";



	ti,mcbsp = <&mcbsp2>;

	ti,codec = <&twl_audio>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ giantplus Giantplus Technology Co., Ltd. 
globalscale	Globalscale Technologies, Inc.

gmt	Global Mixed-mode Technology, Inc.

google	Google, Inc.

grinn	Grinn

gumstix	Gumstix, Inc.

gw	Gateworks Corporation

hannstar	HannStar Display Corporation

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7079,6 +7079,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/

CRA Git | Maintained and supported by SUSTech CRA and CCSE