Commit Graph

1066425 Commits

Author SHA1 Message Date
Zefa Chen
fe3602cf12 media: rockchip: vicap fixed issue of sditf async to isp
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If650530feba615c5cc92770f8378a1cc354ed010
2022-06-13 14:56:53 +08:00
Cai YiWei
201d45e4d4 media: rockchip: isp: fix isp32 stream buf update double
Change-Id: Ie6d5e6a411f071777756da6e92cc451507118236
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-13 14:54:49 +08:00
Cai YiWei
78bb39759a media: rockchip: isp: thunderboot for isp32
Change-Id: Id9e7ee4f009ae18f4943ac3252ee766ea4532b80
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-13 14:53:16 +08:00
Cai YiWei
9fde394414 ARM: dts: rockchip: rv1106-thunder-boot: add isp thunder boot node
Change-Id: I9a23b06703e87dbe7dd2980ae80a8bcdfdbcda72
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-13 14:52:13 +08:00
Jianwei Fan
f9d6f92544 media: rockchip: vicap add CSI RGB888 format input support
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Iaaaf63a380e3c8de461f1c5a651a1f7efc313773
2022-06-13 14:47:03 +08:00
Zefa Chen
653c8f5871 media: rockchip: vicap fixed hdr err with group mode
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3720c692dbd480067f65fc6c8800b7085ffa783a
2022-06-13 10:05:18 +08:00
Wang Panzhenzhuan
016f705b4c media: i2c: gc8034: add 2lane full 30fps & rk otp support
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I215e3fc9442c93450e45f3b06579403fcc9f2d02
2022-06-10 17:46:59 +08:00
Lin Jinhan
e21704dc6a ARM: dts: rockchip: rv1106-smd-cam: disconnect sc132gs from isp
sc132gs is an IR sensor that no need to process by isp.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I43eadf141556e607f81e281030b1bf292b711bc1
2022-06-10 17:26:31 +08:00
Joseph Chen
c7d3eae2d2 clk: rockchip: rk3588: Fix coding style
Use its own RK3588_PLLCON(), maybe RK3399_PLLCON() was
brought when copy RK3399 code.

Fixes: 58c1fa2ef2 ("clk: rockchip: add pll type for RK3588")
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I551c1d39073f2eba4837bd702f9c2172bfecbd65
2022-06-10 17:24:27 +08:00
Zhang Yubing
77ac72f1ec drm/rockchip: logo: attach crtc to drm state earlier
When the connector is disconneted, the crtc->state->state will be used
before it assignment a value, which will cause a NULL ppinter issue,
the dumpstack as follow:

[    3.015805][    T9] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000048
[    3.024448][    T9] Mem abort info:
[    3.024821][    T9]   ESR = 0x96000005
[    3.025176][    T9]   EC = 0x25: DABT (current EL), IL = 32 bits
[    3.025725][    T9]   SET = 0, FnV = 0
[    3.026076][    T9]   EA = 0, S1PTW = 0
[    3.026434][    T9] Data abort info:
[    3.026771][    T9]   ISV = 0, ISS = 0x00000005
[    3.027190][    T9]   CM = 0, WnR = 0
[    3.027530][    T9] [0000000000000048] user address but active_mm is swapper
[    3.028194][    T9] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[    3.028764][    T9] Modules linked in:
[    3.029140][    T9] CPU: 2 PID: 9 Comm: kworker/u16:1 Not tainted 5.10.66 #234
[    3.029797][    T9] Hardware name: Firefly ITX-3588J HDMI(Android) (DT)
[    3.030417][    T9] Workqueue: events_unbound deferred_probe_work_func
[    3.031018][    T9] pstate: 00c00009 (nzcv daif +PAN +UAO -TCO BTYPE=--)
[    3.031638][    T9] pc : drm_atomic_get_crtc_state+0x1c/0x104
[    3.032175][    T9] lr : vop2_crtc_loader_protect+0x160/0x34c
[    3.032700][    T9] sp : ffffffc0124737b0
[    3.033074][    T9] x29: ffffffc0124737b0 x28: ffffff80052db108
[    3.033629][    T9] x27: dead000000000100 x26: ffffff80061da400
[    3.034192][    T9] x25: ffffff8006208a60 x24: ffffff80062189b8
[    3.034756][    T9] x23: 0000000000000000 x22: 0000000000000001
[    3.035320][    T9] x21: ffffff8006208880 x20: ffffff8006210080
[    3.035882][    T9] x19: ffffff80062108e0 x18: ffffffc0124250a0
[    3.036444][    T9] x17: 0000000000000040 x16: 0000000000000000
[    3.037005][    T9] x15: 0000000000000001 x14: 0000000000000010
[    3.037567][    T9] x13: 0000000000000010 x12: 0000000000000010
[    3.038118][    T9] x11: 0000000000000001 x10: 0000000000000000
[    3.038680][    T9] x9 : 0000000000000002 x8 : ffffff8005726800
[    3.039232][    T9] x7 : 0000000000000020 x6 : 0000000000000000
[    3.039782][    T9] x5 : 0000000000000020 x4 : 0000000080000000
[    3.040345][    T9] x3 : 0000000000000020 x2 : 0000000000000001
[    3.040907][    T9] x1 : ffffff80062108e0 x0 : 0000000000000000
[    3.041466][    T9] Call trace:
[    3.041774][    T9]  drm_atomic_get_crtc_state+0x1c/0x104
[    3.042261][    T9]  vop2_crtc_loader_protect+0x160/0x34c
[    3.042752][    T9]  rockchip_drm_show_logo+0x11e8/0x18e4
[    3.043239][    T9]  rockchip_drm_bind+0x488/0x57c
[    3.043673][    T9]  try_to_bring_up_master+0x16c/0x1b4
[    3.044148][    T9]  __component_add+0xc0/0x188
[    3.044556][    T9]  component_add+0x18/0x28
[    3.044944][    T9]  dw_dp_probe+0x5ac/0x5bc
[    3.045331][    T9]  platform_drv_probe+0x9c/0xc4
[    3.045761][    T9]  really_probe+0x204/0x510
[    3.046158][    T9]  driver_probe_device+0x80/0xc0
[    3.046588][    T9]  __device_attach_driver+0x118/0x140
[    3.047062][    T9]  bus_for_each_drv+0x84/0xd4
[    3.047469][    T9]  __device_attach+0xc0/0x158
[    3.047876][    T9]  device_initial_probe+0x18/0x28
[    3.048317][    T9]  bus_probe_device+0x38/0xa0
[    3.048723][    T9]  deferred_probe_work_func+0x80/0xe0
[    3.049202][    T9]  process_one_work+0x1f4/0x490
[    3.049631][    T9]  worker_thread+0x324/0x4dc
[    3.050039][    T9]  kthread+0x13c/0x344
[    3.050403][    T9]  ret_from_fork+0x10/0x30

Attaching crtc to drm state earlier to avoid attaching the drm state
failed if the function is not normally return.

Fixed:
commit 0a196311ef ("drm/rockchip: logo: attach crtc to drm state")

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I53211f91089143b093e74bf5016cacf8c677dc74
2022-06-10 11:41:25 +08:00
Cai YiWei
24275dd459 media: rockchip: isp: fix cac on/off for isp32
Change-Id: Ic5647d161c71d01c4fcfea519e4b17c2b3ce5a2b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-10 11:38:32 +08:00
Cai YiWei
d07683b395 media: rockchip: isp: fix hold at lsc ram data config
isp_raw_clk auto-gate and lsc ram config need lsc enable

Change-Id: Id257c40bea4fea0bf89b799bbcb127a4827d5394
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-10 11:38:32 +08:00
Zefa Chen
11ee607656 media: rockchip: vicap optimize print of csi2
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I95e4b2d7a65f25074ee196af6cada345b7462ba3
2022-06-10 11:30:21 +08:00
Lin Jinhan
cb39ed0640 ARM: dts: rockchip: rv1106-smd-cam: modify gc2093 module name
rockchip,camera-module-name = "SIDA209300461";
rockchip,camera-module-lens-name = "VB";

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I5a892722690b3f9383a810eb48fb05b7acce6056
2022-06-10 11:28:03 +08:00
Algea Cao
029514d144 phy: rockchip-samsung-hdptx-hdmi: Fixed frequency setting err when 10bit deep color mode
Don't set the frequency to 1.25 times in hdptx_phy_clk_set_rate,
hdptx_ropll_cmn_config has already done this.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ic9728308ca88edb158f11f70af6d9d7b95825ef9
2022-06-10 11:27:43 +08:00
Finley Xiao
24f9c771cc ARM: dts: rockchip: rv1103: Change CLK_339M_SRC to 264MHz
ISP's parents are CLK_339M_SRC and CLK_200M_SRC, 4M/30fps requires
264M for better power and performance. But it can only get 200M as
CLK_200M_SRC is the closest clk src than CLK_339M_SRC.

CLK_339M_SRC only outputs for ISP and VICAP modules, it's fine to
change CLK_339M_SRC to 264MHz.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I9d349ec7e1dc29f2f6ecdda954a6c0419b9b7d89
2022-06-10 11:27:12 +08:00
Wang Xiaobin
4e9a347fc0 ARM: configs: rv1106-smart-door: disable SQUASHFS
Startup time  : almost unchanged (<1ms).
Firmware size : reduce about 7KByte.

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I6b744b3069c4bdda4714c9674735e68a057e1b2d
2022-06-10 11:24:33 +08:00
shengfei Xu
c8d77f93a6 rtc: rockchip: fix the rtc status error
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I26837e185488db88d42ba413653cb456d713fce2
2022-06-10 11:24:02 +08:00
Wyon Bi
f2f7eb7445 drm/bridge: maxim-max96745: Fix bridge chain detect
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ibd402916ff6aeb5c4ff8ee12ebc58726968d9e7b
2022-06-10 11:03:53 +08:00
Yu Qiaowei
65bcc903ef video: rockchip: rga3: fix load imbalance
Fix wrong matching core when todo_list has 0 jobs.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iaecbe6457a5076a5fe39b26e03fef44cf3c6ecd9
2022-06-10 09:51:38 +08:00
Cai YiWei
fb5930538f media: rockchip: isp: remove stream limit for dvbm for isp32
Change-Id: If1cf55d009b93dafe86fd9fee4b1f435fb4621c7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-10 09:16:01 +08:00
Finley Xiao
ad1d7cf016 soc: rockchip: power-domain: init qos when pd is on
Fixes: 4910bdcba8 ("soc: rockchip: power-domain: support qos init")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I282a3047b4c5c8b35bf5f8c2e6c3b5fca0d89ab7
2022-06-09 17:17:29 +08:00
Alex Zhao
88a24df15d net: wireless: update bcmdhd driver to 101.10.361.16
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I34dd170252d524b0146c6017f735c2b2b98e9a20
2022-06-09 17:15:03 +08:00
Luo Wei
2ed024b263 arm64: dts: rockchip: rk3588-vehicle-evb: Fix usb otg0 adb problem
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I47580962cb552dc5459c6ed53ae18ff8e101e529
2022-06-09 15:33:49 +08:00
Cai YiWei
1b117c46fb media: rockchip: isp: tb helper add clk on/off
Change-Id: I63ada7e82d79c23a986259764220093c693689a7
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-09 15:33:36 +08:00
Ziyuan Xu
8766dc266e ARM: configs: rv1106: Enable SC230AI camera
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I0a7c177429590820ac7d1674b9b834d03616cc2d
2022-06-09 15:25:02 +08:00
Ziyuan Xu
91c1ed9683 ARM: dts: rockchip: Add support for RV1103G Battery IPC board
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I48fa76beb9ade9cfb8325002a6b9128eccf52700
2022-06-09 15:25:02 +08:00
Cai YiWei
4067aafefc ARM: configs: rockchip: rv1106-tb.config: enable isp tb
Change-Id: Idfb59cdc08f4edccc831bf9d5d9e8f377b1a8ff9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-06-09 14:19:05 +08:00
Yu Qiaowei
21eb6790e2 video: rockchip: rga3: Fixed RGA3 colorkey B/G channels being swapped
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ib1613050705958e9bce01f85e70815e35cf5d216
2022-06-09 11:25:32 +08:00
Jon Lin
8e82d2fc9f spi: rockchip: Disable local irq when pio write out of interrupt service
Avoid interrupt come and interrupt the pio_writer.

Change-Id: I39047937adeb7f56ada97df92b0188b75182b216
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-06-09 11:01:38 +08:00
Wang Panzhenzhuan
0b183142c7 dt-bindings: media: i2c: add cn3927v
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If99caf595d7d56b7ac218dd8b4c3337711b71f2e
2022-06-08 17:35:19 +08:00
Wang Panzhenzhuan
f4fb5b28c2 media: i2c: add vcm driver cn3927v
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Iebe883899e7f9bd7ba85142f030129b6c4bf02ea
2022-06-08 17:35:11 +08:00
Zefa Chen
b9b5037f47 media: rockchip: vicap add pipe power control and do reset after power on
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia5723fd08d4d70feef131976f30e31755c9d2ff3
2022-06-08 17:32:04 +08:00
Zefa Chen
074d4e99d0 media: rockchip: vicap remove reset control when probe
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I49c6799ac458280eaa8a3cf5dbd373aca3eb01d1
2022-06-08 17:29:18 +08:00
Lian Xu
8ce0498cb2 media: i2c: sc230ai 120fps
Change-Id: I3240f4321d5b6d7a20ced8d28b4cdc31f7e942fe
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2022-06-08 17:28:31 +08:00
Zefa Chen
108a5e76ba media: i2c: sc230ai add thunderboot control
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ifb590a296870b731b56ad0864d3e00922c1ffe58
2022-06-08 17:28:31 +08:00
Chuanhu Sun
892023e114 media: rockchip: isp: rockit: support set wrap_line
Signed-off-by: Chuanhu Sun <aaron.sun@rock-chips.com>
Change-Id: I83eeb3f3a1d748f505f29136c8e8a84f0d677930
2022-06-08 17:20:43 +08:00
Sach Lin
e4e56e9677 arm64: dts: rockchip: add rk3588 evb7 8 camera dts
dts: rk3588-evb7-cam-8x.dtsi
rk3588-evb7-lp4-v10-rk1608-ipc-8x-linux.dts.

Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: I60f1bdaba11d755ec09b667b85b316cc951783ba
2022-06-08 14:31:32 +08:00
Wang Xiaobin
577f00f69e ARM: dts: rockchip: rv1106g-smart-door: bootargs add rk_dma_heap_cma=24M
1. remove unused bootargs
 2. add rk_dma_heap_cma=24M

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Signed-off-by: Elon Zhang <zhangzj@rock-chips.com>
Change-Id: I6a812458d044edc4de35259b0738d665ca02ad39
2022-06-08 14:19:15 +08:00
Guochun Huang
eca9d7b1be drm/bridge: maxim-max96755f: Add drm_connector support
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Ie88633da1e20a74768ffb3617ee5baf8d8f325dc
2022-06-08 14:16:16 +08:00
Shaoxing Chen
4648602e6f ARM: configs: rv1106-smart-door: enable rfkill
Kernel image size increase: 7KB
Kernel boot up time increase: 1ms

Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: I316f4091e2dfcb1b1a7c807bf46e8fd9c5005d93
2022-06-08 10:35:59 +08:00
Shaoxing Chen
33ebec5088 ARM: dts: rockchip: rv1106g-smart-door-lock-rmsl: add wireless-wlan node
Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: I07f6f46cb5bb2f8e5da5c04780eab514677f3f4a
2022-06-07 18:00:25 +08:00
Chen Shunqing
ee7fc73e2f drm: rockchip: rk628: fix warning of missing error code 'ret'
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I9d0001ed94ac0e2d885e62f22e3363a3421f89c8
2022-06-07 16:00:26 +08:00
Tao Huang
6a7c205275 drm/rockchip: vop: fix missing error code 'ret' warning on vop_create_crtc()
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie91f2e00e083d8262fb2ef71262edaa8ac655229
2022-06-07 15:59:09 +08:00
Lin Jianhua
f04923e211 ARM: dts: rockchip: rk312x: fixup error of TXD1 pinctrl about rmii
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: Ic1c07df7d2ebdf6653369d15997baf47f083779d
2022-06-07 15:58:52 +08:00
Finley Xiao
d0137fb9f3 clk: rockchip: pll: Don't power down pll when clk change fracdiv in rockchip_pll_clk_compensation()
Fixes: 2a8e2fccde ("clk: rockchip: Add support for clk compensation")
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I0c24a0e1b30a461d44bf74919f2cac44570bacc5
2022-06-07 15:24:42 +08:00
Sach Lin
9e5f4158cf media: i2c: add preisp dummy sensor to Kconfig and Makefile.
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: Iaea69ab976713d7fb7eb3c63baa1bb73643bf360
2022-06-07 14:59:10 +08:00
Sach Lin
2cfc358387 media: spi: rk1608: add virtual sub sensor for dsp combine mode.
dts example:
virtual-sub-sensor-config-0 {
    id = <1>;
    in_mipi = <2>;
    out_mipi = <1>;
};

Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: I990c2969783301816560514a0be986bf61cd4192
2022-06-07 14:58:22 +08:00
Lin Jinhan
0ed2bfbb09 media: i2c: sc132gs: add 2 lane mode as default
In 1-lane mode, the cif module can detect only SOT but not EOT.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ie745e3b6fe6d60013efc33bfc6683651c515dc45
2022-06-07 14:30:36 +08:00
Yu Qiaowei
ec95a87378 video: rockchip: rga3: Fix rga_mm_map_virt_addr cannot return error code.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie39e159b9c501c06869176a80c08170df6b5bb48
2022-06-07 14:29:17 +08:00