mirror of
https://github.com/linux-msm/laptops-kernel.git
synced 2026-08-13 14:19:53 -07:00
Merge tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab:
- new drivers:
- i.MX6 Video Data Order Adapter's (VDOA)
- Toshiba et8ek8 5MP sensor
- STM DELTA multi-format video decoder V4L2 driver
- SPI connected IR LED
- Mediatek IR remote receiver
- ZyDAS ZD1301 DVB USB interface driver
- new RC keymaps
- some very old LIRC drivers got removed from staging
- RC core gained support encoding IR scan codes
- DVB si2168 gained support for DVBv5 statistics
- lirc_sir driver ported to rc-core and promoted from staging
- other bug fixes, board additions and driver improvements
* tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (230 commits)
[media] mtk-vcodec: fix build warnings without DEBUG
[media] zd1301: fix building interface driver without demodulator
[media] usbtv: add sharpness control
[media] cxusb: Use a dma capable buffer also for reading
[media] ttpci: address stringop overflow warning
[media] dvb-usb-v2: avoid use-after-free
[media] add Hama Hybrid DVB-T Stick support
[media] et8ek8: Fix compiler / Coccinelle warnings
[media] media: fix semicolon.cocci warnings
[media] media: exynos4-is: add flags to dummy Exynos IS i2c adapter
[media] v4l: of: check for unique lanes in data-lanes and clock-lanes
[media] coda/imx-vdoa: constify structs
[media] st-delta: debug: trace stream/frame information & summary
[media] st-delta: add mjpeg support
[media] st-delta: EOS (End Of Stream) support
[media] st-delta: rpmsg ipc support
[media] st-delta: add memory allocator helper functions
[media] st-delta: STiH4xx multi-format video decoder v4l2 driver
[media] MAINTAINERS: add st-delta driver
[media] ARM: multi_v7_defconfig: enable STMicroelectronics DELTA Support
...
This commit is contained in:
Linus Torvalds
@@ -62,18 +62,18 @@ Description:
|
||||
This value may be reset to 0 if the current protocol is altered.
|
||||
|
||||
What: /sys/class/rc/rcN/wakeup_protocols
|
||||
Date: Feb 2014
|
||||
KernelVersion: 3.15
|
||||
Date: Feb 2017
|
||||
KernelVersion: 4.11
|
||||
Contact: Mauro Carvalho Chehab <m.chehab@samsung.com>
|
||||
Description:
|
||||
Reading this file returns a list of available protocols to use
|
||||
for the wakeup filter, something like:
|
||||
"rc5 rc6 nec jvc [sony]"
|
||||
"rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce"
|
||||
Note that protocol variants are listed, so "nec", "sony",
|
||||
"rc-5", "rc-6" have their different bit length encodings
|
||||
listed if available.
|
||||
The enabled wakeup protocol is shown in [] brackets.
|
||||
Writing "+proto" will add a protocol to the list of enabled
|
||||
wakeup protocols.
|
||||
Writing "-proto" will remove a protocol from the list of enabled
|
||||
wakeup protocols.
|
||||
Only one protocol can be selected at a time.
|
||||
Writing "proto" will use "proto" for wakeup events.
|
||||
Writing "none" will disable wakeup.
|
||||
Write fails with EINVAL if an invalid protocol combination or
|
||||
|
||||
@@ -0,0 +1,29 @@
|
||||
Device tree bindings for IR LED connected through SPI bus which is used as
|
||||
remote controller.
|
||||
|
||||
The IR LED switch is connected to the MOSI line of the SPI device and the data
|
||||
are delivered thourgh that.
|
||||
|
||||
Required properties:
|
||||
- compatible: should be "ir-spi-led".
|
||||
|
||||
Optional properties:
|
||||
- duty-cycle: 8 bit balue that represents the percentage of one period
|
||||
in which the signal is active. It can be 50, 60, 70, 75, 80 or 90.
|
||||
- led-active-low: boolean value that specifies whether the output is
|
||||
negated with a NOT gate.
|
||||
- power-supply: specifies the power source. It can either be a regulator
|
||||
or a gpio which enables a regulator, i.e. a regulator-fixed as
|
||||
described in
|
||||
Documentation/devicetree/bindings/regulator/fixed-regulator.txt
|
||||
|
||||
Example:
|
||||
|
||||
irled@0 {
|
||||
compatible = "ir-spi-led";
|
||||
reg = <0x0>;
|
||||
spi-max-frequency = <5000000>;
|
||||
power-supply = <&vdd_led>;
|
||||
led-active-low;
|
||||
duty-cycle = /bits/ 8 <60>;
|
||||
};
|
||||
@@ -0,0 +1,21 @@
|
||||
Freescale Video Data Order Adapter
|
||||
==================================
|
||||
|
||||
The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose
|
||||
is to reorder video data from the macroblock tiled order produced by the CODA
|
||||
960 VPU to the conventional raster-scan order for scanout.
|
||||
|
||||
Required properties:
|
||||
- compatible: must be "fsl,imx6q-vdoa"
|
||||
- reg: the register base and size for the device registers
|
||||
- interrupts: the VDOA interrupt
|
||||
- clocks: the vdoa clock
|
||||
|
||||
Example:
|
||||
|
||||
vdoa@21e4000 {
|
||||
compatible = "fsl,imx6q-vdoa";
|
||||
reg = <0x021e4000 0x4000>;
|
||||
interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX6QDL_CLK_VDOA>;
|
||||
};
|
||||
@@ -5,7 +5,8 @@ Required properties:
|
||||
- gpios: specifies GPIO used for IR signal reception.
|
||||
|
||||
Optional properties:
|
||||
- linux,rc-map-name: Linux specific remote control map name.
|
||||
- linux,rc-map-name: see rc.txt file in the same
|
||||
directory.
|
||||
|
||||
Example node:
|
||||
|
||||
|
||||
@@ -10,7 +10,7 @@ Required properties:
|
||||
- clocks: clock phandle and specifier pair.
|
||||
|
||||
Optional properties:
|
||||
- linux,rc-map-name : Remote control map name.
|
||||
- linux,rc-map-name: see rc.txt file in the same directory.
|
||||
- hisilicon,power-syscon: DEPRECATED. Don't use this in new dts files.
|
||||
Provide correct clocks instead.
|
||||
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
Toshiba et8ek8 5MP sensor
|
||||
|
||||
Toshiba et8ek8 5MP sensor is an image sensor found in Nokia N900 device
|
||||
|
||||
More detailed documentation can be found in
|
||||
Documentation/devicetree/bindings/media/video-interfaces.txt .
|
||||
|
||||
|
||||
Mandatory properties
|
||||
--------------------
|
||||
|
||||
- compatible: "toshiba,et8ek8"
|
||||
- reg: I2C address (0x3e, or an alternative address)
|
||||
- vana-supply: Analogue voltage supply (VANA), 2.8 volts
|
||||
- clocks: External clock to the sensor
|
||||
- clock-frequency: Frequency of the external clock to the sensor. Camera
|
||||
driver will set this frequency on the external clock. The clock frequency is
|
||||
a pre-determined frequency known to be suitable to the board.
|
||||
- reset-gpios: XSHUTDOWN GPIO. The XSHUTDOWN signal is active low. The sensor
|
||||
is in hardware standby mode when the signal is in the low state.
|
||||
|
||||
|
||||
Endpoint node mandatory properties
|
||||
----------------------------------
|
||||
|
||||
- remote-endpoint: A phandle to the bus receiver's endpoint node.
|
||||
|
||||
|
||||
Example
|
||||
-------
|
||||
|
||||
&i2c3 {
|
||||
clock-frequency = <400000>;
|
||||
|
||||
cam1: camera@3e {
|
||||
compatible = "toshiba,et8ek8";
|
||||
reg = <0x3e>;
|
||||
vana-supply = <&vaux4>;
|
||||
clocks = <&isp 0>;
|
||||
clock-frequency = <9600000>;
|
||||
reset-gpio = <&gpio4 6 GPIO_ACTIVE_HIGH>; /* 102 */
|
||||
port {
|
||||
csi_cam1: endpoint {
|
||||
remote-endpoint = <&csi_out1>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -8,6 +8,9 @@ Required properties:
|
||||
- reg : physical base address and length of the device registers
|
||||
- interrupts : a single specifier for the interrupt from the device
|
||||
|
||||
Optional properties:
|
||||
- linux,rc-map-name: see rc.txt file in the same directory.
|
||||
|
||||
Example:
|
||||
|
||||
ir-receiver@c8100480 {
|
||||
|
||||
@@ -0,0 +1,24 @@
|
||||
Device-Tree bindings for Mediatek consumer IR controller
|
||||
found in Mediatek SoC family
|
||||
|
||||
Required properties:
|
||||
- compatible : "mediatek,mt7623-cir"
|
||||
- clocks : list of clock specifiers, corresponding to
|
||||
entries in clock-names property;
|
||||
- clock-names : should contain "clk" entries;
|
||||
- interrupts : should contain IR IRQ number;
|
||||
- reg : should contain IO map address for IR.
|
||||
|
||||
Optional properties:
|
||||
- linux,rc-map-name : see rc.txt file in the same directory.
|
||||
|
||||
Example:
|
||||
|
||||
cir: cir@10013000 {
|
||||
compatible = "mediatek,mt7623-cir";
|
||||
reg = <0 0x10013000 0 0x1000>;
|
||||
interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_LOW>;
|
||||
clocks = <&infracfg CLK_INFRA_IRRX>;
|
||||
clock-names = "clk";
|
||||
linux,rc-map-name = "rc-rc6-mce";
|
||||
};
|
||||
@@ -0,0 +1,117 @@
|
||||
The following properties are common to the infrared remote controllers:
|
||||
|
||||
- linux,rc-map-name: string, specifies the scancode/key mapping table
|
||||
defined in-kernel for the remote controller. Support values are:
|
||||
* "rc-adstech-dvb-t-pci"
|
||||
* "rc-alink-dtu-m"
|
||||
* "rc-anysee"
|
||||
* "rc-apac-viewcomp"
|
||||
* "rc-asus-pc39"
|
||||
* "rc-asus-ps3-100"
|
||||
* "rc-ati-tv-wonder-hd-600"
|
||||
* "rc-ati-x10"
|
||||
* "rc-avermedia-a16d"
|
||||
* "rc-avermedia-cardbus"
|
||||
* "rc-avermedia-dvbt"
|
||||
* "rc-avermedia-m135a"
|
||||
* "rc-avermedia-m733a-rm-k6"
|
||||
* "rc-avermedia-rm-ks"
|
||||
* "rc-avermedia"
|
||||
* "rc-avertv-303"
|
||||
* "rc-azurewave-ad-tu700"
|
||||
* "rc-behold-columbus"
|
||||
* "rc-behold"
|
||||
* "rc-budget-ci-old"
|
||||
* "rc-cec"
|
||||
* "rc-cinergy-1400"
|
||||
* "rc-cinergy"
|
||||
* "rc-delock-61959"
|
||||
* "rc-dib0700-nec"
|
||||
* "rc-dib0700-rc5"
|
||||
* "rc-digitalnow-tinytwin"
|
||||
* "rc-digittrade"
|
||||
* "rc-dm1105-nec"
|
||||
* "rc-dntv-live-dvbt-pro"
|
||||
* "rc-dntv-live-dvb-t"
|
||||
* "rc-dtt200u"
|
||||
* "rc-dvbsky"
|
||||
* "rc-empty"
|
||||
* "rc-em-terratec"
|
||||
* "rc-encore-enltv2"
|
||||
* "rc-encore-enltv-fm53"
|
||||
* "rc-encore-enltv"
|
||||
* "rc-evga-indtube"
|
||||
* "rc-eztv"
|
||||
* "rc-flydvb"
|
||||
* "rc-flyvideo"
|
||||
* "rc-fusionhdtv-mce"
|
||||
* "rc-gadmei-rm008z"
|
||||
* "rc-geekbox"
|
||||
* "rc-genius-tvgo-a11mce"
|
||||
* "rc-gotview7135"
|
||||
* "rc-hauppauge"
|
||||
* "rc-imon-mce"
|
||||
* "rc-imon-pad"
|
||||
* "rc-iodata-bctv7e"
|
||||
* "rc-it913x-v1"
|
||||
* "rc-it913x-v2"
|
||||
* "rc-kaiomy"
|
||||
* "rc-kworld-315u"
|
||||
* "rc-kworld-pc150u"
|
||||
* "rc-kworld-plus-tv-analog"
|
||||
* "rc-leadtek-y04g0051"
|
||||
* "rc-lirc"
|
||||
* "rc-lme2510"
|
||||
* "rc-manli"
|
||||
* "rc-medion-x10"
|
||||
* "rc-medion-x10-digitainer"
|
||||
* "rc-medion-x10-or2x"
|
||||
* "rc-msi-digivox-ii"
|
||||
* "rc-msi-digivox-iii"
|
||||
* "rc-msi-tvanywhere-plus"
|
||||
* "rc-msi-tvanywhere"
|
||||
* "rc-nebula"
|
||||
* "rc-nec-terratec-cinergy-xs"
|
||||
* "rc-norwood"
|
||||
* "rc-npgtech"
|
||||
* "rc-pctv-sedna"
|
||||
* "rc-pinnacle-color"
|
||||
* "rc-pinnacle-grey"
|
||||
* "rc-pinnacle-pctv-hd"
|
||||
* "rc-pixelview-new"
|
||||
* "rc-pixelview"
|
||||
* "rc-pixelview-002t"
|
||||
* "rc-pixelview-mk12"
|
||||
* "rc-powercolor-real-angel"
|
||||
* "rc-proteus-2309"
|
||||
* "rc-purpletv"
|
||||
* "rc-pv951"
|
||||
* "rc-hauppauge"
|
||||
* "rc-rc5-tv"
|
||||
* "rc-rc6-mce"
|
||||
* "rc-real-audio-220-32-keys"
|
||||
* "rc-reddo"
|
||||
* "rc-snapstream-firefly"
|
||||
* "rc-streamzap"
|
||||
* "rc-tbs-nec"
|
||||
* "rc-technisat-ts35"
|
||||
* "rc-technisat-usb2"
|
||||
* "rc-terratec-cinergy-c-pci"
|
||||
* "rc-terratec-cinergy-s2-hd"
|
||||
* "rc-terratec-cinergy-xs"
|
||||
* "rc-terratec-slim"
|
||||
* "rc-terratec-slim-2"
|
||||
* "rc-tevii-nec"
|
||||
* "rc-tivo"
|
||||
* "rc-total-media-in-hand"
|
||||
* "rc-total-media-in-hand-02"
|
||||
* "rc-trekstor"
|
||||
* "rc-tt-1500"
|
||||
* "rc-twinhan-dtv-cab-ci"
|
||||
* "rc-twinhan1027"
|
||||
* "rc-videomate-k100"
|
||||
* "rc-videomate-s350"
|
||||
* "rc-videomate-tv-pvr"
|
||||
* "rc-winfast"
|
||||
* "rc-winfast-usbii-deluxe"
|
||||
* "rc-su3000"
|
||||
@@ -0,0 +1,17 @@
|
||||
* STMicroelectronics DELTA multi-format video decoder
|
||||
|
||||
Required properties:
|
||||
- compatible: should be "st,st-delta".
|
||||
- clocks: from common clock binding: handle hardware IP needed clocks, the
|
||||
number of clocks may depend on the SoC type.
|
||||
See ../clock/clock-bindings.txt for details.
|
||||
- clock-names: names of the clocks listed in clocks property in the same order.
|
||||
|
||||
Example:
|
||||
delta0 {
|
||||
compatible = "st,st-delta";
|
||||
clock-names = "delta", "delta-st231", "delta-flash-promip";
|
||||
clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_ST231_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_FLASH_PROMIP>;
|
||||
};
|
||||
@@ -9,7 +9,7 @@ Required properties:
|
||||
- reg : should contain IO map address for IR.
|
||||
|
||||
Optional properties:
|
||||
- linux,rc-map-name : Remote control map name.
|
||||
- linux,rc-map-name: see rc.txt file in the same directory.
|
||||
- resets : phandle + reset specifier pair
|
||||
|
||||
Example:
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
Texas Instruments VPIF
|
||||
----------------------
|
||||
|
||||
The TI Video Port InterFace (VPIF) is the primary component for video
|
||||
capture and display on the DA850/AM18x family of TI DaVinci/Sitara
|
||||
SoCs.
|
||||
|
||||
TI Document reference: SPRUH82C, Chapter 35
|
||||
http://www.ti.com/lit/pdf/spruh82
|
||||
|
||||
Required properties:
|
||||
- compatible: must be "ti,da850-vpif"
|
||||
- reg: physical base address and length of the registers set for the device;
|
||||
- interrupts: should contain IRQ line for the VPIF
|
||||
|
||||
Video Capture:
|
||||
|
||||
VPIF has a 16-bit parallel bus input, supporting 2 8-bit channels or a
|
||||
single 16-bit channel. It should contain at least one port child node
|
||||
with child 'endpoint' node. Please refer to the bindings defined in
|
||||
Documentation/devicetree/bindings/media/video-interfaces.txt.
|
||||
|
||||
Example using 2 8-bit input channels, one of which is connected to an
|
||||
I2C-connected TVP5147 decoder:
|
||||
|
||||
vpif: vpif@217000 {
|
||||
compatible = "ti,da850-vpif";
|
||||
reg = <0x217000 0x1000>;
|
||||
interrupts = <92>;
|
||||
|
||||
port {
|
||||
vpif_ch0: endpoint@0 {
|
||||
reg = <0>;
|
||||
bus-width = <8>;
|
||||
remote-endpoint = <&composite>;
|
||||
};
|
||||
|
||||
vpif_ch1: endpoint@1 {
|
||||
reg = <1>;
|
||||
bus-width = <8>;
|
||||
data-shift = <8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
[ ... ]
|
||||
|
||||
&i2c0 {
|
||||
|
||||
tvp5147@5d {
|
||||
compatible = "ti,tvp5147";
|
||||
reg = <0x5d>;
|
||||
status = "okay";
|
||||
|
||||
port {
|
||||
composite: endpoint {
|
||||
hsync-active = <1>;
|
||||
vsync-active = <1>;
|
||||
pclk-sample = <0>;
|
||||
|
||||
/* VPIF channel 0 (lower 8-bits) */
|
||||
remote-endpoint = <&vpif_ch0>;
|
||||
bus-width = <8>;
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
Alternatively, an example when the bus is configured as a single
|
||||
16-bit input (e.g. for raw-capture mode):
|
||||
|
||||
vpif: vpif@217000 {
|
||||
compatible = "ti,da850-vpif";
|
||||
reg = <0x217000 0x1000>;
|
||||
interrupts = <92>;
|
||||
|
||||
port {
|
||||
vpif_ch0: endpoint {
|
||||
bus-width = <16>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -162,13 +162,13 @@ framework provides a depth-first graph traversal API for that purpose.
|
||||
currently defined as 16.
|
||||
|
||||
Drivers initiate a graph traversal by calling
|
||||
:c:func:`media_entity_graph_walk_start()`
|
||||
:c:func:`media_graph_walk_start()`
|
||||
|
||||
The graph structure, provided by the caller, is initialized to start graph
|
||||
traversal at the given entity.
|
||||
|
||||
Drivers can then retrieve the next entity by calling
|
||||
:c:func:`media_entity_graph_walk_next()`
|
||||
:c:func:`media_graph_walk_next()`
|
||||
|
||||
When the graph traversal is complete the function will return ``NULL``.
|
||||
|
||||
@@ -206,7 +206,7 @@ Pipelines and media streams
|
||||
|
||||
When starting streaming, drivers must notify all entities in the pipeline to
|
||||
prevent link states from being modified during streaming by calling
|
||||
:c:func:`media_entity_pipeline_start()`.
|
||||
:c:func:`media_pipeline_start()`.
|
||||
|
||||
The function will mark all entities connected to the given entity through
|
||||
enabled links, either directly or indirectly, as streaming.
|
||||
@@ -218,17 +218,17 @@ in higher-level pipeline structures and can then access the
|
||||
pipeline through the struct :c:type:`media_entity`
|
||||
pipe field.
|
||||
|
||||
Calls to :c:func:`media_entity_pipeline_start()` can be nested.
|
||||
Calls to :c:func:`media_pipeline_start()` can be nested.
|
||||
The pipeline pointer must be identical for all nested calls to the function.
|
||||
|
||||
:c:func:`media_entity_pipeline_start()` may return an error. In that case,
|
||||
:c:func:`media_pipeline_start()` may return an error. In that case,
|
||||
it will clean up any of the changes it did by itself.
|
||||
|
||||
When stopping the stream, drivers must notify the entities with
|
||||
:c:func:`media_entity_pipeline_stop()`.
|
||||
:c:func:`media_pipeline_stop()`.
|
||||
|
||||
If multiple calls to :c:func:`media_entity_pipeline_start()` have been
|
||||
made the same number of :c:func:`media_entity_pipeline_stop()` calls
|
||||
If multiple calls to :c:func:`media_pipeline_start()` have been
|
||||
made the same number of :c:func:`media_pipeline_stop()` calls
|
||||
are required to stop streaming.
|
||||
The :c:type:`media_entity`.\ ``pipe`` field is reset to ``NULL`` on the last
|
||||
nested stop call.
|
||||
@@ -245,7 +245,7 @@ operation must be done with the media_device graph_mutex held.
|
||||
Link validation
|
||||
^^^^^^^^^^^^^^^
|
||||
|
||||
Link validation is performed by :c:func:`media_entity_pipeline_start()`
|
||||
Link validation is performed by :c:func:`media_pipeline_start()`
|
||||
for any entity which has sink pads in the pipeline. The
|
||||
:c:type:`media_entity`.\ ``link_validate()`` callback is used for that
|
||||
purpose. In ``link_validate()`` callback, entity driver should check
|
||||
|
||||
@@ -94,9 +94,17 @@ Generic Error Codes
|
||||
- Permission denied. Can be returned if the device needs write
|
||||
permission, or some special capabilities is needed (e. g. root)
|
||||
|
||||
- .. row 11
|
||||
|
||||
- ``EIO``
|
||||
|
||||
- I/O error. Typically used when there are problems communicating with
|
||||
a hardware device. This could indicate broken or flaky hardware.
|
||||
It's a 'Something is wrong, I give up!' type of error.
|
||||
|
||||
.. note::
|
||||
|
||||
#. This list is not exaustive; ioctls may return other error codes.
|
||||
#. This list is not exhaustive; ioctls may return other error codes.
|
||||
Since errors may have side effects such as a driver reset,
|
||||
applications should abort on unexpected errors, or otherwise
|
||||
assume that the device is in a bad state.
|
||||
|
||||
@@ -92,15 +92,16 @@ This value may be reset to 0 if the current protocol is altered.
|
||||
Reading this file returns a list of available protocols to use for the
|
||||
wakeup filter, something like:
|
||||
|
||||
``rc5 rc6 nec jvc [sony]``
|
||||
``rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce``
|
||||
|
||||
Note that protocol variants are listed, so "nec", "sony", "rc-5", "rc-6"
|
||||
have their different bit length encodings listed if available.
|
||||
|
||||
Note that all protocol variants are listed.
|
||||
|
||||
The enabled wakeup protocol is shown in [] brackets.
|
||||
|
||||
Writing "+proto" will add a protocol to the list of enabled wakeup
|
||||
protocols.
|
||||
|
||||
Writing "-proto" will remove a protocol from the list of enabled wakeup
|
||||
protocols.
|
||||
Only one protocol can be selected at a time.
|
||||
|
||||
Writing "proto" will use "proto" for wakeup events.
|
||||
|
||||
|
||||
+42
-10
@@ -2423,6 +2423,14 @@ W: https://linuxtv.org
|
||||
S: Supported
|
||||
F: drivers/media/platform/sti/bdisp
|
||||
|
||||
DELTA ST MEDIA DRIVER
|
||||
M: Hugues Fruchet <hugues.fruchet@st.com>
|
||||
L: linux-media@vger.kernel.org
|
||||
T: git git://linuxtv.org/media_tree.git
|
||||
W: https://linuxtv.org
|
||||
S: Supported
|
||||
F: drivers/media/platform/sti/delta
|
||||
|
||||
BEFS FILE SYSTEM
|
||||
M: Luis de Bethencourt <luisbg@osg.samsung.com>
|
||||
M: Salah Triki <salah.triki@gmail.com>
|
||||
@@ -5738,16 +5746,6 @@ L: linux-parisc@vger.kernel.org
|
||||
S: Maintained
|
||||
F: sound/parisc/harmony.*
|
||||
|
||||
HD29L2 MEDIA DRIVER
|
||||
M: Antti Palosaari <crope@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
W: https://linuxtv.org
|
||||
W: http://palosaari.fi/linux/
|
||||
Q: http://patchwork.linuxtv.org/project/linux-media/list/
|
||||
T: git git://linuxtv.org/anttip/media_tree.git
|
||||
S: Maintained
|
||||
F: drivers/media/dvb-frontends/hd29l2*
|
||||
|
||||
HEWLETT PACKARD ENTERPRISE ILO NMI WATCHDOG DRIVER
|
||||
M: Jimmy Vance <jimmy.vance@hpe.com>
|
||||
S: Supported
|
||||
@@ -8825,6 +8823,22 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
|
||||
S: Maintained
|
||||
F: arch/nios2/
|
||||
|
||||
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
|
||||
M: Pavel Machek <pavel@ucw.cz>
|
||||
M: Sakari Ailus <sakari.ailus@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/media/i2c/et8ek8
|
||||
F: drivers/media/i2c/ad5820.c
|
||||
|
||||
NOKIA N900 CAMERA SUPPORT (ET8EK8 SENSOR, AD5820 FOCUS)
|
||||
M: Pavel Machek <pavel@ucw.cz>
|
||||
M: Sakari Ailus <sakari.ailus@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
S: Maintained
|
||||
F: drivers/media/i2c/et8ek8
|
||||
F: drivers/media/i2c/ad5820.c
|
||||
|
||||
NOKIA N900 POWER SUPPLY DRIVERS
|
||||
R: Pali Rohár <pali.rohar@gmail.com>
|
||||
F: include/linux/power/bq2415x_charger.h
|
||||
@@ -13660,6 +13674,24 @@ L: zd1211-devs@lists.sourceforge.net (subscribers-only)
|
||||
S: Maintained
|
||||
F: drivers/net/wireless/zydas/zd1211rw/
|
||||
|
||||
ZD1301_DEMOD MEDIA DRIVER
|
||||
M: Antti Palosaari <crope@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
W: https://linuxtv.org/
|
||||
W: http://palosaari.fi/linux/
|
||||
Q: https://patchwork.linuxtv.org/project/linux-media/list/
|
||||
S: Maintained
|
||||
F: drivers/media/dvb-frontends/zd1301_demod*
|
||||
|
||||
ZD1301 MEDIA DRIVER
|
||||
M: Antti Palosaari <crope@iki.fi>
|
||||
L: linux-media@vger.kernel.org
|
||||
W: https://linuxtv.org/
|
||||
W: http://palosaari.fi/linux/
|
||||
Q: https://patchwork.linuxtv.org/project/linux-media/list/
|
||||
S: Maintained
|
||||
F: drivers/media/usb/dvb-usb-v2/zd1301*
|
||||
|
||||
ZPOOL COMPRESSED PAGE STORAGE API
|
||||
M: Dan Streetman <ddstreet@ieee.org>
|
||||
L: linux-mm@kvack.org
|
||||
|
||||
@@ -1166,8 +1166,10 @@
|
||||
};
|
||||
|
||||
vdoa@021e4000 {
|
||||
compatible = "fsl,imx6q-vdoa";
|
||||
reg = <0x021e4000 0x4000>;
|
||||
interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;
|
||||
clocks = <&clks IMX6QDL_CLK_VDOA>;
|
||||
};
|
||||
|
||||
uart2: serial@021e8000 {
|
||||
|
||||
@@ -1003,5 +1003,15 @@
|
||||
|
||||
status = "disabled";
|
||||
};
|
||||
|
||||
delta0 {
|
||||
compatible = "st,st-delta";
|
||||
clock-names = "delta",
|
||||
"delta-st231",
|
||||
"delta-flash-promip";
|
||||
clocks = <&clk_s_c0_flexgen CLK_VID_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_ST231_DMU>,
|
||||
<&clk_s_c0_flexgen CLK_FLASH_PROMIP>;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
@@ -569,6 +569,7 @@ CONFIG_VIDEO_SAMSUNG_S5P_MFC=m
|
||||
CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
|
||||
CONFIG_VIDEO_STI_BDISP=m
|
||||
CONFIG_VIDEO_STI_HVA=m
|
||||
CONFIG_VIDEO_STI_DELTA=m
|
||||
CONFIG_VIDEO_RENESAS_JPU=m
|
||||
CONFIG_VIDEO_RENESAS_VSP1=m
|
||||
CONFIG_V4L_TEST_DRIVERS=y
|
||||
|
||||
@@ -484,15 +484,15 @@ static struct pwm_omap_dmtimer_pdata pwm_dmtimer_pdata = {
|
||||
};
|
||||
#endif
|
||||
|
||||
static struct lirc_rx51_platform_data __maybe_unused rx51_lirc_data = {
|
||||
static struct ir_rx51_platform_data __maybe_unused rx51_ir_data = {
|
||||
.set_max_mpu_wakeup_lat = omap_pm_set_max_mpu_wakeup_lat,
|
||||
};
|
||||
|
||||
static struct platform_device __maybe_unused rx51_lirc_device = {
|
||||
.name = "lirc_rx51",
|
||||
static struct platform_device __maybe_unused rx51_ir_device = {
|
||||
.name = "ir_rx51",
|
||||
.id = -1,
|
||||
.dev = {
|
||||
.platform_data = &rx51_lirc_data,
|
||||
.platform_data = &rx51_ir_data,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -533,7 +533,7 @@ static struct of_dev_auxdata omap_auxdata_lookup[] __initdata = {
|
||||
&omap3_iommu_pdata),
|
||||
OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x4809c000, "4809c000.mmc", &mmc_pdata[0]),
|
||||
OF_DEV_AUXDATA("ti,omap3-hsmmc", 0x480b4000, "480b4000.mmc", &mmc_pdata[1]),
|
||||
OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_lirc_data),
|
||||
OF_DEV_AUXDATA("nokia,n900-ir", 0, "n900-ir", &rx51_ir_data),
|
||||
/* Only on am3517 */
|
||||
OF_DEV_AUXDATA("ti,davinci_mdio", 0x5c030000, "davinci_mdio.0", NULL),
|
||||
OF_DEV_AUXDATA("ti,am3517-emac", 0x5c000000, "davinci_emac.0",
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user