Commit Graph

1072511 Commits

Author SHA1 Message Date
Zefa Chen
fee70d173c media: i2c: sc401ai support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I32fd44195becb2f3b33d9a7d4179c7f026bea7fc
2022-09-06 17:12:59 +08:00
Zefa Chen
442572f3ca media: i2c: sc301iot support get channel info
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ida660f06b64b68f3508dd77dfea7e6aec8ba9c3b
2022-09-06 17:12:22 +08:00
Zefa Chen
1f6d411d70 media: i2c: sc301iot support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I614fba82a69a29559dd5eb170632623e9974385e
2022-09-06 17:11:50 +08:00
Zefa Chen
6a17edc2e9 media: i2c: sc132gs support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id5ffd31659d26cf8a4cf4345d646bb9fe8a608f1
2022-09-06 17:10:22 +08:00
Zefa Chen
5097c3461a media: i2c: sc035gs support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I35abf81ea047f7a9cea002aed41c43e693e7b51d
2022-09-06 17:07:37 +08:00
Zefa Chen
3baadab121 media: i2c: sc031gs support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ice76e4bd728f5e1ad5c946eeeb356b4d90873733
2022-09-06 17:06:48 +08:00
Zefa Chen
84a81c0888 media: i2c: sc3338 init cur_fps, fixed error of g_frame_interval
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iefef919fd938bb9f258ca4dae6c673a63a8edf09
2022-09-05 17:57:16 +08:00
Zefa Chen
43bb7cf2fe media: i2c: sc3336 init cur_fps, fixed error of g_frame_interval
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I058ce97c1d59fa95c15d67db067d467ef015cf8d
2022-09-05 17:56:36 +08:00
Zefa Chen
62feb1c904 media: i2c: sc230ai init cur_fps, fixed error of g_frame_interval
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1851281bacaa35566a49a7ff3f4c2790593e407b
2022-09-05 17:46:51 +08:00
Jianqun Xu
dbe1892e27 gpio: rockchip: support acpi
1. support ACPI
2. support 'clock-names' from dt nodes
3. driver works without pinctrl device

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I6eb520632f27ea9ad84f3ee616c631be5d028cf5
2022-09-05 17:23:28 +08:00
Yifeng Zhao
2f5fe2c0bb phy: rockchip: naneng-combophy: config sata2 rate to 6G for rk3588
Fixes: 1a6396458b ("phy: rockchip: naneng-combphy: add support rk3588")
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I9ca63ea12d1b08e8aac5ecb439b4ee1516f11768
2022-09-05 17:09:11 +08:00
XiaoTan Luo
bf5984992b ASoC: rockchip: mdais: add prepare ops
Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Change-Id: I795e9d32ea51a4bf0f229d4e052b52aaeb34df2f
2022-09-05 16:58:42 +08:00
Wyon Bi
843fd2249d phy/rockchip: samsung-hdptx: correct SDC_N
According to the datasheet rev1.05 Table 5-1:
SDC_N is 1 for HBR/HBR2.

However datasheet wasn't correct.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I1cf6d573a6e886a32999dbf1b0e2ad43c5cdc30c
2022-09-05 08:34:19 +00:00
Sach Lin
c440ebcbb8 ARM: dts: rockchip: rv1106-smd-cam: enable rkisp_vir2.
Signed-off-by: Sach Lin <sach.lin@rock-chips.com>
Change-Id: Id3ab5462e1f68d892b17eac31964aeb73d6d8260
2022-09-05 11:02:20 +08:00
Damon Ding
b164346221 drm/rockchip: rgb: add loader_protect support for mcu panel
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ic0e5f48a5324d64d5218b7bd77bc1b4b9ad01fa3
2022-09-05 10:54:19 +08:00
Wang Xiaobin
3f55e852e2 ARM: configs: rv1106-smart-door: enable thunderboot isp
Configured CONFIG_VIDEO_ROCKCHIP_THUNDER_BOOT_ISP=y in rv1106-tb.config,
for kmpp/rockit built-in

Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: Ib3a2265870ec78ece785d2c6152c6aa612f2d14d
2022-09-05 10:53:22 +08:00
XiaoTan Luo
3437162327 ASoC: rockchip: pdm: Fix pop noise in the beginning
Generally, DMICs require some delay to wake up to NORMAL state
after clk enabled (WAKE-UP Time), and it varies per dmic chips,
we should ignore the dirty data in this duration.

This patch introduce "start/filter-delay-ms" to skip the pop noise
in the duration, and export this delay to allow user to change it.

* PDM Start Delay Ms
  a necessary delay for dmics wake-up after clk enabled, and drop the
  dirty data in this duration.

* PDM Filter Delay Ms
  after xfer start, a necessary delay for filter to init and will drop
  the dirty data in the trigger-START late.

e.g.

/# amixer -c 3 contents
numid=4,iface=PCM,name='PDM Filter Delay Ms'
  ; type=INTEGER,access=rw------,values=1,min=20,max=1000,step=1
  : values=20
numid=3,iface=PCM,name='PDM Start Delay Ms'
  ; type=INTEGER,access=rw------,values=1,min=0,max=1000,step=1
  : values=20

/# amixer -c 3 cset numid=4 30
numid=4,iface=PCM,name='PDM Filter Delay Ms'
  ; type=INTEGER,access=rw------,values=1,min=20,max=1000,step=1
  : values=30
...

Signed-off-by: XiaoTan Luo <lxt@rock-chips.com>
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I1b22de7c73cc181d2acd756ee2e32b8361db7822
2022-09-05 10:52:27 +08:00
Jeffy Chen
6f3aa8f570 UPSTREAM: drm/gem: Fix GEM handle release errors
Currently we are assuming a one to one mapping between dmabuf and
GEM handle when releasing GEM handles.

But that is not always true, since we would create extra handles for the
GEM obj in cases like gem_open() and getfb{,2}().

A similar issue was reported at:
https://lore.kernel.org/all/20211105083308.392156-1-jay.xu@rock-chips.com/

Another problem is that the imported dmabuf might not always have
gem_obj->dma_buf set, which would cause leaks in
drm_gem_remove_prime_handles().

Let's fix these for now by using handle to find the exact map to remove.

Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Christian König <christian.koenig@amd.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220819072834.17888-1-jeffy.chen@rock-chips.com
(cherry picked from commit ea2aa97ca3)

Change-Id: I13b922ef9372f6c2b8e08540f085364c41afdfed
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2022-09-05 10:26:27 +08:00
Sugar Zhang
d818ae0e4c ASoC: rockchip: spdif: Add support for full samplerate
This patch add support for 8000 ~ 192000 samplerate.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If588138b186d446b3f86b4e244d71a1ca3715b2e
2022-09-02 17:19:33 +08:00
Sugar Zhang
6c7d5bdf7b ASoC: rockchip: spdif: Add support for format S32_LE
Treat 32 bit sample width as if it was 24 bits using only
the 24 most significant bits.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ica236069b6f0ccfa8635cd89bf11dc59bc054d8d
2022-09-02 17:19:33 +08:00
Sugar Zhang
6938d9c200 ASoC: rockchip: spdif: Fill IEC958 CS info per params
This patch fill IEC958 Channel Status info to fix mismatch
SampleRate measured by Analyzer.

     |  7  |  6  |  5  |  4  |  3  |  2  |  1  |  0  |
CS0: |   Mode    |        d        |  c  |  b  |  a  |
CS1: |               Category Code                   |
CS2: |    Channel Number     |     Source Number     |
CS3: |    Clock Accuracy     |     Sample Freq       |
CS4: |    Ori Sample Freq    |     Word Length       |
CS5: |                                   |   CGMS-A  |
CS6~CS23: Reserved

a: use of channel status block
b: linear PCM identification: 0 for lpcm, 1 for nlpcm
c: copyright information
d: additional format information

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I1e1e3ffb8f3706ae19117c4ae3fc38e20a71f78b
2022-09-02 17:19:33 +08:00
Damon Ding
4501f4263f drm/rockchip: rgb: add debug log for mode_valid func
The debug msg may be like:

rockchip-rgb ff000000.syscon:rgb: [drm:rockchip_rgb_encoder_mode_valid]
*ERROR* mode [320x480] clock 79000 is higher than max_clock 74250

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I179be3bd7bdb5f562c03cb33d30c72364bce74f4
2022-09-02 17:06:24 +08:00
Sandy Huang
060fe22bc9 drm/rockchip: vop: init win axi read id for px30
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic2752ad9472b2b5658a24c18525947da621f367c
2022-09-02 17:06:24 +08:00
Herman Chen
18cd4a3e70 video: rockchip: mpp: Add run begin/end
Disable preempt when schedule task timeout work and start hardware.

On heavy system burden case the kthread may be switched out between
starting timeout work and real hardware starting operation and do not
come back for a long time. This will cause unexpected task timeout.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: I636c80d5230eedd8ef98e1fd3219b83a0b99614a
2022-09-02 17:05:21 +08:00
Huibin Hong
f56620d9d7 rcu: add Kconfig options for sysctl_panic_on_rcu_stall
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Iaae5a7607f0d8c4537676c5f663eefdc0c51848d
2022-09-02 15:36:37 +08:00
Yiqing Zeng
bf33cce3d4 media: i2c: support sc4210 sensor driver
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I455fb50ff40a31b42d088097b43204803c613346
2022-09-02 15:36:14 +08:00
Sugar Zhang
3d27419234 ASoC: rockchip: mdais: Fix residue pop on DRAIN path
There is no need to refine pointer for playback.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iae94a26fbe7e4b667c7b666c80a26e43079263bf
2022-09-02 15:35:57 +08:00
David Wu
d415a6ce86 i2c: rk3x: Add acpi support for rk3x
Use acpi_device_uid() to get i2c bus number for acpi device.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ib7dabbbd2bd781962ee822e6b9b1f12c962aa5e2
2022-09-02 15:35:34 +08:00
Yiqing Zeng
a21360a87c media: i2c: update ov5670 sensor driver
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I9990bb198d99d523dd1acaf1c173d9f8f58ccf37
2022-09-02 15:32:58 +08:00
Wang Xiaobin
dced86fdab ARM: dts: rockchip: add rv1103g-rmsl311-dloc-sl-v10.dts
Signed-off-by: Wang Xiaobin <xb.wang@rock-chips.com>
Change-Id: I6464db605365ab25b7057fcbfd0c92bccd38582e
2022-09-02 14:26:32 +08:00
Cai YiWei
55a9d1b059 media: rockchip: isp: fix size for multi isp composite mode
Change-Id: I18dd3c58e043246a4899e0388c8289f093290577
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-02 14:10:53 +08:00
Wyon Bi
996e337caf phy/rockchip: samsung-hdptx: Increase the phy_rdy timeout to 5ms
We got issue as follows:
[   27.276379] rockchip-hdptx-phy fed60000.phy: timeout waiting for phy_rdy
[   27.276502] rockchip-hdptx-phy fed60000.phy: failed to set lanes: -110
[   27.276537] rockchip-dp fdec0000.edp: analogix_dp_set_lane_count: phy_configure() failed: -110

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I872e721ba70c3dcec290b4dbd4263eba40abd359
2022-09-02 09:43:15 +08:00
Jianqun Xu
28bf3a52e4 arm64: dts: rockchip: px30 set io drive-strength-s for px30s
Set drive-strength for px30, and set drive-strength-s for px30s.

If only drive-strength, that means both for px30 and px30s.
If only drive-strength-s, that means only for px30s.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Idd2437626a28c03624ce0fb41bedf56ec61dabb0
2022-09-02 09:42:39 +08:00
Weiwen Chen
ade6c64f45 ARM: configs: rv1106-battery-ipc: remove low priority driver
[    0.186396] Kernel memory protection not selected by kernel config.
[    0.186426] Run /sbin/init as init process
[    0.186429]   with arguments:
[    0.186433]     /sbin/init
[    0.186436]   with environment:
[    0.186440]     HOME=/
[    0.186444]     TERM=linux
[    0.186448]     user_debug=31
[    0.186452]     storagemedia=mtd
[    0.186456]     rk_cam_w=1920
[    0.186459]     rk_cam_h=1080
[    0.186463]     rk_cam_mirror_flip=1
[    0.186466]     rk_cam_fps_numerator=1
[    0.186471]     rk_cam_fps_denominator=25
[    0.186473]     bw_night_addr=0x01e00400
[    0.186477]     rk_iqbin_addr=0x01e0400c
[    0.187500] process '/bin/busybox' started with executable stack
[    0.212616] start service

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I39f8eb440f97d8a6290bacfd9c23eb206187b74d
2022-09-02 09:38:55 +08:00
Caesar Wang
2313a1daa1 arm64/configs: update rockchip_linux_defconfig
1) disable configs to solve affect pefrormance on unixbench

-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_DEBUG_SPINLOCK=y

2) disable config to solve the regulator warning logs on bootup

-CONFIG_REGULATOR_DEBUG=y

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I1d7c2c3888e125cda2d3e1b7e672ebc74e12834d
2022-09-02 09:35:37 +08:00
Tao Huang
b51dd481da misc: Kconfig: move rk803 to the top
To avoid merge conflict.

Fixes: 0b27ae1db5 ("misc: add driver for rk803.")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I701b82d2dc92f39c91fdfb691aaf3b78282226b7
2022-09-01 20:12:03 +08:00
Liang Chen
284476eef9 video: rockchip: mpp: Add devfreq support for rkvdec2
Also return -EPROBE_DEFER for rkvenc when the regulator is not ready,
so that driver can probe again with devfreq until the regulator is ok.

Change-Id: I3bbf51052a8759260715d2aee40ecfe32290bc4e
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-09-01 15:10:36 +08:00
Liang Chen
3b90e02013 arm64: dts: rockchip: rk3568: correct opp-table for vdd_logic
When dmc is disabled, set rkvdec/venc/npu opp-table to 0
will cause a bad voltage for vdd_logic and system will crash.

Change-Id: Id97f48bceaf18f78c8837d62d5d424e7fc096661
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-09-01 15:04:50 +08:00
Wu Jingchen
f4c9efb4c0 arm64: dts: rockchip: px30: Add the CIF clock signal strength
Change-Id: I80553627d258e54739af328f01fbacf550da8e5e
Signed-off-by: Wu Jingchen <oven.wu@rock-chips.com>
2022-09-01 15:04:03 +08:00
Wu Liangqing
14335f544f arm64: dts: rockhip: rk3326-evb-lp3-v10: add test-power
Change-Id: I5c4685f23e9a221fb497a04d905fb3e30b46a747
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2022-09-01 14:55:47 +08:00
Binyuan Lan
493df3aee3 amr64: dts: rockchip: px30-evb-ddr3-v10: add test power
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I60106f13af425e9578703ec667cf4657deb8a5c7
2022-09-01 14:55:22 +08:00
Zefa Chen
ad2c983a9e media: i2c: sc4336 remove g_frame_interval's metex
g_frame_interval may be called by interrupt function

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If0cf7d27edd22108aef0cb15d9f03ee251ad2b8a
2022-09-01 14:52:42 +08:00
Zefa Chen
ffd4aa940d media: i2c: sc3338 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic2ca1b79f75a9831c01796ec6e7f62908fbbd0e5
2022-09-01 14:52:42 +08:00
Zefa Chen
c1250fd2fe media: i2c: sc3336 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I024dd19944270419c8c8882b71e15e4753dfaeb6
2022-09-01 14:52:42 +08:00
Zefa Chen
60c0ca59d2 media: i2c: sc230ai support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I1302b46ab2ff7d62f5bbd7b5f5eb6687be865775
2022-09-01 14:52:42 +08:00
Lin Jianhua
5986b02b31 arm64: dts: px30-evb-ddr3-v10-linux: add rockchip,camera-module-xxx for ov5695
camera driver need attributes of rockchip,camera-module-xxx

Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I96863ae665b825328752979035fba665c5baf4aa
2022-09-01 14:39:03 +08:00
Addy Ke
b310fe79b2 net: can: rockchip: fix up the canfd/can BUS_OFF_INT error
BUS_OFF_INT is BIT(9), so 'isr' and 'isr_int' should NOT be u8.
Also err_int should add BUS_OFF_INT.

Signed-off-by: Addy Ke <addy.ke@rock-chips.com>
Change-Id: I7462bb68ca6a710c0b72179cc5440fce7067a0e8
2022-09-01 10:57:22 +08:00
Cai YiWei
e4ca020f82 media: rockchip: isp: fix mi no disable for multi sensor unite mode
Change-Id: I71291abf995bd1f1bf3dd053fa9232a6375d5c5c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-01 10:55:45 +08:00
Cai YiWei
a1cdd590aa media: rockchip: isp: fix isp32 stream force to update enable
only force to update address at stream on.
force update enable during mid-frame will be error.

Change-Id: Ia521a5f70cdd0366d667ea915abbf463df022a22
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-01 10:55:45 +08:00
Cai YiWei
d1c880c697 media: rockchip: isp: fix limit of dcrop
Change-Id: Id378a98d65bc3d3d39b1f21387e6c94822aedbcd
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-01 10:55:45 +08:00