Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74e5c56b authored by Matthias Männich's avatar Matthias Männich
Browse files

Merge "Merge 4.19.283 into android-4.19-stable" into android-4.19-stable

parents fee4b79c 23eb39df

Documentation/media/uapi/v4l/subdev-formats.rst

+27 −0
Original line number Diff line number Diff line
@@ -7565,3 +7565,30 @@ formats. 
      - 0x5001

      - Interleaved raw UYVY and JPEG image format with embedded meta-data

	used by Samsung S3C73MX camera sensors.



.. _v4l2-mbus-metadata-fmts:



Metadata Formats

^^^^^^^^^^^^^^^^



This section lists all metadata formats.



The following table lists the existing metadata formats.



.. tabularcolumns:: |p{8.0cm}|p{1.4cm}|p{7.7cm}|



.. flat-table:: Metadata formats

    :header-rows:  1

    :stub-columns: 0



    * - Identifier

      - Code

      - Comments

    * .. _MEDIA-BUS-FMT-METADATA-FIXED:



      - MEDIA_BUS_FMT_METADATA_FIXED

      - 0x7001

      - This format should be used when the same driver handles

	both sides of the link and the bus format is a fixed

	metadata format that is not configurable from userspace.

	Width and height will be set to 0 for this format.

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 282

SUBLEVEL = 283

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/exynos4412-itop-elite.dts

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ 
		compatible = "wlf,wm8960";

		reg = <0x1a>;

		clocks = <&pmu_system_controller 0>;

		clock-names = "MCLK1";

		clock-names = "mclk";

		wlf,shared-lrclk;

		#sound-dai-cells = <0>;

	};

arch/arm/boot/dts/qcom-ipq4019.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -387,8 +387,8 @@ 
			#address-cells = <3>;

			#size-cells = <2>;



			ranges = <0x81000000 0 0x40200000 0x40200000 0 0x00100000>,

				 <0x82000000 0 0x40300000 0x40300000 0 0x00d00000>;

			ranges = <0x81000000 0x0 0x00000000 0x40200000 0x0 0x00100000>,

				 <0x82000000 0x0 0x40300000 0x40300000 0x0 0x00d00000>;



			interrupts = <GIC_SPI 141 IRQ_TYPE_LEVEL_HIGH>;

			interrupt-names = "msi";

arch/arm/boot/dts/s5pv210.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -560,7 +560,7 @@ 
				interrupts = <29>;

				clocks = <&clocks CLK_CSIS>,

						<&clocks SCLK_CSIS>;

				clock-names = "clk_csis",

				clock-names = "csis",

						"sclk_csis";

				bus-width = <4>;

				status = "disabled";