shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-08 20:07:46 +09:00
Code Issues Packages Projects Releases Wiki Activity
605,757 Commits 55 Branches 2,486 Tags
886d0dc5826acb3881fcd2dfa2e43743dca06a58
Commit Graph

605757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wyon Bi
886d0dc582 arm64: dts: rockchip: Add mipi_dphy node for PX30 
Change-Id: I92c6bfe60dfe0c89befddad528c8d41a2318567a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 16:48:20 +08:00
Wyon Bi
dffc889042 phy/rockchip: dphy: Add support for PX30 
Change-Id: Ia7e29691f66fa10a5cdf1379b4eb419581ddda5f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 16:45:24 +08:00
Wyon Bi
faa3764d61 drm/rockchip: dsi: Add support for PX30 
Change-Id: Ib7e43456d8456b1db74880710b88bdf7da4639e8
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 16:44:58 +08:00
Wyon Bi
371553e68b drm/rockchip: dsi: Add a better description for dw_mipi_dsi_plat_data 
Change-Id: I6a149747a12bbd1c3e84cd33769ed453770353af
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 16:44:26 +08:00
Jacob Chen
fbe1b71c32 media: i2c: imx219: apply gain/exposure immediately 
or it's too slow for AEC algorithm

Change-Id: I646a31b026a1e753e8bee681d088c7b2944ed147
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-11 14:30:48 +08:00
Jacob Chen
e9b2399061 media: i2c: imx219: support 1920*1080*48fps mode 
and correct some control to make 3A work

Change-Id: Id3fc3ca9c5b123b6d45cd80d8e857a5c151c2427
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-11 14:30:46 +08:00
Jacob Chen
05ffa6bb37 ARM: configs: rockchip_linux: enable rockchip isp1 driver 
and some sensors

Change-Id: I8be884069341680c09c7bccd0e17b6faff0a681b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-11 14:30:43 +08:00
Jacob Chen
2e65cfc38f ARM: dts: add rk3288-firefly-reload-linux 
tc358749 enabled with rockchip-isp1 driver

Change-Id: I94c36f2d78cb190436e974bd47500dbbce18deae
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-11 14:30:39 +08:00
Jacob Chen
2f45de6bee ARM: dts: add rk3288-rkisp1.dtsi 
There are many isp driver in 4.4 kernel, let's add a dtsi
to help switch between them.

Change-Id: Ida1af575b6c64ffec56ad695933dfdf22cdd72c1
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-11 14:28:28 +08:00
Greg Hackmann
e2a963621b clocksource: arch_timer: make virtual counter access configurable 
CVE-2017-13218
Change-Id: Ibdb1fd768b748002b90bfc165612c12c8311f8a2
 2018-01-11 10:44:36 +08:00
Greg Hackmann
fe1b88d895 arm64: issue isb when trapping CNTVCT_EL0 access 
CVE-2017-13218
Change-Id: I6005a6e944494257bfc2243fde2f7a09c3fd76c6
 2018-01-11 10:44:28 +08:00
Marc Zyngier
e35b7d2759 BACKPORT: arm64: Add CNTFRQ_EL0 trap handler 
We now trap accesses to CNTVCT_EL0 when the counter is broken
enough to require the kernel to mediate the access. But it
turns out that some existing userspace (such as OpenMPI) do
probe for the counter frequency, leading to an UNDEF exception
as CNTVCT_EL0 and CNTFRQ_EL0 share the same control bit.

The fix is to handle the exception the same way we do for CNTVCT_EL0.

Fixes: a86bd139f2 ("arm64: arch_timer: Enable CNTVCT_EL0 trap if workaround is enabled")
Reported-by: Hanjun Guo <guohanjun@huawei.com>
Tested-by: Hanjun Guo <guohanjun@huawei.com>
Reviewed-by: Hanjun Guo <guohanjun@huawei.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
(cherry picked from commit 9842119a23)

CVE-2017-13218
Change-Id: I2f163e2511bab6225f319c0a9e732735cbd108a0
 2018-01-11 10:44:13 +08:00
Marc Zyngier
6c970498b3 BACKPORT: arm64: Add CNTVCT_EL0 trap handler 
Since people seem to make a point in breaking the userspace visible
counter, we have no choice but to trap the access. Add the required
handler.

Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
(cherry picked from commit 6126ce0588)

CVE-2017-13218
Change-Id: I0705f47c85a78040df38df18f51a4a22500b904d
 2018-01-11 10:42:02 +08:00
Wyon Bi
993719678f drm/rockchip: dsi: Convert to use regmap 
Change-Id: Ia697fce3f51cf0278f37ac0e809173ebca076d6b
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 10:16:34 +08:00
Wyon Bi
51a7171dd2 drm/rockchip: dsi: Fix pclk hanndling 
Change-Id: I31f6bc3991a03b79209c846a9c051acb0b2e8270
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-11 10:16:24 +08:00
Leo Wen
5c64b1b7ca arm: dts: rk3288-evb-rk808-linux: Add ov13850 camera support. 
Change-Id: I693f3ec61b8a2cadc5d4c461149a54d8c6332eec
Signed-off-by: Leo Wen <leo.wen@rock-chips.com>
 2018-01-11 09:22:40 +08:00
Putin Lee
2742e98839 dt-bindings: rockchip: rga: Document for px30/rk3326 rga 
Change-Id: Ibbd3c1c7aa47697870a0168c889ff6a0247464d5
Signed-off-by: Putin Lee <putin.li@rock-chips.com>
 2018-01-10 18:45:54 +08:00
Xinhuang Li
ccf1ebd486 arm64: dts: rockchip: rk3328: add vpu_combo and enable it 
add vpu_combo consist of avsd and vdpu

Change-Id: Ib49238d6a187dd7d621ad40ee0635b74825931f8
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
 2018-01-10 16:51:27 +08:00
Meng Dongyang
79406f8ed7 usb: dwc_otg_310: fix NULL pointer error from driver attributes 
In current code, the driver attributes of DWC2 controller is
created during driver initialization, if we get or set them
before finish probe device, the device's pointer in attribute
function will be NULL and this will crash the system. So this
patch make the function return directly if the pointer is NULL.

The attributes mention above:
/sys/bus/platform/drivers/usb20_otg/dwc_otg_conn_en
/sys/bus/platform/drivers/usb20_otg/force_usb_mode
/sys/bus/platform/drivers/usb20_otg/vbus_status

Change-Id: If063a884249afa7172bf28719b8c2b8a5641ac4b
Signed-off-by: Meng Dongyang <daniel.meng@rock-chips.com>
 2018-01-10 16:50:41 +08:00
Viktor Slavkovic
f689b67a36 staging: android: ashmem: fix a race condition in ASHMEM_SET_SIZE ioctl 
A lock-unlock is missing in ASHMEM_SET_SIZE ioctl which can result in a
race condition when mmap is called. After the !asma->file check, before
setting asma->size, asma->file can be set in mmap. That would result in
having different asma->size than the mapped memory size. Combined with
ASHMEM_UNPIN ioctl and shrinker invocation, this can result in memory
corruption.

Bug: 66954097
Signed-off-by: Viktor Slavkovic <viktors@google.com>
Change-Id: I268225133f96fde0fadd1ec621aafef27d392d65
 2018-01-09 15:40:58 +08:00
Joseph Chen
0e7d55e6f0 mfd: rk808: initialize rk808_i2c_client by default 
Even "rockchip,system-power-controller" is not found,
rk808_i2c_client is needed for suspend/resume and the
other.

Change-Id: I17ebb3a1d1e7ec8dc9f4a3ee2dbdcd9ae4c1648b
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
 2018-01-09 14:34:34 +08:00
Joseph Chen
8c6943ea7c power: rk818-battery: fix 4250mv charge voltage missing 
Update according to latest datasheet.

Change-Id: I980e3b9705c8e1ccce5d0fba9b1b40cbf1681abe
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
 2018-01-09 14:34:29 +08:00
Zorro Liu
aae2e5388c driver: input: sensors: modify accel sensor calibration offset 
Change-Id: I411f148b38aa0b4feabf9135123d20d3006798fa
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
 2018-01-09 14:09:48 +08:00
Liang Chen
59af91b563 arm64: dts: rockchip: auto select opp-table by leakage for rk3328 
Change-Id: I5807d47085291efcd8eea61e59e931615b283ba5
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2018-01-09 09:29:29 +08:00
Liang Chen
225047ca4a video: rockchip: vpu: auto select opp-table by leakage 
Change-Id: I3937d7bd896cca9aedb80bac2a8eb8737c79e7fb
Signed-off-by: Liang Chen <cl@rock-chips.com>
 2018-01-09 09:28:53 +08:00
Shunqing Chen
84a2162b28 power: rk818-charger: flush workqueue on shutdown 
do not need to destroy workqueue on shutdown

Change-Id: I78262414e91d8e48e088fd1a54a36542e29af8a7
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
 2018-01-09 09:27:10 +08:00
CanYang He
9b04710a12 arm64: dts: rockchip: update rk3328-dram-2layer-timing 
according kernel-3.10 below commit to update
	16ceab7 ARM: dts: rockchip: update rk322xh-dram-2layer-timing

Change-Id: I7ed708704adce3d1dfec6b2d8008e2474621a576
Signed-off-by: CanYang He <hcy@rock-chips.com>
 2018-01-08 21:02:00 +08:00
CanYang He
96312b689d PM / devfreq: rockchip_dmc: fix rk3328 of_get_ddr_timings fail 
because of_parse_phandle() phandle_name parameter incorrect

Change-Id: Ic1b2cf7b1a7331aff52102a863e97a937677f2ae
Signed-off-by: CanYang He <hcy@rock-chips.com>
 2018-01-08 21:01:19 +08:00
Wyon Bi
b3e88957f8 drm/rockchip: dsi: support read command 
Change-Id: I195b25ecef18978b1801e39ddc3fa37a3ae94050
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
 2018-01-08 20:52:18 +08:00
Zhangbin Tong
472c7e2afa arm64: dts: rockchip: rk3328-evb-android: Adjust temperature control parameters 
Change-Id: I5e153efcdd1b839ddd412c2c0e6b15c69c4fa6b4
Signed-off-by: Zhangbin Tong <zebulun.tong@rock-chips.com>
 2018-01-08 20:51:49 +08:00
Shunqing Chen
2223d1404c power: rk816: add power_supply property for CTS. 
Android8.0 CTS needs to get max charging current,
max charging voltage and battery charge counter.

Change-Id: I83371d5b9f126ee17979f56e92d78b7887c316c6
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
 2018-01-08 17:55:27 +08:00
Finley Xiao
a8c497e79d arm64: dts: rockchip: rk3328: Disable 400MHz and 600MHz for dmc 
400MHz and 600MHz aren't supported at present.

Change-Id: I2420866243bcf389c1f4ae68f322639986d3e41d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2018-01-08 10:32:57 +08:00
Finley Xiao
a1b416e8de clk: rockchip: px30: Add CLK_IGNORE_UNUSED for ddr clk 
Change-Id: Ib53b8b8c24edeb4e1046808ae9ae2736d2fb8df9
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2018-01-08 09:59:42 +08:00
Finley Xiao
32c581e78e soc: rockchip: power-domain: export qos save and restore 
Change-Id: I89af4462f561fa06ace7761e20cf522b5954aaed
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
 2018-01-08 09:35:18 +08:00
Xinhuang Li
7579b0e52a clk: rockchip: rk3328: the group of softrst is 12 
Change-Id: Idec7baa6bb0bb5824270e9cd8f3c6ed38d47ecc1
Signed-off-by: Xinhuang Li <buluess.li@rock-chips.com>
 2018-01-08 09:33:27 +08:00
Huibin Hong
13659af222 serial: 8250: fix bug cpu and DMA read uart fifo concurrently 
Change-Id: I5284caff8cd684e890e6d7136158db042d724f57
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
 2018-01-08 09:17:59 +08:00
Jacob Chen
fc46944d43 media: rockchip: rga: move to rockchip subdir 
Change-Id: I3d9a8b0f046b6b34712d3c3c34ff5c5b468bc048
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 18:00:33 +08:00
Jacob Chen
c392f4255f FROMLIST: ARM: dts: rockchip: add rx0 mipi-phy for rk3288 
It's a Designware MIPI D-PHY, used by ISP in rk3288.

(am from https://patchwork.kernel.org/patch/10119093/)
Change-Id: Ib3386c9c8b58242a2a09bcd3bc7bd66589053a9b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:59:58 +08:00
Jacob Chen
3af6218029 media: rockchip: isp: manual IOMMU management 
Rockchip 4.4 kernel don't support of_iommu,
so we have to manage it manualy

Change-Id: I38e784e97f1df336837c5ded2b47932f6add180f
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Shunqian Zheng
4a44a24fd2 CHROMIUM: media: rockchip/isp1: fixup for different media/v4l API 
Fixup for differences of the previous FROMLIST patches for
rockchip isp1 driver as following,
 - regression of UPSTREAM commits
   + d6dd645eae: ("[media] media: videobuf2: Move timestamp to vb2_buffer")
   + 36c0f8b32c: ("[media] vb2: replace void *alloc_ctxs by struct device *alloc_devs")
   + df9ecb0cad: ("[media] vb2: drop v4l2_format argument from queue_setup")
 - API changes of (4.4 v.s. UPSTREAM)
   + media_entity_pipeline_start/stop() v.s. media_pipeline_start/stop()
   + media_entity_init() v.s. media_entity_pads_init()
   + media_entity_create_link() v.s. media_create_pad_link()
   + media_device_init()
   + entity function flags: MEDIA_ENT_F_IO_V4L and MEDIA_ENT_F_V4L2_SUBDEV_UNKNOWN

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series

Change-Id: I4d9c9f784210fda2165ac5372baea09a9c01a30d
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
4434f478e3 FROMLIST: dt-bindings: Document the Rockchip MIPI RX D-PHY bindings 
Add DT bindings documentation for Rockchip MIPI D-PHY RX

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Rob Herring <robh@kernel.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46239/)

Change-Id: If7ca96f97f3c2f2b475d2a918fdcde1684846701
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
9d502fadd5 FROMLIST: dt-bindings: Document the Rockchip ISP1 bindings 
Add DT bindings documentation for Rockchip ISP1

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Reviewed-by: Rob Herring <robh@kernel.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46233/)

Change-Id: I289c59f503e74671ab6fcfe54370f29ad1cf220b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
f92c8b0016 FROMLIST: media: rkisp1: add rockchip isp1 core driver 
Add the core driver for rockchip isp1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46240/)
Conflicts:
	drivers/media/platform/Kconfig
	drivers/media/platform/Makefile

Change-Id: I09bd87cf0a0557079e93e94a41dc673f36c63f6a
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
68c406aa36 FROMLIST: media: rkisp1: add capture device driver 
This is the capture device interface driver that provides the v4l2
user interface. Frames can be received from ISP1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46232/)

Change-Id: I3ff679d32c48c8dd8e91f22879e58e1b1ef896d7
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
760a375e13 FROMLIST: media: rkisp1: add ISP1 params driver 
Add the output video driver that accept params from userspace.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46241/)

Change-Id: Ibabcbfb8a607da9e51d124bc878dcc09f201c26b
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
d41678365a FROMLIST: media: rkisp1: add ISP1 statistics driver 
Add the capture video driver for rockchip isp1 statistics block.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46242/)

Change-Id: I70f8b17cde2102cee7742101b38a532fb800ff67
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
f508b1a615 FROMLIST: media: rkisp1: add Rockchip ISP1 subdev driver 
Add the subdev driver for rockchip isp1.

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Yichong Zhong <zyc@rock-chips.com>
Signed-off-by: Jacob Chen <cc@rock-chips.com>
Signed-off-by: Eddie Cai <eddie.cai.linux@gmail.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46244/)

Change-Id: I3d4b7aba7ce2d20f1f7c3983ef9bd301c96e5fb3
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
b46ee0e23a FROMLIST: media: rkisp1: add Rockchip MIPI Synopsys DPHY driver 
This commit adds a subdev driver for Rockchip MIPI Synopsys DPHY driver

Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Tomasz Figa <tfiga@chromium.org>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46243/)

Change-Id: Ic5746f1cddf0900054750e9f4e0f0171e5206d70
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jeffy Chen
651e5e14ce FROMLIST: media: rkisp1: Add user space ABI definitions 
Add the header for userspace

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46245/)

Change-Id: I2ae3db2f719c4a5de2dc631a5692b333effe5ea3
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00
Jacob Chen
839b765c64 FROMLIST: media: videodev2.h, v4l2-ioctl: add rkisp1 meta buffer format 
Add the Rockchip ISP1 specific processing parameter format
V4L2_META_FMT_RK_ISP1_PARAMS and metadata format
V4L2_META_FMT_RK_ISP1_STAT_3A for 3A.

Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>

BUG=b:36227021
TEST=Camera works on Scarlet with the whole series
(am from https://patchwork.linuxtv.org/patch/46247/)

Conflicts:
	drivers/media/v4l2-core/v4l2-ioctl.c

Change-Id: I9ede55b68c075e54cefb11edecf5ef68b5452ec4
Signed-off-by: Jacob Chen <jacob2.chen@rock-chips.com>
 2018-01-05 17:57:22 +08:00