Commit Graph

870289 Commits

Author SHA1 Message Date
5574882544 再次修复1n耳机的问题 2023-06-28 02:41:11 +00:00
e72909392c arm64: dts: rockchip: rk3528 boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
Change-Id: Ide2435eb0fb9e8e0ffb705d8ba4b43af95dd37ff
2023-06-28 09:22:36 +08:00
4b20f652d1 arm64: dts: rockchip: rk356x boards: btsco enable 16k pcm support
In android 9,10,11,12,13, we have already support 16k wbs in
hardware level code. So, enable 16k support in kernel dts default.

Info:
In future, to support BTSCO 16k, it only need to change the
default setting of bluedroid's "DISABLE_WBS" setting.

Change-Id: I382bfdb47a6e13c54c53e8e666aecbad6e135f41
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-28 09:20:01 +08:00
67756310f9 修复1n耳机没有声音的问题 2023-06-28 01:13:22 +00:00
13c15aa49a video: rockchip: rga3: adapt to kernel-6.1/5.10/4.19
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ie38ae6b0fc6037bfeee5b19077ff339f39933bc4
2023-06-26 07:31:27 +00:00
9bb34966d1 video: rockchip: rga3: modify over-constraint on fbcd
Change-Id: I9aa492263f036cedddc5e85485bb250770d2aafa
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
2023-06-26 07:13:41 +00:00
ce0b0cd40f video: rockchip: rga3: fix compile errors on kernel-6.1
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I3b0de1f1da992975c13f99de7574ff0cd0865e25
2023-06-26 07:13:27 +00:00
faf9ab8436 video: rockchip: rga3: fix compile errors on stable-4.19-rv1126
Update driver version to 1.2.26

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I048c44201f34af5d4391b2ce097ba592b5f0b5c1
2023-06-26 07:13:15 +00:00
4aa460d9a4 video: rockchip: rga3: print dma_buf_map error code
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I820390743d2fb4bf3a0a5d7f2b9a1f76b8f0db67
2023-06-26 07:13:01 +00:00
f6e9bbba01 video: rockchip: rga3: prevent pages order out of bounds
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I6ed55d2d7180ae1ba928ca1f8399d4c8eb312e18
2023-06-26 07:12:51 +00:00
938ee31693 video: rockchip: rga3: fix resource is not freed in rga_mm_map_phys_addr
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I8730b5d16ba3d5e6b67e9c174366e9793bbfd070
2023-06-26 07:12:35 +00:00
927c95d8ef clk: rockchip: rk3399: fix mac ref clk register description
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib8f21796a3527d74055ff847a2d36e99208d4772
2023-06-26 14:40:22 +08:00
1ddf33e68d clk: rockchip: rk3568: fix pwm clk register description
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I30a8c97c95be15ea23a485e9e429fd575605b38a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2023-06-26 14:40:22 +08:00
7865b02396 暂时更新lbc1io的设备树 2023-06-26 03:01:39 +00:00
0628b3e791 更新两个屏幕的配置文件 2023-06-26 03:01:00 +00:00
3320c4095f 更新两个屏幕的Makefile文件 2023-06-26 02:59:22 +00:00
4a85bb542d 更新10.1寸屏幕的设备树和设备树插件 2023-06-26 02:58:36 +00:00
6ed9bb703b 更新7寸屏幕的设备树和设备树插件 2023-06-26 02:58:13 +00:00
1ce92116cb arm64: rockchip_linux_defconfig: Enable CONFIG_ROCKCHIP_MULTI_RGA
Switch to the RGA multicore device driver currently being maintained and
used.

Change-Id: I778772f29f63e02a6569b3ec7c0b96ecd3dc4f64
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2023-06-26 09:47:13 +08:00
737491a80c spi: rockchip: Modify the slave tx finish judgement
The SR register of the old version IP SPI slave tx transmission
process will remain in a busy state, so it needs to be processed
by determining the tx empty status bits filed.

Change-Id: If71ed842e2b7aed3cfe22d7bc401ea2d0bb1409b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:52:31 +08:00
87e11c5b09 spi: rockchip-test: Check the spi sync actual length
Change-Id: I4a189c50cc9aa9c6151e9efcfa5eca59eb35f44a
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:52:25 +08:00
6ca489e978 spi: rockchip: Add transfer completion wait
Add transfer completion wait to improve software compatibility,
1.Support to adjust he timeount value if needed
2.Return the fail result when spi slave abort

Choose to discard the rx fifo data after slave abort instead of
attempting to modify xfer->len to change the framework layer
mechanism.

Change-Id: I6bb1ba0ba12ad7486117aff5e948616c8e768418
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:52:06 +08:00
add00ac7f3 spi: rockchip: Sync with upstream
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia25e81a1ac5dca491ff31bd3557eac61bbd0962e
2023-06-22 20:49:53 +08:00
68768b8646 spi: rockchip: Add print information in case of spi exception
Change-Id: I3c512486ae69b2d155a1f67bdb3ce34996796d90
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:49:35 +08:00
db45871299 spi: rockchip: Support cpu polling to complete transmission
The default is DMA and IRQ transmission mode. You can change the
transmission mode to only support cpu polling transmission by adding
"rockchip,poll-only" to the device-tree node.

Change-Id: Icee3f4e899533ee51caab68fb85ec45f64b89d91
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:49:23 +08:00
f4708995d0 spi: rockchip: Avoid redundant clock disable in pm operation
Fix WARN_ON:
[   22.869352][ T1885] clk_spi0 already unprepared
[   22.869379][ T1885] WARNING: CPU: 3 PID: 1885 at drivers/clk/clk.c:813 clk_core_unprepare+0xbc4
[   22.869380][ T1885] Modules linked in: bcmdhd dhd_static_buf
[   22.869391][ T1885] CPU: 3 PID: 1885 Comm: Binder:355_2 Tainted: G        W         5.10.66 #59
[   22.869393][ T1885] Hardware name: Rockchip RK3588 EVB1 LP4 V10 Board (DT)
[   22.869397][ T1885] pstate: 60400009 (nZCv daif +PAN -UAO -TCO BTYPE=--)
[   22.869401][ T1885] pc : clk_core_unprepare+0xbc/0x214
[   22.869404][ T1885] lr : clk_core_unprepare+0xbc/0x214

Fixes: decf7c2116d6 ("spi: rockchip: Suspend and resume the bus during NOIRQ_SYSTEM_SLEEP_PM ops")
Change-Id: Ie1c2e2a27c85e205e27a997676183aab7a0354ee
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2023-06-22 20:49:12 +08:00
3f2985d152 drm/rockchip: vop: add check if global/pixel alpha both enable
VOP in RK3308 supports global alpha and pixel alpha.
Only one alpha mode can be enabled at the same time.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ia749deeb82a31b7e5298ca14586bbfb75606469f
2023-06-19 09:47:29 +08:00
ec31085c71 arm64: dts: rockchip: rk3568-evb: assign DCLK_VOP2 to PLL_GPLL
If not assigned, the clock parent of DCLK_VOP2 will be
PLL_HPLL in uboot, which affects HDMI display.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ife948de756281ed197413301ce1b05ddb80fe3d9
2023-06-19 09:46:11 +08:00
2262686dee arm64: dts: rockchip: rk356x boards: prepare bt sco settings
we don't directly add all evb board to enable bt-sco cards
because it may take some i2s/pcm, which may use dma,
but dmas may limit.

so we just prepare this settings, then if any one who want to
support bt-sco, he/she can just add dts in board-level dts.

now, we just enable rk3568-evb1 and rk3566-evb1 just for example.
Diff in "rk3568-evb1-ddr4-v10.dts" is like this:

+&bt_sco {
+	status = "okay";
+};
+
+&bt_sound {
+	status = "okay";
+};
+
+&i2s3_2ch {
+	status = "okay";
+};

The default pcm/i2s setting is:
Format: PCM, dsp_a, MSB first, short sync, rising edge and delay 1 bclk.
rockchip soc: master; Bt controller: slave

Change-Id: I6668bfbb87e4b0ea71a661bbcf8248cbde77974e
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
2023-06-19 09:45:29 +08:00
dd86cac3e8 ASoC: rockchip: rk817-codec: remove some useless SOC_ENUM_SINGLE_DECLs
Change-Id: Ibc351c03518152ac463f54aa1fa8640083352aa8
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-06-16 16:18:17 +08:00
d04197c9cb ASoC: rockchip: rk817-codec: Fix a large number of mclk counts being enabled
If it is not controlled, when the path is configured after
resume, the clock will be continuously turn on to increase
the clock count.

Therefore, we can count and control the switch of clock
separately according to the current status of playback and
capture, so as to avoid that mclk is accidentally turned off
when playback and capture exist at the same time, causing
the other stream to fail to work.

For example:
- before:
  mclk_sai0          2        2        0    11289600          0     0  50000
     mclk_sai0_out2io       1        1        0    11289600          0     0  50000
        mclk_sai0_to_io      16       16        0    11289600          0     0  50000

- after:
  mclk_sai0          2        2        0    11289600          0     0  50000
     mclk_sai0_out2io       1        1        0    11289600          0     0  50000
        mclk_sai0_to_io       2        2        0    11289600          0     0  50000

Change-Id: I78ec18c7ffc42f548e82357bcf20701aa057f15d
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-06-16 16:18:13 +08:00
e61a8f92d8 ASoC: rockchip: rk817-codec: re-support recover playback/capture path after resume
We can configure automatically playback/capture path via
the controlling of 'Resume Path'.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ie00e7a673bff068aa922e322d833106f4cbacfde
2023-06-16 16:18:09 +08:00
b18e375f40 ASoC: rockchip: sai: keeping naming style of 'rockchip_' prefix for sai_suspend/resume
Change-Id: I33a4d88acf8f12ea0f1440cf8ce4bd2a57ea466e
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-06-16 16:18:06 +08:00
afbdd60711 ASoC: rockchip: sai: Add support system PM suspend/resume
Note: This patch is BACKPORT from kernel-5.10, the 4.19 is
not supported pm_runtime_resume_and_get() which is starting
from 5.10, replace it with pm_runtime_get_sync() and
pm_runtime_put_noidle().

Change-Id: Iafce14494982a3827f0a43409cfffe53307b7193
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
2023-06-16 16:17:48 +08:00
1068599e67 ARM: dts: rockchip: rv1126: Add sdmmc idle state support
In order to avoid power leak for affacting SD cards, add idle state
to all related boards for RV1126 and change default state to normal
state for the driver to totally control it.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: If00ed994eb2a467bd5ef16fd52f51b490bea4b27
2023-06-14 08:47:24 +08:00
678d83299c ARM: dts: rockchip: add idle state for sdmmc of rv1126-pinctrl
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ie72c4c8ac311aab1b02fb8c514c8652260aaa0e6
2023-06-14 08:47:24 +08:00
78513bce76 arm64: dts: rockchip: px30: add pwm irq configs
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I121376bf28c157d5d588466dc9d5796e764cd425
2023-06-12 10:33:39 +08:00
a5d1e93873 video: rockchip: mpp: flush tlb for rkvenc2
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Idb9abe0fc91b918937d50035ddea9d23cc90fe21
2023-06-09 18:14:42 +08:00
5b2a08c484 arm64: dts: rockchip: rk3568: add shootdown-entire for dec/enc iommu
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I614b8dedfc5f38500597d62556fee1a0c508505a
2023-06-09 15:09:39 +08:00
6c2e53cfa0 video: rockchip: mpp: fix iommu fault handler arg err
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I93909d3d37a49527d4a74d96066f31949ca200ce
2023-06-09 15:09:31 +08:00
b8399eced8 启用IPv6网络防火墙过滤器 2023-06-09 01:08:34 +00:00
8ffc48e149 arm64: dts: rockchip: rk3568-amp: set some node to make mcu alive
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I5c698d481b99fdc9e952b3b95c51c4bf619d0ace
2023-06-08 15:30:22 +08:00
0d6f8370c8 PM / devfreq: rockchip-dfi: Fix calculation error in RK3528
In RK3528, COUNT_NUM (total) needs *2 because it is in DFI clock cycle.

Signed-off-by: Wesley Yao <wesley.yao@rock-chips.com>
Change-Id: I72fb4e06d992772c69aac76b79a0532c5f7ffff7
2023-06-08 14:11:29 +08:00
4392776f20 Merge branch 'stable-4.19-rk356x' of gitlab.ebf.local:rockchip/linux/kernel into stable-4.19-rk356x 2023-06-08 00:44:43 +00:00
07ee6049d4 添加默认设备树(设备识别不到id时的操作) 2023-06-08 00:44:33 +00:00
67755e7ca5 can配置为低速率模式 2023-06-08 00:43:38 +00:00
2a49abd445 修改主树中的2iocan的默认配置 2023-06-08 00:42:41 +00:00
d675e480b3 修改rk3568-lubancat-2io gmac0 rx delay 2023-06-07 19:49:53 +08:00
c623837a75 crypto: rockchip: v2: Fix pointer judgment errors
Change-Id: If13ef9030e42dc88feba351575dd0caa4ea4b66a
Signed-off-by: Sisyphean Zhou <sisyphean.zhou@rock-chips.com>
2023-06-06 16:36:15 +08:00
be6b2c52eb arm64: dts: rockchip: rk3568-nvr-demo-v10: add spdif as rk618's audio source
Signed-off-by: Qiqi Zhang <eddy.zhang@rock-chips.com>
Change-Id: I4519d17d7f178c275e771d852c5f62b1f7c960f4
2023-06-06 11:47:36 +08:00