Commit Graph

1060151 Commits

Author SHA1 Message Date
Zefa Chen
95bfb5ca3a media: rockchip: cif supports dummy buffer configurable
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icc62c1324affd65934872dfb7c1d29f15e28bb3b
2021-09-08 12:36:16 +08:00
Zefa Chen
d3556d4c45 media: rockchip: cif: fixed vc err in linear mode, if sensor driver not had vc config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5f0e383d8493958abfee7b62cdbd4ceb74f84b28
2021-09-08 12:36:12 +08:00
Zefa Chen
9d80283aaa media: rockchip: cif: fixed vc err in HDR mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id4f8403d9449179f2572994d2cea6fb9c8f95ca1
2021-09-08 12:36:06 +08:00
Zefa Chen
d79f947fa7 media: platform: cif: mipi support interlaced capture
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I72e96b45faaf43b50f40cf978ab11717c409d5a0
2021-09-08 12:36:01 +08:00
Zefa Chen
17ffa46a0f media: platform: cif: add dummy buf only for BT.656/BT.1120 multi channels function
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I67eacd18cc2bcae51302911b2b4490314d678362
2021-09-08 12:35:56 +08:00
Hu Kejun
41c899db24 media: rockchip: cif: support pdaf/embedded data
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I039388158c3febfab8a7cd3f9c53edbeced70a4a
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:51 +08:00
Allon Huang
477b66075a media: platform: rockchip: cif: add keeping time to csi2 err for resetting
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0ecd5aad0a91553b8a978c23aceae8c5451892f5
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:45 +08:00
Zefa Chen
454228fa8d media: rockchip: cif: mipi wakes up buf by line int
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If10afeec22ce89a52f7c0e0e454005ca3c3cdc5e
2021-09-08 12:35:41 +08:00
Wang Panzhenzhuan
17f00b1208 media: platform: cif: fix multi dev issue
if rkcif_dvp & rkcif_mipi_all registered,
close rkcif_dvp streams alone can't reset rkcif,
only rkcif_dvp & mipi dev all close can do reset.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I103ca247a0866629d351699f752293af028d29d5
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:37 +08:00
Zefa Chen
a161ffb09f media: rockchip: cif: remove dummy buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib1cdf85020d37a7a4a06b726fb88597797806411
2021-09-08 12:35:33 +08:00
Zefa Chen
6599eeb492 media: platform: cif fix fs/fe count error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I56a6f5de22065f246a419f698385e3620142fd57
2021-09-08 12:35:30 +08:00
Wang Panzhenzhuan
a3c07a7015 media: platform: rockchip: cif: fix rk356x iommu issue
when open video0/1/2/3 first, then close it;
if reopen video0, the output data is green;
if not enable iommu, it's ok; fix it;

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ib977c34f005548bbc21cc93ca39c10d871235ad9
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:25 +08:00
Allon Huang
544e61d0d1 media: platform: rockchip: cif: set stopping time out as fps when reset cif
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I1376766c27ba08453a6d2b93ea5a5a3d188a1c42
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:18 +08:00
Allon Huang
f5cc594e92 media: platform: rockchip: cif: do reset when mipi fs & fe are not paired
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: If22316faffcdeb5a619d214eb8b650f300d1c41c
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:11 +08:00
Allon Huang
538055d4ed media: platform: rockchip: cif: fix iommu lose effectiveness when do cru reset
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I9e116d4ea8af2bac787fb9df18fede3637f27c3c
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:06 +08:00
Fenrir Lin
de69ad092a media: platform: rockchip: cif: avoid initcall later than isp
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ic69f50d9d2c9b87d1e701badab6d2538f5c191ed
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:35:01 +08:00
Vicent Chi
80902a9714 media: platform: cif: hotplug reset add quick stream opt
Change-Id: I7934ddc2fe13cdf7fe4e0b763ba3286203c24741
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:55 +08:00
Allon Huang
c80f1d408b media: platform: rockchip: cif: mipi csi host add cru rst
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I8ad52b91d9f01c29b6316999f6983bb04eb6433d
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:49 +08:00
Allon Huang
e30781e6e9 media: platform: rockchip: cif: register cif itf dev when clear unready subdev
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Icc051ac055cbfea78305327ebe8554d2d0963dc4
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:39 +08:00
Cai YiWei
6d286b1877 media: rockchip: cif: dma buf alloc limit to DMA32
Change-Id: I0974f59ba1cba4caf62d098c37ee2263fb481a5b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:34 +08:00
Allon Huang
85614bd955 media: platform: rockchip: cif: fix panic when frm0/frm1 end occurr at the same time
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0f77fbd0c8e847f88df921fa70f817fa79672634
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:29 +08:00
Wang Panzhenzhuan
cab7ed686c media: platform: rockchip: cif: distinguish multi id mode 2 & 4
According test, if sensor output 2mux mode, cif needs to be
configured BT656_1120_MULTI_ID_MODE_2, nor no interrupts will be
triggered. So BT656_1120_MULTI_ID_MODE_2 & BT656_1120_MULTI_ID_MODE_4
is different, distinguish it.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I8e1959131708d2cab87ab086e03023a718f5b807
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:23 +08:00
Wang Panzhenzhuan
7f1ef00ce6 media: platform: rockchip: cif: fix rk3568 missing reg
rk3568 CIF_REG_GRF_CIFIO_CON1 reg has been omitted, fix it.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ib489312ae129fd522c7d23f55d14a7852086df25
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:16 +08:00
Allon Huang
d78e75dd6f media: platform: rockchip: cif: optimize dts parameters config
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I2a8f471e52c2099f562f1bf765ea0c3e5d9e5845
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:12 +08:00
Allon Huang
077f52e6d2 media: rockchip: cif: add dynamic cropping function
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ied69eef87b59f088e8e160b2631ad29127b03254
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:09 +08:00
Vicent Chi
6a7992e122 media: platform: cif: not allow reset work after all streams off
Change-Id: Ifceccb3788dae7a95dae09a0c524a52b33808a26
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:34:03 +08:00
Allon Huang
82cb10f7bc media: platform: rockchip: cif: support bt656/bt1120 multi channels function
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0eb7c4d2a9d5d99eb69627741febedc09133ff21
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:33:59 +08:00
Allon Huang
719446d5ff media: rockchip: cif: fix rk356x dvp pclk polarity
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ia5a41bf7b428c61d4b79911a88f9b93928de0ac6
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:33:55 +08:00
Allon Huang
dd88cbecb3 media: platform: rockchip: cif: support YUYV for y swap in bt1120
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I7a38f3a881be0689f3bf37736944cd7563c644ea
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:33:50 +08:00
Allon Huang
de6d5e60bd media: platform: rockchip: cif: register sd itf when cif pipeline completed
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I4025d325f0e5dee52a692a302a5cef699adfd6c9
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 12:33:44 +08:00
Yiqing Zeng
5da02d2d36 media: i2c: os02g10 fix set flip/mirror failed bug and fix wrong vts_def
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ie143b7311798eb328f665772caeaaf49f412b8f3
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:38:35 +08:00
Yiqing Zeng
ef3281ea22 media: i2c: os02g10 update init setting
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: If0465c723970e5027d051eabfc039d9c29c68295
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:38:28 +08:00
Zhichao Yu
26155ac228 media: i2c: jx_h62: fix set gain bug
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I2375125c5eafea26c983ef6f08a0ba88c4ccec7d
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:38:24 +08:00
Zhenke Fan
6d8f26ae16 media: i2c: imx415 add 1080p binning mode
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I5b4a1f2c728d6f45406c2efd5c3cc9c9306ccb3a
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:38:19 +08:00
Zefa Chen
eb6475f317 media: i2c: imx415: support get sony BRL
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6045b794e7c482ee63058ded7f654b55c2f604d8
2021-09-08 11:38:14 +08:00
Vicent Chi
37b1459ded media: i2c: imx415: support thunderboot mode
Change-Id: I1634a985880d63c1f1d2873a63923fe87dc7fe68
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:38:11 +08:00
Zefa Chen
1e8335c0a1 media: i2c: imx415 add HDR exposure exception handling
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I76dea27e13442d5907cead4c7d7bd9d8b6e0696b
2021-09-08 11:38:02 +08:00
Wang Panzhenzhuan
dfd3780492 media: i2c: gc2375h: fix vblank set issue
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Idf54706a751766fd4a0221eb42a7035989c45c34
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:37:54 +08:00
Wang Panzhenzhuan
6cc30a8d4e media: i2c: gc2093: update sensor driver
1. fix linear mode ae flicker issue.
2. add hdr mode exposure limit issue.
3. fix hdr mode highlighting pink issue.
4. add some debug info.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I270501bfc382f6d811d4267469cc9406cf6e99c7
2021-09-08 11:37:36 +08:00
Yiqing Zeng
41229eb2d3 media: i2c: imx347 fix setting flow error and fix hdr gain error
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: Ib0f17bc1ce74dea8caad414c1d3b66a81c10e85c
2021-09-08 11:35:33 +08:00
Zefa Chen
b77efbebd4 media: i2c: imx335 increase hdr exposure restrictions
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia097778ddd050a566801cede46f575f6954b01d7
2021-09-08 11:33:49 +08:00
Zefa Chen
724748e1be media: i2c: imx317 fixed g_mbus_config error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5e66d8f19740bb5c309b037fc6e706fc8b215b15
2021-09-08 11:33:22 +08:00
Wang Panzhenzhuan
b16882debb media: i2c: gc032a: set default stream off state
Set sensor in stream off state by default,
to avoid sending abnormal data in the early stage.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Iaae2fd3be95a5fcac05ebaf39a68614b7b807d4a
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:33:17 +08:00
Zhenke Fan
3994ca3b66 media: i2c: gc4c33 update init register array
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I39690784108651e2ea63cbcd71ac5215f60d9db7
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:33:11 +08:00
Wang Panzhenzhuan
c6b3b80825 media: i2c: gc2385 match vts and 30fps strictly for cts
fix cts  CaptureRequestTest#testEdgeModeControl[1] &
CaptureRequestTest#testNoiseReductionModeControl[1]  failed
failed log:
Frame duration must be in the range of [33333333, 66666666],
value 32813000 is out of range [32833332, 67666664])

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Icdc6a89f33d6d0fd8332c51033afe6303e246ce3
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:32:56 +08:00
Zefa Chen
19c55f5526 media: i2c: gc02m2 fixes the base value of digital gain to avoid purple in the light
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I524ba475291fd6d0e154b9276e099f81c1fae301
2021-09-08 11:32:31 +08:00
Wang Panzhenzhuan
2052425b68 media: i2c: gc8034: add 2lane support
1. add 2lane support
2. add some debug info
3. adjust gc8034_g_mbus_config function

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7f40c2c9ce0aea543ea629efb46585ebee387515
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
2021-09-08 11:32:27 +08:00
David Wu
3b595992f2 arm64: dts: rockchip: rk3588: Add gmac0 and gmac1 nodes at dtsi level
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I53f1f378b9c524ddf6d1da7da6e2bf2d498162ad
2021-09-08 10:57:00 +08:00
David Wu
2627dcd2c9 net: ethernet: stmmac: dwmac-rk: Add gmac support for rk3588
Add constants and callback functions for the dwmac on RK3588 soc.
As can be seen, the base structure is the same, only registers
and the bits in them moved slightly.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I17665f22972d2eeba40241af4f6a8634c71733f4
2021-09-08 10:55:49 +08:00
Simon Xue
19cb6e3579 iommu: rockchip: optimise getting clocks
Use devm_clk_bulk_get_all instead of devm_clk_bulk_get. So we don't need
the complicated operation.

Change-Id: Idbe7668bd26b744f8d8b7d79d5eb99fa891bd0be
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2021-09-08 10:45:44 +08:00