Commit Graph

1072568 Commits

Author SHA1 Message Date
Su Yuefu
fea88dfd42 ARM: configs: rv1106-battery-ipc.config: update use sc3338 default
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I3ca8bd001c825ef55b72a22f735fba2faf52140c
2022-09-09 19:56:09 +08:00
Ziyuan Xu
58c3eecac4 ARM: dts: rockchip: rv1106-thunder-boot: export reset and reserved_mem node for tb_service
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ie1bc97c536fa2e48331ff9e3fe41b70b8c8f5886
2022-09-09 19:55:20 +08:00
Ziyuan Xu
2ff8d70db7 soc: rockchip: tb_service: clean up mcu's resource after mcu is done
1. make sure mcu is wfi
2. reset the mcu
3. free the reserved memory

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ia1f0db91789f142cfb567ac9f2b777a923c2435b
2022-09-09 19:54:55 +08:00
Weiwen Chen
2df80b27a1 ARM: dts: rockchip: rv1106g-evb2-v10: update memory layout and sensor
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I717fb0217aa8001cd2f2824d0fc0848bef15b7c9
2022-09-09 19:54:55 +08:00
Lin Jinhan
4596f91c3d crypto: rockchip: add async_req NULL check
Change-Id: Ie27402f25e0c0c8440f5e299694d91719514bc32
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2022-09-09 17:58:52 +08:00
Lin Jinhan
965f3dc100 crypto: rockchip: add procfs info
cat /proc/rkcrypto will show crypto debug info.

Change-Id: I1a295ccf5b8c71036892e866b46d5427d5e53e93
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
2022-09-09 17:58:52 +08:00
Lin Jinhan
9a4df920b5 hwrng: rockchip: poll uses a uniform interface to read registers
use rk_rng_readl as uniform interface for read registers.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: If3f4225d10153d469bb56967aa5abcea8f23d572
2022-09-09 17:58:51 +08:00
Lin Jinhan
06e1313973 crypto: rockchip: poll uses a uniform interface to read registers
Use CRYPTO_READ or PKA_READ as uniform interface for poll function.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I47e9e1efd0b4c66efe59eac3253fdaf2723e5c45
2022-09-09 17:58:51 +08:00
Chen Shunqing
1ea2169bc2 drm/bridge: synopsys: dw-hdmi-qp: disabel hpd irq when shutdown or suspend
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: Ib35f11e376758560b7907684e58f31b04261c066
2022-09-09 15:39:42 +08:00
Binyuan Lan
921b6ae03e ASoC: rockchip: rk817-codec: enable mclk when reset
Solve the problem that LRCK level amplitude is not enough

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: Id79df3de70cd525e1d5425d4177d774a514c45da
2022-09-09 15:38:20 +08:00
Binyuan Lan
05446cfe5a ASoC: rockchip: rk817-codec: Add version recognition and set up different PLL configurations
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I0209db73994e428b25e9cba4417f0f3dd98fb3dc
2022-09-09 15:38:06 +08:00
Sugar Zhang
8661e36ef0 ASoC: rk817: Move dbg message into CONFIG_SND_DEBUG
$ ./scripts/bloat-o-meter rk817_codec.o.old rk817_codec.o
add/remove: 5/9 grow/shrink: 1/13 up/down: 221/-1846 (-1625)
Function                                     old     new   delta
__UNIQUE_ID_author400                          -      56     +56
__UNIQUE_ID_file401                            -      50     +50
__UNIQUE_ID_description399                     -      50     +50
__UNIQUE_ID_license402                         -      29     +29
rk817_playback_path_put                      832     860     +28
__UNIQUE_ID___addressable_rk817_codec_driver_init398       -       8      +8
dbg_enable                                     4       -      -4
__UNIQUE_ID___addressable_rk817_codec_driver_init399       8       -      -8
__param_str_dbg_level                         24       -     -24
__UNIQUE_ID_license403                        29       -     -29
__UNIQUE_ID_dbg_leveltype397                  37       -     -37
rk817_remove                                 260     220     -40
rk817_probe                                  344     304     -40
__param_dbg_level                             40       -     -40
rk817_platform_shutdown                      104      56     -48
__UNIQUE_ID_file402                           50       -     -50
__UNIQUE_ID_description400                    50       -     -50
rk817_set_dai_sysclk                          88      32     -56
__UNIQUE_ID_author401                         56       -     -56
rk817_hw_params                              516     456     -60
rk817_set_dai_fmt                            184     116     -68
rk817_playback_path_get                      108      36     -72
rk817_capture_path_get                       108      36     -72
rk817_codec_power_down                       516     424     -92
rk817_capture_path_put                       632     492    -140
rk817_codec_power_up                         756     580    -176
rk817_digital_mute                           756     460    -296
rk817_platform_probe                        1264     876    -388
Total: Before=9850, After=8225, chg -16.50%

Change-Id: I98471c52ea342672e10deb02c4fb38d9fb82f906
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2022-09-09 15:37:19 +08:00
Binyuan Lan
5f4e2f3859 ASoC: rockchip: rk817-codec: Solve pop problems
DIGEN_CLKE can only be controlled when the amplifier is turned off

Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I5758cab8f20bd2ede008d1ad138cdadcaa55e39d
2022-09-09 15:27:52 +08:00
Cai YiWei
be3f404824 media: rockchip: isp: version v2.0.0
Change-Id: I538c3abb84a338e730c2bd266485ceb4bae6166d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-09 15:10:37 +08:00
Weiwen Chen
32154375ea ARM: dts: rockchip: rv1103g-battery-ipc-v10: update meta and rkisp_thunderboot use default value
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Id7e231b7f3142761e1945d0a0f18cf4308ede672
2022-09-09 14:30:54 +08:00
Weiwen Chen
41407a36ac ARM: dts: rockchip: rv1106-thunder-boot: update memory layout
Because of the meta and rkisp_thunderboot memory offset MUST
match with RTOS, so move meta and rkisp_thunderboot to the
top of memory layout.

The memory layout for rv1106 thunder boot feature:

    SPL:       0 ~ 256KB
    RTOS:      256KB ~ 512KB
    SPL S & H: 512KB ~ (2MB - 8KB)
    ATAGS:     (2MB - 8KB) ~ 2MB
    UBOOT:     2MB ~
    KERNEL_R:  (2MB + 0x8000) ~ (8MB - 128KB)
    DTB:       (8MB - 128KB) ~ 8MB
    META:      8MB ~ (8MB + 384KB)
    ISP:       (8MB + 384KB) ~ (8MB + 384KB + ceil(w*10/8/256)*256*h*(buf_num))
    RAMDISK_R: 0x12ec000 ~ (0x12ec000 + 10MB)
    RAMDISK_C: (0x12ec000 + 10MB) ~ (0x12ec000 + 10MB + 5MB)
    KERNEL_C:  (0x12ec000 + 10MB + 5MB) ~ (0x12ec000 + 10MB + 5MB + 5MB)

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I9d18041559ca10c96f5d94a1c0dcf1d535c90db4
2022-09-09 14:30:23 +08:00
Lin Jianhua
d3b3fc7cc5 arm64: dts: rockchip: px30_linux_defconfig: enable multicodecs and remove CIF config
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I65cce7c3f4646fe2c508350e468f22f212d0b0dd
2022-09-09 10:19:51 +08:00
Jianlong Wang
b545e4bdc0 arm64: dts: rockchip: rk3326: add rk3326-evb-lp3-v12-linux
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
Change-Id: I0615508b407078b2b9be30b162a41ca226b9be06
2022-09-09 10:18:53 +08:00
Jianlong Wang
e4e2628ccc Revert "ARM64: dts: rockchip: rk3326-evb-lp3-v10-linux: update panel"
This reverts commit 11a0bfb97cb9bf50d5afb8819381d6be8312bd00.

Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
Change-Id: I953108f01466c5bd52ebc86046d07011dbabc857
2022-09-09 10:18:36 +08:00
Jianwei Zheng
adc69507ac phy: rockchip: inno-usb2: fix miss line irq for rk3588
RK3588 platform may miss line irq if the line state is not in
SE0(D+ low, D- low) before usb controller call phy init function
and enable line irq.

To resolve this, when usb controller call phy init function, we
can clear host_disconnect state if the line state is not in SE0
which means there is an usb device connected to the port.

Signed-off-by: Jianwei Zheng <jianwei.zheng@rock-chips.com>
Change-Id: Icb3f1abd790f16ddd66bbc098e0c06cc5d922d86
2022-09-08 21:04:31 +08:00
Su Yuefu
1a5d2a8da4 media: i2c: change sc3338 gain times from 1000 to 128
Signed-off-by: Su Yuefu <yuefu.su@rock-chips.com>
Change-Id: I7bc0aa6bea913a4d5c64aec5a595d9c0960b83cf
2022-09-08 19:53:45 +08:00
Tao Huang
3d8de4fc14 net: wireless: rockchip_wlan: bcmdhd: Disable -Wunused-but-set-variable
To support clang-14 otherwise too much warnings generated.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If48817e358d076858a9808dfdc26e4b142858cc9
2022-09-08 15:32:06 +08:00
Luo Wei
a9ba12530d arm64: dts: rockchip: rk3588-vehicle-evb: fix usb3.0 power en problem
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Iaad046cd30f5db12238da0dd5cdecacc42be2315
2022-09-08 15:04:50 +08:00
Yu Qiaowei
e125f2a0b5 video: rockchip: rga3: modify the printing of hardware version
Update driver version to 1.2.19

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ibd9d4a0bc31e2e9b829743619f67d8e13db9332c
2022-09-08 10:13:29 +08:00
Yu Qiaowei
34a6033f02 video: rockchip: rga3: remove PM's dependency on CONFIG_ROCKCHIP_FPGA
Not all fpga need PM, enable RGA_DISABLE_PM to disable PM when not needed.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I9ebc20c1795eb30d60a1cb727a7a7b91b5b5728e
2022-09-08 10:13:13 +08:00
Yu Qiaowei
7f955d290c video: rockchip: rga3: use macros to control the working mode of RGA2
When RGA2_USE_MASTER_MODE is 1, master mode is used, when it is 0,
slave mode is used.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0b8356e02f58b5fadcec41dd310bd55192d2aa47
2022-09-07 21:16:52 +08:00
Yu Qiaowei
1d4ec83baa video: rockchip: rga3: fix stride of YUV 420 packed
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If731f7fc3c76e614cbb0f9ceee5e6a4b8b7e130b
2022-09-07 21:13:06 +08:00
Yu Qiaowei
d8e05d0f1b video: rockchip: rga3: fix ovlap non-16 alignment lost alpha channel
When in ABB mode, ovlap needs to enable top/bottom alpha read enable
at the same time.
Because ovlap_offset is not 16 aligned, the bottom will be read in
16*16 blocks. If alpha reading is not enabled at this time, this part
 of the alpha channel will be lost.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Id18328e4385064d6be7e0574e344cc5413d20df0
2022-09-07 20:28:07 +08:00
Albert Wang
a81422efff UPSTREAM: usb: dwc3: gadget: Move null pinter check to proper place
When dwc3_gadget_ep_cleanup_completed_requests() called to
dwc3_gadget_giveback() where the dwc3 lock is released, other thread is
able to execute. In this situation, usb_ep_disable() gets the chance to
clear endpoint descriptor pointer which leds to the null pointer
dereference problem. So needs to move the null pointer check to a proper
place.

Example call stack:

Thread#1:
dwc3_thread_interrupt()
  spin_lock
  -> dwc3_process_event_buf()
   -> dwc3_process_event_entry()
    -> dwc3_endpoint_interrupt()
     -> dwc3_gadget_endpoint_trbs_complete()
      -> dwc3_gadget_ep_cleanup_completed_requests()
       ...
       -> dwc3_giveback()
          spin_unlock
          Thread#2 executes

Thread#2:
configfs_composite_disconnect()
  -> __composite_disconnect()
   -> ffs_func_disable()
    -> ffs_func_set_alt()
     -> ffs_func_eps_disable()
      -> usb_ep_disable()
         wait for dwc3 spin_lock
         Thread#1 released lock
         clear endpoint.desc

Fixes: 2628844812 ("usb: dwc3: gadget: Fix null pointer exception")
Cc: stable <stable@kernel.org>
Signed-off-by: Albert Wang <albertccwang@google.com>
Link: https://lore.kernel.org/r/20220518061315.3359198-1-albertccwang@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 3c5880745b)
Change-Id: I15ad3eab4b946f4db6e52035c5dd0d6b3435472e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-09-07 16:11:27 +08:00
Charan Teja Reddy
41b083e3ba UPSTREAM: dma-buf: call dma_buf_stats_setup after dmabuf is in valid list
When dma_buf_stats_setup() fails, it closes the dmabuf file which
results into the calling of dma_buf_file_release() where it does
list_del(&dmabuf->list_node) with out first adding it to the proper
list. This is resulting into panic in the below path:
__list_del_entry_valid+0x38/0xac
dma_buf_file_release+0x74/0x158
__fput+0xf4/0x428
____fput+0x14/0x24
task_work_run+0x178/0x24c
do_notify_resume+0x194/0x264
work_pending+0xc/0x5f0

Fix it by moving the dma_buf_stats_setup() after dmabuf is added to the
list.

Fixes: bdb8d06dfe ("dmabuf: Add the capability to expose DMA-BUF stats in sysfs")
Signed-off-by: Charan Teja Reddy <quic_charante@quicinc.com>
Tested-by: T.J. Mercier <tjmercier@google.com>
Acked-by: T.J. Mercier <tjmercier@google.com>
Cc: <stable@vger.kernel.org> # 5.15.x+
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/1652125797-2043-1-git-send-email-quic_charante@quicinc.com
(cherry picked from commit ef3a6b7050)
Change-Id: Ie282a36291072b2c6c374f8c1924030ff85d29c6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-09-07 16:10:24 +08:00
Joseph Chen
11162a3487 clk: rockchip: rk3588: Add CLK_SET_RATE_PARENT for i2s5/6 frac clk
The flag was missing which makes i2s5/6 src clock rate can't be changed.

Change-Id: I3ad5f39e8a2826d0b18d554c3a53b55f219028d8
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2022-09-07 16:00:55 +08:00
Cai YiWei
3be39a0ab0 media: rockchip: isp: fix vicap fast stream on and off
Change-Id: I6f94419a6d4beacd4a5ab8f0fa13649bc61eec67
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-09-07 15:58:17 +08:00
Finley Xiao
00ae13ff18 dt-bindings: update SPDX-License-Identifier for rockchip clock header
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I626838b5d18f1a0007f03dfd6132821ff01a026c
2022-09-07 14:36:08 +08:00
Finley Xiao
2e0c57d5b6 dt-bindings: update SPDX-License-Identifier for rockchip power header
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I272f7ffd3aaa0f6c6018268e3fdfb30ad07dbf42
2022-09-07 14:36:08 +08:00
Jason Zhu
c9e093d497 ASoC: es7202: fix es7202 read & write error
The error occur when set pm_domain_always_on as true.
error:
[    5.035136][    T9] pc : es7202_multi_chips_update_bits+0xe4/0x22c
[    5.035684][    T9] lr : es7202_multi_chips_update_bits+0x84/0x22c
[    5.036230][    T9] sp : ffffffc0124e3830
[    5.036593][    T9] pmr_save: 000000e0
[    5.036923][    T9] x29: ffffffc0124e3850 x28: 0000000000000001
[    5.037453][    T9] x27: 0000000000002e11 x26: 0000000000000100
[    5.037981][    T9] x25: 0000000000000208 x24: ffffffc0123f4888
[    5.038511][    T9] x23: 0000000000000105 x22: 0000000000000102
[    5.039040][    T9] x21: 0000000000000000 x20: 0000000000000030
[    5.039572][    T9] x19: 0000000000000000 x18: ffffffc0124950a0
[    5.040099][    T9] x17: 071c71c71c71c71c x16: 0000000000000001
[    5.040626][    T9] x15: 0000000000000000 x14: 0000000000000400
[    5.041153][    T9] x13: 0000000000000004 x12: 0000000000000000
[    5.041680][    T9] x11: ffffffc0124e3770 x10: 0000000000000001
[    5.042207][    T9] x9 : 0000000000000030 x8 : 0000000000000007
[    5.042741][    T9] x7 : 000000b2b5593519 x6 : 0000000000000009
[    5.043275][    T9] x5 : 0000000000000001 x4 : 0000000000000001
[    5.043809][    T9] x3 : ffffff81015cb4f0 x2 : 0000000000000000
[    5.044344][    T9] x1 : ffffff8100340000 x0 : 0000000000000001
[    5.044880][    T9] Call trace:
[    5.045168][    T9]  es7202_multi_chips_update_bits+0xe4/0x22c
[    5.045689][    T9]  es7202_probe+0xa0/0x5cc
[    5.046080][    T9]  snd_soc_component_probe+0x28/0x80
[    5.046541][    T9]  soc_probe_component+0x254/0x3a8
[    5.046985][    T9]  snd_soc_bind_card+0x464/0xad0
[    5.047418][    T9]  snd_soc_register_card+0xf8/0x114
[    5.047873][    T9]  devm_snd_soc_register_card+0x48/0x90
[    5.048355][    T9]  rk_multicodecs_probe+0x844/0x950

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3aafcf653fcb15c20c6c23acbcfb54ee84120161
2022-09-06 21:18:52 +08:00
Zefa Chen
40c34d9901 media: i2c: sc430cs support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ie275e14691e97373e854e536c6a24e9664d5e104
2022-09-06 21:12:33 +08:00
Zefa Chen
9d7e87b159 media: i2c: sc430cs fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I89d3e58072d0976a61c68a5bd11135af8217a85b
2022-09-06 21:12:26 +08:00
Zefa Chen
27fca158ee media: i2c: sc4238 support get channel info
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iaf4b2986a5aa3b43fb3ea1d29d6e81a1170643ca
2022-09-06 21:06:47 +08:00
Zefa Chen
d7b517a933 media: i2c: sc4238 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I89095cc7e88976e2b6c4cc03dcf7ef4d85161312
2022-09-06 21:06:35 +08:00
Zefa Chen
75bd61f8ee media: i2c: sc4238 fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I049d127f3b9ce6df88ba235997167f9d0b658075
2022-09-06 21:06:01 +08:00
Zefa Chen
47fa14b3ff media: i2c: sc2310 support get channel info
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I66dd1df73e01de14632c27b081a23651c631f106
2022-09-06 21:05:11 +08:00
Zefa Chen
41030bf030 media: i2c: sc2310 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I472f7147e67b6a616badcc4e590796fcde02652f
2022-09-06 21:05:00 +08:00
Zefa Chen
0d29f62062 media: i2c: sc2310 fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I240aea1457bf344a1ca6b410433ddf75edb33deb
2022-09-06 21:04:51 +08:00
Zefa Chen
1015e049d6 media: i2c: sc2239 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib54c499c1c11912f09fcdd757fe6770729a02e4f
2022-09-06 20:59:10 +08:00
Zefa Chen
197d1dd185 media: i2c: sc2239 fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibe430f5a7398857f742f5fbc40f2b5c71cf529f0
2022-09-06 20:58:55 +08:00
Zefa Chen
8973f1f7d1 media: i2c: sc2232 support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I0a7d39efdf19be64c0a6fd1a07d1ea95f5a9c1ec
2022-09-06 20:58:05 +08:00
Zefa Chen
5a810868d7 media: i2c: sc2232 fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I688398cdc757dad906e3b8a9224b3add0d7e7cf7
2022-09-06 20:57:46 +08:00
Zefa Chen
399f2b54c2 media: i2c: sc210iot support get real fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I076f76fc865832c6c32bc0948a3ac946f856a302
2022-09-06 20:56:44 +08:00
Zefa Chen
93205a19f3 media: i2c: sc210iot fixed compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib8bda8d9612d6dde919ff73b471ea1361653dd2c
2022-09-06 17:45:35 +08:00
Zefa Chen
e22a81c9d7 media: i2c: sc200ai support get channel info
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3a94f110dad47d8b8d75a8db151ba066b1fbc9f6
2022-09-06 17:42:47 +08:00