forked from torvalds/linux
-
Notifications
You must be signed in to change notification settings - Fork 1
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.3-1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - new DVB frontend drivers: ascot2e, cxd2841er, horus3a, lnbh25 - new HDMI capture driver: tc358743 - new driver for NetUP DVB new boards (netup_unidvb) - IR support for DVBSky cards (smipcie-ir) - Coda driver has gain macroblock tiling support - Renesas R-Car gains JPEG codec driver - new DVB platform driver for STi boards: c8sectpfe - added documentation for the media core kABI to device-drivers DocBook - lots of driver fixups, cleanups and improvements * tag 'media/v4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (297 commits) [media] c8sectpfe: Remove select on undefined LIBELF_32 [media] i2c: fix platform_no_drv_owner.cocci warnings [media] cx231xx: Use wake_up_interruptible() instead of wake_up_interruptible_nr() [media] tc358743: only queue subdev notifications if devnode is set [media] tc358743: add missing Kconfig dependency/select [media] c8sectpfe: Use %pad to print 'dma_addr_t' [media] DocBook media: Fix typo "the the" in xml files [media] tc358743: make reset gpio optional [media] tc358743: set direction of reset gpio using devm_gpiod_get [media] dvbdev: document most of the functions/data structs [media] dvb_frontend.h: document the struct dvb_frontend [media] dvb-frontend.h: document struct dtv_frontend_properties [media] dvb-frontend.h: document struct dvb_frontend_ops [media] dvb: Use DVBFE_ALGO_HW where applicable [media] dvb_frontend.h: document struct analog_demod_ops [media] dvb_frontend.h: Document struct dvb_tuner_ops [media] Docbook: Document struct analog_parameters [media] dvb_frontend.h: get rid of dvbfe_modcod [media] add documentation for struct dvb_tuner_info [media] dvb_frontend: document dvb_frontend_tune_settings ...
- Loading branch information
Showing
277 changed files
with
18,634 additions
and
4,331 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
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
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
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,48 @@ | ||
| * Toshiba TC358743 HDMI-RX to MIPI CSI2-TX Bridge | ||
|
|
||
| The Toshiba TC358743 HDMI-RX to MIPI CSI2-TX (H2C) is a bridge that converts | ||
| a HDMI stream to MIPI CSI-2 TX. It is programmable through I2C. | ||
|
|
||
| Required Properties: | ||
|
|
||
| - compatible: value should be "toshiba,tc358743" | ||
| - clocks, clock-names: should contain a phandle link to the reference clock | ||
| source, the clock input is named "refclk". | ||
|
|
||
| Optional Properties: | ||
|
|
||
| - reset-gpios: gpio phandle GPIO connected to the reset pin | ||
| - interrupts, interrupt-parent: GPIO connected to the interrupt pin | ||
| - data-lanes: should be <1 2 3 4> for four-lane operation, | ||
| or <1 2> for two-lane operation | ||
| - clock-lanes: should be <0> | ||
| - clock-noncontinuous: Presence of this boolean property decides whether the | ||
| MIPI CSI-2 clock is continuous or non-continuous. | ||
| - link-frequencies: List of allowed link frequencies in Hz. Each frequency is | ||
| expressed as a 64-bit big-endian integer. The frequency | ||
| is half of the bps per lane due to DDR transmission. | ||
|
|
||
| For further information on the MIPI CSI-2 endpoint node properties, see | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. | ||
|
|
||
| Example: | ||
|
|
||
| tc358743@0f { | ||
| compatible = "toshiba,tc358743"; | ||
| reg = <0x0f>; | ||
| clocks = <&hdmi_osc>; | ||
| clock-names = "refclk"; | ||
| reset-gpios = <&gpio6 9 GPIO_ACTIVE_LOW>; | ||
| interrupt-parent = <&gpio2>; | ||
| interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; | ||
|
|
||
| port { | ||
| tc358743_out: endpoint { | ||
| remote-endpoint = <&mipi_csi2_in>; | ||
| data-lanes = <1 2 3 4>; | ||
| clock-lanes = <0>; | ||
| clock-noncontinuous; | ||
| link-frequencies = /bits/ 64 <297000000>; | ||
| }; | ||
| }; | ||
| }; |
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,24 @@ | ||
| * Renesas JPEG Processing Unit | ||
|
|
||
| The JPEG processing unit (JPU) incorporates the JPEG codec with an encoding | ||
| and decoding function conforming to the JPEG baseline process, so that the JPU | ||
| can encode image data and decode JPEG data quickly. | ||
|
|
||
| Required properties: | ||
| - compatible: should containg one of the following: | ||
| - "renesas,jpu-r8a7790" for R-Car H2 | ||
| - "renesas,jpu-r8a7791" for R-Car M2-W | ||
| - "renesas,jpu-r8a7792" for R-Car V2H | ||
| - "renesas,jpu-r8a7793" for R-Car M2-N | ||
|
|
||
| - reg: Base address and length of the registers block for the JPU. | ||
| - interrupts: JPU interrupt specifier. | ||
| - clocks: A phandle + clock-specifier pair for the JPU functional clock. | ||
|
|
||
| Example: R8A7790 (R-Car H2) JPU node | ||
| jpeg-codec@fe980000 { | ||
| compatible = "renesas,jpu-r8a7790"; | ||
| reg = <0 0xfe980000 0 0x10300>; | ||
| interrupts = <0 272 IRQ_TYPE_LEVEL_HIGH>; | ||
| clocks = <&mstp1_clks R8A7790_CLK_JPU>; | ||
| }; |
89 changes: 89 additions & 0 deletions
89
Documentation/devicetree/bindings/media/stih407-c8sectpfe.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,89 @@ | ||
| STMicroelectronics STi c8sectpfe binding | ||
| ============================================ | ||
|
|
||
| This document describes the c8sectpfe device bindings that is used to get transport | ||
| stream data into the SoC on the TS pins, and into DDR for further processing. | ||
|
|
||
| It is typically used in conjunction with one or more demodulator and tuner devices | ||
| which converts from the RF to digital domain. Demodulators and tuners are usually | ||
| located on an external DVB frontend card connected to SoC TS input pins. | ||
|
|
||
| Currently 7 TS input (tsin) channels are supported on the stih407 family SoC. | ||
|
|
||
| Required properties (controller (parent) node): | ||
| - compatible : Should be "stih407-c8sectpfe" | ||
|
|
||
| - reg : Address and length of register sets for each device in | ||
| "reg-names" | ||
|
|
||
| - reg-names : The names of the register addresses corresponding to the | ||
| registers filled in "reg": | ||
| - c8sectpfe: c8sectpfe registers | ||
| - c8sectpfe-ram: c8sectpfe internal sram | ||
|
|
||
| - clocks : phandle list of c8sectpfe clocks | ||
| - clock-names : should be "c8sectpfe" | ||
| See: Documentation/devicetree/bindings/clock/clock-bindings.txt | ||
|
|
||
| - pinctrl-names : a pinctrl state named tsin%d-serial or tsin%d-parallel (where %d is tsin-num) | ||
| must be defined for each tsin child node. | ||
| - pinctrl-0 : phandle referencing pin configuration for this tsin configuration | ||
| See: Documentation/devicetree/bindings/pinctrl/pinctrl-binding.txt | ||
|
|
||
|
|
||
| Required properties (tsin (child) node): | ||
|
|
||
| - tsin-num : tsin id of the InputBlock (must be between 0 to 6) | ||
| - i2c-bus : phandle to the I2C bus DT node which the demodulators & tuners on this tsin channel are connected. | ||
| - rst-gpio : reset gpio for this tsin channel. | ||
|
|
||
| Optional properties (tsin (child) node): | ||
|
|
||
| - invert-ts-clk : Bool property to control sense of ts input clock (data stored on falling edge of clk). | ||
| - serial-not-parallel : Bool property to configure input bus width (serial on ts_data<7>). | ||
| - async-not-sync : Bool property to control if data is received in asynchronous mode | ||
| (all bits/bytes with ts_valid or ts_packet asserted are valid). | ||
|
|
||
| - dvb-card : Describes the NIM card connected to this tsin channel. | ||
|
|
||
| Example: | ||
|
|
||
| /* stih410 SoC b2120 + b2004a + stv0367-pll(NIMB) + stv0367-tda18212 (NIMA) DT example) */ | ||
|
|
||
| c8sectpfe@08a20000 { | ||
| compatible = "st,stih407-c8sectpfe"; | ||
| status = "okay"; | ||
| reg = <0x08a20000 0x10000>, <0x08a00000 0x4000>; | ||
| reg-names = "stfe", "stfe-ram"; | ||
| interrupts = <0 34 0>, <0 35 0>; | ||
| interrupt-names = "stfe-error-irq", "stfe-idle-irq"; | ||
|
|
||
| pinctrl-names = "tsin0-serial", "tsin0-parallel", "tsin3-serial", | ||
| "tsin4-serial", "tsin5-serial"; | ||
|
|
||
| pinctrl-0 = <&pinctrl_tsin0_serial>; | ||
| pinctrl-1 = <&pinctrl_tsin0_parallel>; | ||
| pinctrl-2 = <&pinctrl_tsin3_serial>; | ||
| pinctrl-3 = <&pinctrl_tsin4_serial_alt3>; | ||
| pinctrl-4 = <&pinctrl_tsin5_serial_alt1>; | ||
|
|
||
| clocks = <&clk_s_c0_flexgen CLK_PROC_STFE>; | ||
| clock-names = "stfe"; | ||
|
|
||
| /* tsin0 is TSA on NIMA */ | ||
| tsin0: port@0 { | ||
| tsin-num = <0>; | ||
| serial-not-parallel; | ||
| i2c-bus = <&ssc2>; | ||
| rst-gpio = <&pio15 4 0>; | ||
| dvb-card = <STV0367_TDA18212_NIMA_1>; | ||
| }; | ||
|
|
||
| tsin3: port@3 { | ||
| tsin-num = <3>; | ||
| serial-not-parallel; | ||
| i2c-bus = <&ssc3>; | ||
| rst-gpio = <&pio15 7 0>; | ||
| dvb-card = <STV0367_TDA18212_NIMB_1>; | ||
| }; | ||
| }; |
Oops, something went wrong.