linux/drivers/media/platform
Tao Huang 60a5825e9c Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common
* android-4.19: (206154 commits)
  Linux 4.19.20
  cifs: Always resolve hostname before reconnecting
  md/raid5: fix 'out of memory' during raid cache recovery
  of: overlay: do not duplicate properties from overlay for new nodes
  of: overlay: use prop add changeset entry for property in new nodes
  of: overlay: add missing of_node_get() in __of_attach_node_sysfs
  of: overlay: add tests to validate kfrees from overlay removal
  of: Convert to using %pOFn instead of device_node.name
  mm: migrate: don't rely on __PageMovable() of newpage after unlocking it
  mm: hwpoison: use do_send_sig_info() instead of force_sig()
  mm, oom: fix use-after-free in oom_kill_process
  mm,memory_hotplug: fix scan_movable_pages() for gigantic hugepages
  oom, oom_reaper: do not enqueue same task twice
  mm/hugetlb.c: teach follow_hugetlb_page() to handle FOLL_NOWAIT
  kernel/exit.c: release ptraced tasks before zap_pid_ns_processes
  btrfs: On error always free subvol_name in btrfs_mount
  Btrfs: fix deadlock when allocating tree block during leaf/node split
  mmc: sdhci-iproc: handle mmc_of_parse() errors during probe
  platform/x86: asus-nb-wmi: Drop mapping of 0x33 and 0x34 scan codes
  platform/x86: asus-nb-wmi: Map 0x35 to KEY_SCREENLOCK
  ...

Conflicts:
	Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.txt
	Documentation/devicetree/bindings/devfreq/event/rockchip-dfi.txt
	Documentation/devicetree/bindings/display/bridge/analogix_dp.txt
	Documentation/devicetree/bindings/display/rockchip/analogix_dp-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/dw_mipi_dsi_rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt
	Documentation/devicetree/bindings/display/rockchip/rockchip-lvds.txt
	Documentation/devicetree/bindings/media/i2c/ov2685.txt
	Documentation/devicetree/bindings/media/i2c/ov5695.txt
	Documentation/devicetree/bindings/media/i2c/ov7251.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-inno-usb2.txt
	Documentation/devicetree/bindings/phy/phy-rockchip-typec.txt
	Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt
	Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt
	Documentation/devicetree/bindings/soc/rockchip/grf.txt
	Documentation/devicetree/bindings/sound/rockchip,pdm.txt
	Documentation/devicetree/bindings/timer/rockchip,rk-timer.txt
	Documentation/devicetree/bindings/usb/rockchip,dwc3.txt
	arch/arm/boot/dts/rk3036-kylin.dts
	arch/arm/boot/dts/rk3036.dtsi
	arch/arm/boot/dts/rk3228-evb.dts
	arch/arm/boot/dts/rk3229-evb.dts
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm/boot/dts/rk3288-fennec.dts
	arch/arm/boot/dts/rk3288-firefly-reload.dts
	arch/arm/boot/dts/rk3288-miqi.dts
	arch/arm/boot/dts/rk3288-phycore-rdk.dts
	arch/arm/boot/dts/rk3288-phycore-som.dtsi
	arch/arm/boot/dts/rv1108.dtsi
	arch/arm64/boot/dts/rockchip/rk3328-evb.dts
	arch/arm64/boot/dts/rockchip/rk3328-rock64.dts
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
	arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
	arch/arm64/boot/dts/rockchip/rk3368-px5-evb.dts
	arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi
	arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/clk/rockchip/clk-ddr.c
	drivers/clk/rockchip/clk-half-divider.c
	drivers/clk/rockchip/clk-px30.c
	drivers/clk/rockchip/clk-rk3036.c
	drivers/clk/rockchip/clk-rk3128.c
	drivers/clk/rockchip/clk-rk3228.c
	drivers/clk/rockchip/clk-rk3328.c
	drivers/clk/rockchip/clk-rk3399.c
	drivers/clk/rockchip/clk-rv1108.c
	drivers/devfreq/event/rockchip-dfi.c
	drivers/gpu/drm/bridge/analogix/Kconfig
	drivers/gpu/drm/bridge/analogix/Makefile
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
	drivers/gpu/drm/bridge/analogix/analogix_dp_core.h
	drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
	drivers/gpu/drm/bridge/dumb-vga-dac.c
	drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
	drivers/gpu/drm/rockchip/cdn-dp-core.c
	drivers/gpu/drm/rockchip/cdn-dp-core.h
	drivers/gpu/drm/rockchip/cdn-dp-reg.c
	drivers/gpu/drm/rockchip/cdn-dp-reg.h
	drivers/gpu/drm/rockchip/dw-mipi-dsi.c
	drivers/gpu/drm/rockchip/inno_hdmi.c
	drivers/gpu/drm/rockchip/inno_hdmi.h
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.h
	drivers/hid/hid-alps.c
	drivers/iio/light/vl6180.c
	drivers/leds/leds-is31fl32xx.c
	drivers/media/cec/cec-adap.c
	drivers/media/cec/cec-api.c
	drivers/media/cec/cec-notifier.c
	drivers/media/i2c/ov5647.c
	drivers/media/i2c/ov5695.c
	drivers/media/i2c/ov7251.c
	drivers/media/platform/rockchip/rga/rga.c
	drivers/media/rc/ir-imon-decoder.c
	drivers/media/rc/serial_ir.c
	drivers/media/spi/Kconfig
	drivers/media/spi/Makefile
	drivers/media/v4l2-core/v4l2-fwnode.c
	drivers/net/phy/rockchip.c
	drivers/phy/rockchip/Kconfig
	drivers/phy/rockchip/Makefile
	drivers/phy/rockchip/phy-rockchip-emmc.c
	drivers/phy/rockchip/phy-rockchip-inno-usb2.c
	drivers/phy/rockchip/phy-rockchip-typec.c
	drivers/phy/rockchip/phy-rockchip-usb.c
	drivers/pinctrl/pinctrl-rk805.c
	drivers/power/reset/reboot-mode.c
	drivers/soc/rockchip/grf.c
	drivers/usb/dwc3/dwc3-of-simple.c
	drivers/usb/gadget/udc/core.c
	include/drm/bridge/analogix_dp.h
	include/dt-bindings/clock/px30-cru.h
	include/dt-bindings/clock/rk3036-cru.h
	include/dt-bindings/clock/rk3128-cru.h
	include/dt-bindings/clock/rk3228-cru.h
	include/dt-bindings/clock/rk3328-cru.h
	include/dt-bindings/clock/rk3399-cru.h
	include/dt-bindings/power/px30-power.h
	include/dt-bindings/power/rk3036-power.h
	include/dt-bindings/power/rk3228-power.h
	include/media/cec-notifier.h
	include/soc/rockchip/rockchip_sip.h
	include/sound/hdmi-codec.h
	sound/soc/codecs/hdmi-codec.c
	sound/soc/rockchip/rockchip_pdm.c
	sound/soc/rockchip/rockchip_pdm.h

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-02-14 11:48:20 +08:00
..
am437x rk: revert to v4.4 2019-02-10 00:33:21 +08:00
atmel media: atmel-isi: move of_node_put() to cover success branch as well 2018-06-28 06:50:28 -04:00
cadence media: v4l: cadence: add VIDEO_V4L2 dependency 2018-06-27 09:51:49 -04:00
cec-gpio media: cec-gpio: support 5v testing 2018-07-25 07:12:36 -04:00
coda rk: revert to v4.4 2019-02-10 00:33:21 +08:00
cros-ec-cec media: platform: Add ChromeOS EC CEC driver 2018-07-13 08:44:46 +01:00
davinci rk: revert to v4.4 2019-02-10 00:33:21 +08:00
exynos-gsc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
exynos4-is rk: revert to v4.4 2019-02-10 00:33:21 +08:00
marvell-ccic Merge branch 'i2c/for-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux 2018-06-14 16:21:46 +09:00
meson media: platform: meson-ao-cec: make busy TX warning silent 2018-07-24 17:52:20 -04:00
mtk-jpeg media: mem2mem: Make .job_abort optional 2018-07-24 17:45:08 -04:00
mtk-mdp media: mem2mem: Make .job_abort optional 2018-07-24 17:45:08 -04:00
mtk-vcodec media: mtk-vcodec: Support VP9 profile in decoder 2018-07-04 09:33:17 -04:00
mtk-vpu media: mtk-vpu: fix spelling mistake: "Prosessor" -> "Processor" 2018-06-28 06:39:34 -04:00
omap media: v4l: omap: add VIDEO_V4L2 dependency 2018-06-28 06:48:21 -04:00
omap3isp rk: revert to v4.4 2019-02-10 00:33:21 +08:00
qcom media: venus: core: Set dma maximum segment size 2019-01-26 09:32:38 +01:00
rcar-vin media: rcar-vin: convert to SPDX identifiers 2018-08-03 16:03:45 -04:00
rk-isp10 media: rk-isp10: add api mutex for multi-thread app 2019-01-24 14:28:44 +08:00
rockchip Merge remote branch 'android-4.19' of https://android.googlesource.com/kernel/common 2019-02-14 11:48:20 +08:00
rockchip-tsp
rockchip-vpu
s3c-camif rk: revert to v4.4 2019-02-10 00:33:21 +08:00
s5p-cec
s5p-g2d media: mem2mem: Make .job_abort optional 2018-07-24 17:45:08 -04:00
s5p-jpeg rk: revert to v4.4 2019-02-10 00:33:21 +08:00
s5p-mfc rk: revert to v4.4 2019-02-10 00:33:21 +08:00
soc_camera rk: revert to v4.4 2019-02-10 00:33:21 +08:00
sti rk: revert to v4.4 2019-02-10 00:33:21 +08:00
stm32 media: stm32-dcmi: add power saving support 2018-06-28 07:49:56 -04:00
tegra-cec
ti-vpe media: mem2mem: Remove unused v4l2_m2m_ops .lock/.unlock 2018-06-28 07:56:49 -04:00
vicodec media: vicodec: fix memchr() kernel oops 2018-12-13 09:16:17 +01:00
vimc Char/Misc driver patches for 4.19-rc1 2018-08-18 11:04:51 -07:00
vivid media: vivid: set min width/height to a value > 0 2019-01-22 21:40:35 +01:00
vsp1 rk: revert to v4.4 2019-02-10 00:33:21 +08:00
xilinx rk: revert to v4.4 2019-02-10 00:33:21 +08:00
fsl-viu.c rk: revert to v4.4 2019-02-10 00:33:21 +08:00
Kconfig rk: revert to v4.4 2019-02-10 00:33:21 +08:00
m2m-deinterlace.c media: m2m-deinterlace: Implement wait_prepare and wait_finish 2018-07-04 08:03:04 -04:00
Makefile rk: revert to v4.4 2019-02-10 00:33:21 +08:00
mx2_emmaprp.c media: mx_emmaprp: Implement wait_prepare and wait_finish 2018-07-04 08:02:33 -04:00
pxa_camera.c media: pxa_camera: remove the dmaengine compat need 2018-06-18 21:29:40 +02:00
rcar_drif.c media: rcar_drif: convert to SPDX identifiers 2018-08-03 16:04:29 -04:00
rcar_fdp1.c media: rcar_fdp1: convert to SPDX identifiers 2018-08-03 16:04:49 -04:00
rcar_jpu.c rk: revert to v4.4 2019-02-10 00:33:21 +08:00
rcar-fcp.c Char/Misc driver patches for 4.19-rc1 2018-08-18 11:04:51 -07:00
renesas-ceu.c media: renesas-ceu: Add support for YUYV permutations 2018-06-28 06:51:05 -04:00
sh_veu.c media: sh_veu: convert to SPDX identifiers 2018-08-03 16:05:26 -04:00
sh_vou.c media: sh_vou: convert to SPDX identifiers 2018-08-03 16:05:51 -04:00
via-camera.c fbdev changes for v4.18: 2018-06-17 05:00:24 +09:00
via-camera.h
video-mux.c media: video-mux: fix compliance failures 2018-07-24 17:40:40 -04:00
vim2m.c media: vim2m: add media device 2018-07-04 08:47:56 -04:00