Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media update from Mauro Carvalho Chehab:

 - OF documentation and patches at core and drivers, to be used by for
   embedded media systems

 - some I2C drivers used on go7007 were rewritten/promoted from staging:
   sony-btf-mpx, tw2804, tw9903, tw9906, wis-ov7640, wis-uda1342

 - add fimc-is driver (Exynos)

 - add a new radio driver: radio-si476x

 - add a two new tuners: r820t and tuner_it913x

 - split camera code on em28xx driver and add more models

 - the cypress firmware load is used outside dvb usb drivers.  So, move
   it to a common directory to make easier to re-use it

 - siano media driver updated to work with sms2270 devices

 - several work done in order to promote go7007 and solo6x1x out of
   staging (still, there are some pending issues)

 - several API compliance fixes at v4l2 drivers that don't behave as
   expected

 - as usual, lots of driver fixes, improvements, cleanups and new device
   addition at the existing drivers.

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (831 commits)
  [media] cx88: make core less verbose
  [media] em28xx: fix oops at em28xx_dvb_bus_ctrl()
  [media] s5c73m3: fix indentation of the help section in Kconfig
  [media] cx25821-alsa: get rid of a __must_check warning
  [media] cx25821-video: declare cx25821_vidioc_s_std as static
  [media] cx25821-video: remove maxw from cx25821_vidioc_try_fmt_vid_cap
  [media] r820t: Remove a warning for an unused value
  [media] dib0090: Fix a warning at dib0090_set_EFUSE
  [media] dib8000: fix a warning
  [media] dib8000: Fix sub-channel range
  [media] dib8000: store dtv_property_cache in a temp var
  [media] dib8000: warning fix: declare internal functions as static
  [media] r820t: quiet gcc warning on n_ring
  [media] r820t: memory leak in release()
  [media] r820t: precendence bug in r820t_xtal_check()
  [media] videodev2.h: Remove the unused old V4L1 buffer types
  [media] anysee: Grammar s/report the/report to/
  [media] anysee: Initialize ret = 0 in anysee_frontend_attach()
  [media] media: videobuf2: fix the length check for mmap
  [media] em28xx: save isoc endpoint number for DVB only if endpoint has alt settings with xMaxPacketSize != 0
  ...

5 files changed, 569 insertions, 0 deletions

diff --git a/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt
new file mode 100644
index 000000000000..3f62adfb3e0b
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/exynos-fimc-lite.txt
@@ -0,0 +1,14 @@
+Exynos4x12/Exynos5 SoC series camera host interface (FIMC-LITE)
+
+Required properties:
+
+- compatible    : should be "samsung,exynos4212-fimc" for Exynos4212 and
+                  Exynos4412 SoCs;
+- reg           : physical base address and size of the device memory mapped
+                  registers;
+- interrupts    : should contain FIMC-LITE interrupt;
+- clocks        : FIMC LITE gate clock should be specified in this property.
+- clock-names   : should contain "flite" entry.
+
+Each FIMC device should have an alias in the aliases node, in the form of
+fimc-lite<n>, where <n> is an integer specifying the IP block instance.
diff --git a/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt b/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt
new file mode 100644
index 000000000000..55c9ad6f9599
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/exynos4-fimc-is.txt
@@ -0,0 +1,49 @@
+Exynos4x12 SoC series Imaging Subsystem (FIMC-IS)
+
+The FIMC-IS is a subsystem for processing image signal from an image sensor.
+The Exynos4x12 SoC series FIMC-IS V1.5 comprises of a dedicated ARM Cortex-A5
+processor, ISP, DRC and FD IP blocks and peripheral devices such as UART, I2C
+and SPI bus controllers, PWM and ADC.
+
+fimc-is node
+------------
+
+Required properties:
+- compatible    : should be "samsung,exynos4212-fimc-is" for Exynos4212 and
+                  Exynos4412 SoCs;
+- reg           : physical base address and length of the registers set;
+- interrupts    : must contain two FIMC-IS interrupts, in order: ISP0, ISP1;
+- clocks        : list of clock specifiers, corresponding to entries in
+                  clock-names property;
+- clock-names   : must contain "ppmuispx", "ppmuispx", "lite0", "lite1"
+                  "mpll", "sysreg", "isp", "drc", "fd", "mcuisp", "uart",
+                  "ispdiv0", "ispdiv1", "mcuispdiv0", "mcuispdiv1", "aclk200",
+                  "div_aclk200", "aclk400mcuisp", "div_aclk400mcuisp" entries,
+                  matching entries in the clocks property.
+pmu subnode
+-----------
+
+Required properties:
+ - reg : must contain PMU physical base address and size of the register set.
+
+The following are the FIMC-IS peripheral device nodes and can be specified
+either standalone or as the fimc-is node child nodes.
+
+i2c-isp (ISP I2C bus controller) nodes
+------------------------------------------
+
+Required properties:
+
+- compatible    : should be "samsung,exynos4212-i2c-isp" for Exynos4212 and
+                  Exynos4412 SoCs;
+- reg           : physical base address and length of the registers set;
+- clocks        : must contain gate clock specifier for this controller;
+- clock-names   : must contain "i2c_isp" entry.
+
+For the above nodes it is required to specify a pinctrl state named "default",
+according to the pinctrl bindings defined in ../pinctrl/pinctrl-bindings.txt.
+
+Device tree nodes of the image sensors' controlled directly by the FIMC-IS
+firmware must be child nodes of their corresponding ISP I2C bus controller node.
+The data link of these image sensors must be specified using the common video
+interfaces bindings, defined in video-interfaces.txt.
diff --git a/Documentation/devicetree/bindings/media/samsung-fimc.txt b/Documentation/devicetree/bindings/media/samsung-fimc.txt
new file mode 100644
index 000000000000..51c776b7f7a3
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/samsung-fimc.txt
@@ -0,0 +1,197 @@
+Samsung S5P/EXYNOS SoC Camera Subsystem (FIMC)
+----------------------------------------------
+
+The S5P/Exynos SoC Camera subsystem comprises of multiple sub-devices
+represented by separate device tree nodes. Currently this includes: FIMC (in
+the S5P SoCs series known as CAMIF), MIPI CSIS, FIMC-LITE and FIMC-IS (ISP).
+
+The sub-subdevices are defined as child nodes of the common 'camera' node which
+also includes common properties of the whole subsystem not really specific to
+any single sub-device, like common camera port pins or the CAMCLK clock outputs
+for external image sensors attached to an SoC.
+
+Common 'camera' node
+--------------------
+
+Required properties:
+
+- compatible    : must be "samsung,fimc", "simple-bus"
+- clocks        : list of clock specifiers, corresponding to entries in
+                  the clock-names property;
+- clock-names   : must contain "sclk_cam0", "sclk_cam1", "pxl_async0",
+                  "pxl_async1" entries, matching entries in the clocks property.
+
+The pinctrl bindings defined in ../pinctrl/pinctrl-bindings.txt must be used
+to define a required pinctrl state named "default" and optional pinctrl states:
+"idle", "active-a", active-b". These optional states can be used to switch the
+camera port pinmux at runtime. The "idle" state should configure both the camera
+ports A and B into high impedance state, especially the CAMCLK clock output
+should be inactive. For the "active-a" state the camera port A must be activated
+and the port B deactivated and for the state "active-b" it should be the other
+way around.
+
+The 'camera' node must include at least one 'fimc' child node.
+
+'fimc' device nodes
+-------------------
+
+Required properties:
+
+- compatible: "samsung,s5pv210-fimc" for S5PV210, "samsung,exynos4210-fimc"
+  for Exynos4210 and "samsung,exynos4212-fimc" for Exynos4x12 SoCs;
+- reg: physical base address and length of the registers set for the device;
+- interrupts: should contain FIMC interrupt;
+- clocks: list of clock specifiers, must contain an entry for each required
+  entry in clock-names;
+- clock-names: must contain "fimc", "sclk_fimc" entries.
+- samsung,pix-limits: an array of maximum supported image sizes in pixels, for
+  details refer to Table 2-1 in the S5PV210 SoC User Manual; The meaning of
+  each cell is as follows:
+  0 - scaler input horizontal size,
+  1 - input horizontal size for the scaler bypassed,
+  2 - REAL_WIDTH without input rotation,
+  3 - REAL_HEIGHT with input rotation,
+- samsung,sysreg: a phandle to the SYSREG node.
+
+Each FIMC device should have an alias in the aliases node, in the form of
+fimc<n>, where <n> is an integer specifying the IP block instance.
+
+Optional properties:
+
+- clock-frequency: maximum FIMC local clock (LCLK) frequency;
+- samsung,min-pix-sizes: an array specyfing minimum image size in pixels at
+  the FIMC input and output DMA, in the first and second cell respectively.
+  Default value when this property is not present is <16 16>;
+- samsung,min-pix-alignment: minimum supported image height alignment (first
+  cell) and the horizontal image offset (second cell). The values are in pixels
+  and default to <2 1> when this property is not present;
+- samsung,mainscaler-ext: a boolean property indicating whether the FIMC IP
+  supports extended image size and has CIEXTEN register;
+- samsung,rotators: a bitmask specifying whether this IP has the input and
+  the output rotator. Bits 4 and 0 correspond to input and output rotator
+  respectively. If a rotator is present its corresponding bit should be set.
+  Default value when this property is not specified is 0x11.
+- samsung,cam-if: a bolean property indicating whether the IP block includes
+  the camera input interface.
+- samsung,isp-wb: this property must be present if the IP block has the ISP
+  writeback input.
+- samsung,lcd-wb: this property must be present if the IP block has the LCD
+  writeback input.
+
+
+'parallel-ports' node
+---------------------
+
+This node should contain child 'port' nodes specifying active parallel video
+input ports. It includes camera A and camera B inputs. 'reg' property in the
+port nodes specifies data input - 0, 1 indicates input A, B respectively.
+
+Optional properties
+
+- samsung,camclk-out : specifies clock output for remote sensor,
+                       0 - CAM_A_CLKOUT, 1 - CAM_B_CLKOUT;
+
+Image sensor nodes
+------------------
+
+The sensor device nodes should be added to their control bus controller (e.g.
+I2C0) nodes and linked to a port node in the csis or the parallel-ports node,
+using the common video interfaces bindings, defined in video-interfaces.txt.
+The implementation of this bindings requires clock-frequency property to be
+present in the sensor device nodes.
+
+Example:
+
+        aliases {
+                fimc0 = &fimc_0;
+        };
+
+        /* Parallel bus IF sensor */
+        i2c_0: i2c@13860000 {
+                s5k6aa: sensor@3c {
+                        compatible = "samsung,s5k6aafx";
+                        reg = <0x3c>;
+                        vddio-supply = <...>;
+
+                        clock-frequency = <24000000>;
+                        clocks = <...>;
+                        clock-names = "mclk";
+
+                        port {
+                                s5k6aa_ep: endpoint {
+                                        remote-endpoint = <&fimc0_ep>;
+                                        bus-width = <8>;
+                                        hsync-active = <0>;
+                                        vsync-active = <1>;
+                                        pclk-sample = <1>;
+                                };
+                        };
+                };
+        };
+
+        /* MIPI CSI-2 bus IF sensor */
+        s5c73m3: sensor@0x1a {
+                compatible = "samsung,s5c73m3";
+                reg = <0x1a>;
+                vddio-supply = <...>;
+
+                clock-frequency = <24000000>;
+                clocks = <...>;
+                clock-names = "mclk";
+
+                port {
+                        s5c73m3_1: endpoint {
+                                data-lanes = <1 2 3 4>;
+                                remote-endpoint = <&csis0_ep>;
+                        };
+                };
+        };
+
+        camera {
+                compatible = "samsung,fimc", "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                status = "okay";
+
+                pinctrl-names = "default";
+                pinctrl-0 = <&cam_port_a_clk_active>;
+
+                /* parallel camera ports */
+                parallel-ports {
+                        /* camera A input */
+                        port@0 {
+                                reg = <0>;
+                                fimc0_ep: endpoint {
+                                        remote-endpoint = <&s5k6aa_ep>;
+                                        bus-width = <8>;
+                                        hsync-active = <0>;
+                                        vsync-active = <1>;
+                                        pclk-sample = <1>;
+                                };
+                        };
+                };
+
+                fimc_0: fimc@11800000 {
+                        compatible = "samsung,exynos4210-fimc";
+                        reg = <0x11800000 0x1000>;
+                        interrupts = <0 85 0>;
+                        status = "okay";
+                };
+
+                csis_0: csis@11880000 {
+                        compatible = "samsung,exynos4210-csis";
+                        reg = <0x11880000 0x1000>;
+                        interrupts = <0 78 0>;
+                        /* camera C input */
+                        port@3 {
+                                reg = <3>;
+                                csis0_ep: endpoint {
+                                        remote-endpoint = <&s5c73m3_ep>;
+                                        data-lanes = <1 2 3 4>;
+                                        samsung,csis-hs-settle = <12>;
+                                };
+                        };
+                };
+        };
+
+The MIPI-CSIS device binding is defined in samsung-mipi-csis.txt.
diff --git a/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt b/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt
new file mode 100644
index 000000000000..5f8e28e2484f
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/samsung-mipi-csis.txt
@@ -0,0 +1,81 @@
+Samsung S5P/EXYNOS SoC series MIPI CSI-2 receiver (MIPI CSIS)
+-------------------------------------------------------------
+
+Required properties:
+
+- compatible      : "samsung,s5pv210-csis" for S5PV210 (S5PC110),
+                    "samsung,exynos4210-csis" for Exynos4210 (S5PC210),
+                    "samsung,exynos4212-csis" for Exynos4212/Exynos4412
+                    SoC series;
+- reg             : offset and length of the register set for the device;
+- interrupts      : should contain MIPI CSIS interrupt; the format of the
+                    interrupt specifier depends on the interrupt controller;
+- bus-width       : maximum number of data lanes supported (SoC specific);
+- vddio-supply    : MIPI CSIS I/O and PLL voltage supply (e.g. 1.8V);
+- vddcore-supply  : MIPI CSIS Core voltage supply (e.g. 1.1V);
+- clocks          : list of clock specifiers, corresponding to entries in
+                    clock-names property;
+- clock-names     : must contain "csis", "sclk_csis" entries, matching entries
+                    in the clocks property.
+
+Optional properties:
+
+- clock-frequency : The IP's main (system bus) clock frequency in Hz, default
+                    value when this property is not specified is 166 MHz;
+- samsung,csis-wclk : CSI-2 wrapper clock selection. If this property is present
+                    external clock from CMU will be used, or the bus clock if
+                    if it's not specified.
+
+The device node should contain one 'port' child node with one child 'endpoint'
+node, according to the bindings defined in Documentation/devicetree/bindings/
+media/video-interfaces.txt. The following are properties specific to those nodes.
+
+port node
+---------
+
+- reg             : (required) must be 3 for camera C input (CSIS0) or 4 for
+                    camera D input (CSIS1);
+
+endpoint node
+-------------
+
+- data-lanes      : (required) an array specifying active physical MIPI-CSI2
+                    data input lanes and their mapping to logical lanes; the
+                    array's content is unused, only its length is meaningful;
+
+- samsung,csis-hs-settle : (optional) differential receiver (HS-RX) settle time;
+
+
+Example:
+
+        reg0: regulator@0 {
+        };
+
+        reg1: regulator@1 {
+        };
+
+/* SoC properties */
+
+        csis_0: csis@11880000 {
+                compatible = "samsung,exynos4210-csis";
+                reg = <0x11880000 0x1000>;
+                interrupts = <0 78 0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+        };
+
+/* Board properties */
+
+        csis_0: csis@11880000 {
+                clock-frequency = <166000000>;
+                vddio-supply = <&reg0>;
+                vddcore-supply = <&reg1>;
+                port {
+                        reg = <3>; /* 3 - CSIS0, 4 - CSIS1 */
+                        csis0_ep: endpoint {
+                                remote-endpoint = <...>;
+                                data-lanes = <1>, <2>;
+                                samsung,csis-hs-settle = <12>;
+                        };
+                };
+        };
diff --git a/Documentation/devicetree/bindings/media/video-interfaces.txt b/Documentation/devicetree/bindings/media/video-interfaces.txt
new file mode 100644
index 000000000000..e022d2dc4962
--- /dev/null
+++ b/Documentation/devicetree/bindings/media/video-interfaces.txt
@@ -0,0 +1,228 @@
+Common bindings for video receiver and transmitter interfaces
+
+General concept
+---------------
+
+Video data pipelines usually consist of external devices, e.g. camera sensors,
+controlled over an I2C, SPI or UART bus, and SoC internal IP blocks, including
+video DMA engines and video data processors.
+
+SoC internal blocks are described by DT nodes, placed similarly to other SoC
+blocks.  External devices are represented as child nodes of their respective
+bus controller nodes, e.g. I2C.
+
+Data interfaces on all video devices are described by their child 'port' nodes.
+Configuration of a port depends on other devices participating in the data
+transfer and is described by 'endpoint' subnodes.
+
+device {
+        ...
+        ports {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@0 {
+                        ...
+                        endpoint@0 { ... };
+                        endpoint@1 { ... };
+                };
+                port@1 { ... };
+        };
+};
+
+If a port can be configured to work with more than one remote device on the same
+bus, an 'endpoint' child node must be provided for each of them.  If more than
+one port is present in a device node or there is more than one endpoint at a
+port, or port node needs to be associated with a selected hardware interface,
+a common scheme using '#address-cells', '#size-cells' and 'reg' properties is
+used.
+
+All 'port' nodes can be grouped under optional 'ports' node, which allows to
+specify #address-cells, #size-cells properties independently for the 'port'
+and 'endpoint' nodes and any child device nodes a device might have.
+
+Two 'endpoint' nodes are linked with each other through their 'remote-endpoint'
+phandles.  An endpoint subnode of a device contains all properties needed for
+configuration of this device for data exchange with other device.  In most
+cases properties at the peer 'endpoint' nodes will be identical, however they
+might need to be different when there is any signal modifications on the bus
+between two devices, e.g. there are logic signal inverters on the lines.
+
+It is allowed for multiple endpoints at a port to be active simultaneously,
+where supported by a device.  For example, in case where a data interface of
+a device is partitioned into multiple data busses, e.g. 16-bit input port
+divided into two separate ITU-R BT.656 8-bit busses.  In such case bus-width
+and data-shift properties can be used to assign physical data lines to each
+endpoint node (logical bus).
+
+
+Required properties
+-------------------
+
+If there is more than one 'port' or more than one 'endpoint' node or 'reg'
+property is present in port and/or endpoint nodes the following properties
+are required in a relevant parent node:
+
+ - #address-cells : number of cells required to define port/endpoint
+                    identifier, should be 1.
+ - #size-cells    : should be zero.
+
+Optional endpoint properties
+----------------------------
+
+- remote-endpoint: phandle to an 'endpoint' subnode of a remote device node.
+- slave-mode: a boolean property indicating that the link is run in slave mode.
+  The default when this property is not specified is master mode. In the slave
+  mode horizontal and vertical synchronization signals are provided to the
+  slave device (data source) by the master device (data sink). In the master
+  mode the data source device is also the source of the synchronization signals.
+- bus-width: number of data lines actively used, valid for the parallel busses.
+- data-shift: on the parallel data busses, if bus-width is used to specify the
+  number of data lines, data-shift can be used to specify which data lines are
+  used, e.g. "bus-width=<8>; data-shift=<2>;" means, that lines 9:2 are used.
+- hsync-active: active state of the HSYNC signal, 0/1 for LOW/HIGH respectively.
+- vsync-active: active state of the VSYNC signal, 0/1 for LOW/HIGH respectively.
+  Note, that if HSYNC and VSYNC polarities are not specified, embedded
+  synchronization may be required, where supported.
+- data-active: similar to HSYNC and VSYNC, specifies data line polarity.
+- field-even-active: field signal level during the even field data transmission.
+- pclk-sample: sample data on rising (1) or falling (0) edge of the pixel clock
+  signal.
+- data-lanes: an array of physical data lane indexes. Position of an entry
+  determines the logical lane number, while the value of an entry indicates
+  physical lane, e.g. for 2-lane MIPI CSI-2 bus we could have
+  "data-lanes = <1 2>;", assuming the clock lane is on hardware lane 0.
+  This property is valid for serial busses only (e.g. MIPI CSI-2).
+- clock-lanes: an array of physical clock lane indexes. Position of an entry
+  determines the logical lane number, while the value of an entry indicates
+  physical lane, e.g. for a MIPI CSI-2 bus we could have "clock-lanes = <0>;",
+  which places the clock lane on hardware lane 0. This property is valid for
+  serial busses only (e.g. MIPI CSI-2). Note that for the MIPI CSI-2 bus this
+  array contains only one entry.
+- clock-noncontinuous: a boolean property to allow MIPI CSI-2 non-continuous
+  clock mode.
+
+
+Example
+-------
+
+The example snippet below describes two data pipelines.  ov772x and imx074 are
+camera sensors with a parallel and serial (MIPI CSI-2) video bus respectively.
+Both sensors are on the I2C control bus corresponding to the i2c0 controller
+node.  ov772x sensor is linked directly to the ceu0 video host interface.
+imx074 is linked to ceu0 through the MIPI CSI-2 receiver (csi2). ceu0 has a
+(single) DMA engine writing captured data to memory.  ceu0 node has a single
+'port' node which may indicate that at any time only one of the following data
+pipelines can be active: ov772x -> ceu0 or imx074 -> csi2 -> ceu0.
+
+        ceu0: ceu@0xfe910000 {
+                compatible = "renesas,sh-mobile-ceu";
+                reg = <0xfe910000 0xa0>;
+                interrupts = <0x880>;
+
+                mclk: master_clock {
+                        compatible = "renesas,ceu-clock";
+                        #clock-cells = <1>;
+                        clock-frequency = <50000000>;   /* Max clock frequency */
+                        clock-output-names = "mclk";
+                };
+
+                port {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+
+                        /* Parallel bus endpoint */
+                        ceu0_1: endpoint@1 {
+                                reg = <1>;              /* Local endpoint # */
+                                remote = <&ov772x_1_1>; /* Remote phandle */
+                                bus-width = <8>;        /* Used data lines */
+                                data-shift = <2>;       /* Lines 9:2 are used */
+
+                                /* If hsync-active/vsync-active are missing,
+                                   embedded BT.656 sync is used */
+                                hsync-active = <0>;     /* Active low */
+                                vsync-active = <0>;     /* Active low */
+                                data-active = <1>;      /* Active high */
+                                pclk-sample = <1>;      /* Rising */
+                        };
+
+                        /* MIPI CSI-2 bus endpoint */
+                        ceu0_0: endpoint@0 {
+                                reg = <0>;
+                                remote = <&csi2_2>;
+                        };
+                };
+        };
+
+        i2c0: i2c@0xfff20000 {
+                ...
+                ov772x_1: camera@0x21 {
+                        compatible = "omnivision,ov772x";
+                        reg = <0x21>;
+                        vddio-supply = <&regulator1>;
+                        vddcore-supply = <&regulator2>;
+
+                        clock-frequency = <20000000>;
+                        clocks = <&mclk 0>;
+                        clock-names = "xclk";
+
+                        port {
+                                /* With 1 endpoint per port no need for addresses. */
+                                ov772x_1_1: endpoint {
+                                        bus-width = <8>;
+                                        remote-endpoint = <&ceu0_1>;
+                                        hsync-active = <1>;
+                                        vsync-active = <0>; /* Who came up with an
+                                                               inverter here ?... */
+                                        data-active = <1>;
+                                        pclk-sample = <1>;
+                                };
+                        };
+                };
+
+                imx074: camera@0x1a {
+                        compatible = "sony,imx074";
+                        reg = <0x1a>;
+                        vddio-supply = <&regulator1>;
+                        vddcore-supply = <&regulator2>;
+
+                        clock-frequency = <30000000>;   /* Shared clock with ov772x_1 */
+                        clocks = <&mclk 0>;
+                        clock-names = "sysclk";         /* Assuming this is the
+                                                           name in the datasheet */
+                        port {
+                                imx074_1: endpoint {
+                                        clock-lanes = <0>;
+                                        data-lanes = <1 2>;
+                                        remote-endpoint = <&csi2_1>;
+                                };
+                        };
+                };
+        };
+
+        csi2: csi2@0xffc90000 {
+                compatible = "renesas,sh-mobile-csi2";
+                reg = <0xffc90000 0x1000>;
+                interrupts = <0x17a0>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                port@1 {
+                        compatible = "renesas,csi2c";   /* One of CSI2I and CSI2C. */
+                        reg = <1>;                      /* CSI-2 PHY #1 of 2: PHY_S,
+                                                           PHY_M has port address 0,
+                                                           is unused. */
+                        csi2_1: endpoint {
+                                clock-lanes = <0>;
+                                data-lanes = <2 1>;
+                                remote-endpoint = <&imx074_1>;
+                        };
+                };
+                port@2 {
+                        reg = <2>;                      /* port 2: link to the CEU */
+
+                        csi2_2: endpoint {
+                                remote-endpoint = <&ceu0_0>;
+                        };
+                };
+        };