forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - remove of atomisp driver from staging, as nobody would have time to dedicate huge efforts to fix all the problems there. Also, we have a feeling that the driver may not even run the way it is. - move Zoran driver to staging, in order to be either fixed to use VB2 and the proper media kAPIs or to be removed - remove videobuf-dvb driver, with is unused for a while - some V4L2 documentation fixes/improvements - new sensor drivers: imx258 and ov7251 - a new driver was added to allow using I2C transparent drivers - several improvements at the ddbridge driver - several improvements at the ISDB pt1 driver, making it more coherent with the DVB framework - added a new platform driver for MIPI CSI-2 RX: cadence - now, all media drivers can be compiled on x86 with COMPILE_TEST - almost all media drivers now build on non-x86 architectures with COMPILE_TEST - lots of other random stuff: cleanups, support for new board models, bug fixes, etc * tag 'media/v4.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (464 commits) media: omap2: fix compile-testing with FB_OMAP2=m media: media/radio/Kconfig: add back RADIO_ISA media: v4l2-ioctl.c: fix missing unlock in __video_do_ioctl() media: pxa_camera: ignore -ENOIOCTLCMD from v4l2_subdev_call for s_power media: arch: sh: migor: Fix TW9910 PDN gpio media: staging: tegra-vde: Reset VDE regardless of memory client resetting failure media: marvel-ccic: mmp: select VIDEOBUF2_VMALLOC/DMA_CONTIG media: marvel-ccic: allow ccic and mmp drivers to coexist media: uvcvideo: Prevent setting unavailable flags media: ddbridge: conditionally enable fast TS for stv0910-equipped bridges media: dvb-frontends/stv0910: make TS speed configurable media: ddbridge/mci: add identifiers to function definition arguments media: ddbridge/mci: protect against out-of-bounds array access in stop() media: rc: ensure input/lirc device can be opened after register media: rc: nuvoton: Keep device enabled during reg init media: rc: nuvoton: Keep track of users on CIR enable/disable media: rc: nuvoton: Tweak the interrupt enabling dance media: uvcvideo: Support realtek's UVC 1.5 device media: uvcvideo: Fix driver reference counting media: gspca_zc3xx: Enable short exposure times for OV7648 ...
- Loading branch information
Showing
1,168 changed files
with
16,815 additions
and
176,700 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -77,15 +77,15 @@ Description: Read/Write attribute file that controls memory scrubbing. | |
|
|
||
| What: /sys/devices/system/edac/mc/mc*/max_location | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file displays the information about the last | ||
| available memory slot in this memory controller. It is used by | ||
| userspace tools in order to display the memory filling layout. | ||
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/size | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file will display the size of dimm or rank. | ||
| For dimm*/size, this is the size, in MB of the DIMM memory | ||
|
|
@@ -96,22 +96,22 @@ Description: This attribute file will display the size of dimm or rank. | |
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_dev_type | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file will display what type of DRAM device is | ||
| being utilized on this DIMM (x1, x2, x4, x8, ...). | ||
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_edac_mode | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file will display what type of Error detection | ||
| and correction is being utilized. For example: S4ECD4ED would | ||
| mean a Chipkill with x4 DRAM. | ||
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_label | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This control file allows this DIMM to have a label assigned | ||
| to it. With this label in the module, when errors occur | ||
|
|
@@ -126,14 +126,14 @@ Description: This control file allows this DIMM to have a label assigned | |
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_location | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file will display the location (csrow/channel, | ||
| branch/channel/slot or channel/slot) of the dimm or rank. | ||
|
|
||
| What: /sys/devices/system/edac/mc/mc*/(dimm|rank)*/dimm_mem_type | ||
| Date: April 2012 | ||
| Contact: Mauro Carvalho Chehab <m.chehab@samsung.com> | ||
| Contact: Mauro Carvalho Chehab <mchehab+samsung@kernel.org> | ||
| [email protected] | ||
| Description: This attribute file will display what type of memory is | ||
| currently on this csrow. Normally, either buffered or | ||
|
|
||
100 changes: 100 additions & 0 deletions
100
Documentation/devicetree/bindings/media/cdns,csi2rx.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| Cadence MIPI-CSI2 RX controller | ||
| =============================== | ||
|
|
||
| The Cadence MIPI-CSI2 RX controller is a CSI-2 bridge supporting up to 4 CSI | ||
| lanes in input, and 4 different pixel streams in output. | ||
|
|
||
| Required properties: | ||
| - compatible: must be set to "cdns,csi2rx" and an SoC-specific compatible | ||
| - reg: base address and size of the memory mapped region | ||
| - clocks: phandles to the clocks driving the controller | ||
| - clock-names: must contain: | ||
| * sys_clk: main clock | ||
| * p_clk: register bank clock | ||
| * pixel_if[0-3]_clk: pixel stream output clock, one for each stream | ||
| implemented in hardware, between 0 and 3 | ||
|
|
||
| Optional properties: | ||
| - phys: phandle to the external D-PHY, phy-names must be provided | ||
| - phy-names: must contain "dphy", if the implementation uses an | ||
| external D-PHY | ||
|
|
||
| Required subnodes: | ||
| - ports: A ports node with one port child node per device input and output | ||
| port, in accordance with the video interface bindings defined in | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. The | ||
| port nodes are numbered as follows: | ||
|
|
||
| Port Description | ||
| ----------------------------- | ||
| 0 CSI-2 input | ||
| 1 Stream 0 output | ||
| 2 Stream 1 output | ||
| 3 Stream 2 output | ||
| 4 Stream 3 output | ||
|
|
||
| The stream output port nodes are optional if they are not | ||
| connected to anything at the hardware level or implemented | ||
| in the design.Since there is only one endpoint per port, | ||
| the endpoints are not numbered. | ||
|
|
||
|
|
||
| Example: | ||
|
|
||
| csi2rx: csi-bridge@0d060000 { | ||
| compatible = "cdns,csi2rx"; | ||
| reg = <0x0d060000 0x1000>; | ||
| clocks = <&byteclock>, <&byteclock> | ||
| <&coreclock>, <&coreclock>, | ||
| <&coreclock>, <&coreclock>; | ||
| clock-names = "sys_clk", "p_clk", | ||
| "pixel_if0_clk", "pixel_if1_clk", | ||
| "pixel_if2_clk", "pixel_if3_clk"; | ||
|
|
||
| ports { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| port@0 { | ||
| reg = <0>; | ||
|
|
||
| csi2rx_in_sensor: endpoint { | ||
| remote-endpoint = <&sensor_out_csi2rx>; | ||
| clock-lanes = <0>; | ||
| data-lanes = <1 2>; | ||
| }; | ||
| }; | ||
|
|
||
| port@1 { | ||
| reg = <1>; | ||
|
|
||
| csi2rx_out_grabber0: endpoint { | ||
| remote-endpoint = <&grabber0_in_csi2rx>; | ||
| }; | ||
| }; | ||
|
|
||
| port@2 { | ||
| reg = <2>; | ||
|
|
||
| csi2rx_out_grabber1: endpoint { | ||
| remote-endpoint = <&grabber1_in_csi2rx>; | ||
| }; | ||
| }; | ||
|
|
||
| port@3 { | ||
| reg = <3>; | ||
|
|
||
| csi2rx_out_grabber2: endpoint { | ||
| remote-endpoint = <&grabber2_in_csi2rx>; | ||
| }; | ||
| }; | ||
|
|
||
| port@4 { | ||
| reg = <4>; | ||
|
|
||
| csi2rx_out_grabber3: endpoint { | ||
| remote-endpoint = <&grabber3_in_csi2rx>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| Cadence MIPI-CSI2 TX controller | ||
| =============================== | ||
|
|
||
| The Cadence MIPI-CSI2 TX controller is a CSI-2 bridge supporting up to | ||
| 4 CSI lanes in output, and up to 4 different pixel streams in input. | ||
|
|
||
| Required properties: | ||
| - compatible: must be set to "cdns,csi2tx" | ||
| - reg: base address and size of the memory mapped region | ||
| - clocks: phandles to the clocks driving the controller | ||
| - clock-names: must contain: | ||
| * esc_clk: escape mode clock | ||
| * p_clk: register bank clock | ||
| * pixel_if[0-3]_clk: pixel stream output clock, one for each stream | ||
| implemented in hardware, between 0 and 3 | ||
|
|
||
| Optional properties | ||
| - phys: phandle to the D-PHY. If it is set, phy-names need to be set | ||
| - phy-names: must contain "dphy" | ||
|
|
||
| Required subnodes: | ||
| - ports: A ports node with one port child node per device input and output | ||
| port, in accordance with the video interface bindings defined in | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. The | ||
| port nodes are numbered as follows. | ||
|
|
||
| Port Description | ||
| ----------------------------- | ||
| 0 CSI-2 output | ||
| 1 Stream 0 input | ||
| 2 Stream 1 input | ||
| 3 Stream 2 input | ||
| 4 Stream 3 input | ||
|
|
||
| The stream input port nodes are optional if they are not | ||
| connected to anything at the hardware level or implemented | ||
| in the design. Since there is only one endpoint per port, | ||
| the endpoints are not numbered. | ||
|
|
||
| Example: | ||
|
|
||
| csi2tx: csi-bridge@0d0e1000 { | ||
| compatible = "cdns,csi2tx"; | ||
| reg = <0x0d0e1000 0x1000>; | ||
| clocks = <&byteclock>, <&byteclock>, | ||
| <&coreclock>, <&coreclock>, | ||
| <&coreclock>, <&coreclock>; | ||
| clock-names = "p_clk", "esc_clk", | ||
| "pixel_if0_clk", "pixel_if1_clk", | ||
| "pixel_if2_clk", "pixel_if3_clk"; | ||
|
|
||
| ports { | ||
| #address-cells = <1>; | ||
| #size-cells = <0>; | ||
|
|
||
| port@0 { | ||
| reg = <0>; | ||
|
|
||
| csi2tx_out: endpoint { | ||
| remote-endpoint = <&remote_in>; | ||
| clock-lanes = <0>; | ||
| data-lanes = <1 2>; | ||
| }; | ||
| }; | ||
|
|
||
| port@1 { | ||
| reg = <1>; | ||
|
|
||
| csi2tx_in_stream0: endpoint { | ||
| remote-endpoint = <&stream0_out>; | ||
| }; | ||
| }; | ||
|
|
||
| port@2 { | ||
| reg = <2>; | ||
|
|
||
| csi2tx_in_stream1: endpoint { | ||
| remote-endpoint = <&stream1_out>; | ||
| }; | ||
| }; | ||
|
|
||
| port@3 { | ||
| reg = <3>; | ||
|
|
||
| csi2tx_in_stream2: endpoint { | ||
| remote-endpoint = <&stream2_out>; | ||
| }; | ||
| }; | ||
|
|
||
| port@4 { | ||
| reg = <4>; | ||
|
|
||
| csi2tx_in_stream3: endpoint { | ||
| remote-endpoint = <&stream3_out>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| * Omnivision 1/7.5-Inch B&W VGA CMOS Digital Image Sensor | ||
|
|
||
| The Omnivision OV7251 is a 1/7.5-Inch CMOS active pixel digital image sensor | ||
| with an active array size of 640H x 480V. It is programmable through a serial | ||
| I2C interface. | ||
|
|
||
| Required Properties: | ||
| - compatible: Value should be "ovti,ov7251". | ||
| - clocks: Reference to the xclk clock. | ||
| - clock-names: Should be "xclk". | ||
| - clock-frequency: Frequency of the xclk clock. | ||
| - enable-gpios: Chip enable GPIO. Polarity is GPIO_ACTIVE_HIGH. This corresponds | ||
| to the hardware pin XSHUTDOWN which is physically active low. | ||
| - vdddo-supply: Chip digital IO regulator. | ||
| - vdda-supply: Chip analog regulator. | ||
| - vddd-supply: Chip digital core regulator. | ||
|
|
||
| The device node shall contain one 'port' child node with a single 'endpoint' | ||
| subnode for its digital output video port, in accordance with the video | ||
| interface bindings defined in | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. | ||
|
|
||
| Example: | ||
|
|
||
| &i2c1 { | ||
| ... | ||
|
|
||
| ov7251: camera-sensor@60 { | ||
| compatible = "ovti,ov7251"; | ||
| reg = <0x60>; | ||
|
|
||
| enable-gpios = <&gpio1 6 GPIO_ACTIVE_HIGH>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&camera_bw_default>; | ||
|
|
||
| clocks = <&clks 200>; | ||
| clock-names = "xclk"; | ||
| clock-frequency = <24000000>; | ||
|
|
||
| vdddo-supply = <&camera_dovdd_1v8>; | ||
| vdda-supply = <&camera_avdd_2v8>; | ||
| vddd-supply = <&camera_dvdd_1v2>; | ||
|
|
||
| port { | ||
| ov7251_ep: endpoint { | ||
| clock-lanes = <1>; | ||
| data-lanes = <0>; | ||
| remote-endpoint = <&csi0_ep>; | ||
| }; | ||
| }; | ||
| }; | ||
| }; |
Oops, something went wrong.