shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,277,623 Commits 55 Branches 2,486 Tags
5f1ea7b28ca6cd563f602b417a57afe4eedd2976
Commit Graph

1277623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zefa Chen
5f1ea7b28c media: rockchip: vicap fixes error of clean intr mask when stop stream 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5678f52e8a527b38eaa96ad4ae35e94addee525d
 2024-07-17 19:13:28 +08:00
Xu Xuehui
04390f82f3 rtc: s35390a: Correct RTC alarm behavior to maintain 32KHz output 
When setting an RTC alarm, the S35390A_CMD_STATUS2 register will be
set again, which unintentionally disables the 32KHz output, this commit
adds the necessary configuration to set the S35390A_INT2_MODE_32K,
ensuring that the 32KHz output remains enabled at all times.

as a result of this change, the previous commit
7f151d9170 is no longer necessary.

Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Change-Id: I8607899676bd624e00032eeca1a21a0658f3b71a
 2024-07-17 09:24:00 +08:00
Xu Xuehui
6512ef1a14 Revert "rtc: s35390a: set 32K register when resume" 
This reverts commit 7f151d9170.

Signed-off-by: Xu Xuehui <xxh@rock-chips.com>
Change-Id: I4839139c400d73bcb1ecbed87604e7838bdd8173
 2024-07-17 09:23:53 +08:00
Zhang Yubing
153794fa40 drm/rockchip: dw-dp: force-hpd get the connect status as connected 
For force-hpd, It should be regard as always connected, so
it don't read the register to get the connect status.

Change-Id: I7082bb1ae56a640a43a800b9a934da7700e76de5
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-16 21:02:52 +08:00
Sandy Huang
52aa0d1aaf drm/rockchip: vop2: move rk3588 pd control together 
This is a merge error at following commit:

commit 32062f68cc ("drm/rockchip: vop2: update dsc pd status when show logo with dsc")

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I603abd28fb9e1ccdbb06fa1e25c3a64b35b8d293
 2024-07-16 21:02:43 +08:00
Sandy Huang
fb5c51ed5f drm/rockchip: vop2: to access dsc register must after enable dsc pd and release reset 
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I80d18b8f0b4dadc62c8304b5b62186691a684dd9
 2024-07-16 21:02:43 +08:00
Sandy Huang
781038491c drm/rockchip: vop2: get power_ctrl default value and backup to regsbak 
Read default register value and backup to regsbak must after pd power on, so we
can get correctly value, but the pd power on action depend on regsbak, so
we add extra regsbak for power_ctrl.

Fixes: 6282856b67 ("drm/rockchip: vop2: move power up plane pd before read regsbak")
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I465b0ec76d4e1233c40e79528ee42b5c5c2fb727
 2024-07-16 21:02:42 +08:00
Zorro Liu
6f79f8dd09 drm/rockchip: ebc_dev: release version v6.14 
first enter A2 use du

Type: Function
Redmine ID: #N/A
Associated modifications: N/A
Test: N/A

Change-Id: I1df578c3bb2c6a4b8e0772e3786abf2631ad3214
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
 2024-07-13 16:38:17 +08:00
Tao Huang
714ff9cd7c Merge commit '51a874510a351b4417b2b0d1ec9ca743118ecb49' 
* commit '51a874510a351b4417b2b0d1ec9ca743118ecb49':
  arm64: dts: rockchip: rk3576-evb2: fix es8388 sound card config
  media: i2c: ov16880: fix gain ctrl

Change-Id: Ib3bc514b0a6b41cca4e3457da963533511cfa340
 2024-07-12 19:17:19 +08:00
Shunhua Lan
51a874510a arm64: dts: rockchip: rk3576-evb2: fix es8388 sound card config 
Signed-off-by: Shunhua Lan <lsh@rock-chips.com>
Change-Id: Ifa2c450293722a800b9982c486b4c9e50ec0a72a
 2024-07-12 17:00:54 +08:00
Jianwei Fan
620296edab media: i2c: ov16880: fix gain ctrl 
in non-HDR mode, short gain and long gian need to be set the same
values.

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Idaa14c389a20b2518757303538dc19fb8154695d
 2024-07-12 16:10:16 +08:00
Tao Huang
0b90cf4202 Merge commit '7a5fd2ec18f0e398ad50f306b4e816473e4b17a5' 
* commit '7a5fd2ec18f0e398ad50f306b4e816473e4b17a5':
  arm64: dts: rockchip: rk3576-vehicle-evb: change rk3576 sai1 to master
  kbuild: xz_wrap: do not include include/config/auto.conf
  fiq_debugger: arm: Fix compile error on !THREAD_INFO

Change-Id: I73895f1fa73b85ff7243cb280a805c196ce83ceb
 2024-07-12 11:07:59 +08:00
Zheng zhiqi
7a5fd2ec18 arm64: dts: rockchip: rk3576-vehicle-evb: change rk3576 sai1 to master 
Change rk3576 sai1 to master

Change-Id: Ibed393c0ba33967baece1f2841b59c147b977def
Signed-off-by: Zheng zhiqi <looper.zheng@rock-chips.com>
 2024-07-12 11:01:32 +08:00
Tao Huang
0aabe51453 kbuild: xz_wrap: do not include include/config/auto.conf 
Fix the following error:
./scripts/xz_wrap.sh: 315: include/config/auto.conf: Syntax error: "(" unexpected

Fixes: 83c382f436 ("FROMLIST: kbuild: Enable armthumb BCJ filter for Thumb-2 kernel")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I780ac11132c7a42ad189fc9c955a94139a3d62aa
 2024-07-11 19:33:12 +08:00
Tao Huang
416cd1ea3b fiq_debugger: arm: Fix compile error on !THREAD_INFO 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id65e44276f7ee0ab0473274a2b739e0a6b453373
 2024-07-11 19:17:54 +08:00
Tao Huang
eae3c755aa Merge commit '7224760709462dcae6c486c7ffc175eb02bbd2c8' 
* commit '7224760709462dcae6c486c7ffc175eb02bbd2c8':
  arm64: dts: rockchip: Add support for rk3576 test3 board
  arm64: dts: rockchip: rk3576-evb1-cam-dcphy0: remove incorrect reset-gpios
  arm64: dts: rockchip: rk3576-evb1-cam-4x: ensure correct order of the four cameras
  dt-bindings: display: drm_mipi_dsi: Add _NO_ to MIPI_DSI_* flags disabling features

Change-Id: I087d844ce73bfd80a1dce61b93aecaef37d0b1bc
 2024-07-11 19:00:31 +08:00
Liang Chen
7224760709 arm64: dts: rockchip: Add support for rk3576 test3 board 
Signed-off-by: Liang Chen <cl@rock-chips.com>
Change-Id: Ide3f5cc427d5219412e9afa3183ad96872c4871a
 2024-07-11 18:58:16 +08:00
LiuDiMing Lin
d78fdd700c arm64: dts: rockchip: rk3576-evb1-cam-dcphy0: remove incorrect reset-gpios 
Change-Id: Ife2de9ba0d45faa1120847551fde820f17f4cc85
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
 2024-07-11 16:28:15 +08:00
LiuDiMing Lin
0fd02a40a7 arm64: dts: rockchip: rk3576-evb1-cam-4x: ensure correct order of the four cameras 
Change-Id: I2f2942ce386afddd8391e6fa689c5a6841a8c992
Signed-off-by: LiuDiMing Lin <fenrir.lin@rock-chips.com>
 2024-07-11 16:27:02 +08:00
Guochun Huang
1f429c9dc1 dt-bindings: display: drm_mipi_dsi: Add _NO_ to MIPI_DSI_* flags disabling features 
As described in:

commit 0f3b68b66a ("drm/dsi: Add _NO_ to MIPI_DSI_* flags disabling features")

Many of the DSI flags have names opposite to their actual effects,
e.g. MIPI_DSI_MODE_EOT_PACKET means that EoT packets will actually
be disabled. Fix this by including _NO_ in the flag names, e.g.
MIPI_DSI_MODE_NO_EOT_PACKET.

Change-Id: Ibf5faf52f95a1ab07c3ffb7848ff1be7071c458b
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2024-07-11 16:22:56 +08:00
Tao Huang
76eb7beaea Merge commit 'd5fc25e5c360c02b66fe44a372518e89eb6dd34f' 
* commit 'd5fc25e5c360c02b66fe44a372518e89eb6dd34f':
  ASoC: rockchip: asrc: support rockchip asrc
  arm64: configs: rockchip_linux_defconfig: enable CONFIG_SND_SOC_ROCKCHIP_ASRC
  arm64: dts: rockchip: rk3576: add asrc node
  ASoC: rockchip: multicodecs: support DPCM
  arm64: dts: rockchip: add kernel logo for rk3576-rk628 hdmi2gvi
  ASoC: rockchip: i2s-tdm: Check stream is valid
  ASoC: rockchip: sai: Check stream is valid
  ASoC: hdmi-codec: Add support for HDMI-TX DLP
  ASoC: rockchip: Add debug for TRCM
  ASoC: rockchip: i2s-tdm: Optimize WL for TDM mode
  ASoC: rockchip: i2s_tdm: Fix params check for TDM mode

Change-Id: I627e74d9ccda4677646fd57e6587f6139e0c7f8c
 2024-07-10 20:22:27 +08:00
Jason Zhu
d5fc25e5c3 ASoC: rockchip: asrc: support rockchip asrc 
Use Amixer or tinymixer to set tx & rx lrck and resample rate
firstly.

Example:
amixer -c 0 sset "ASRC0 RX LINK DAI Select" "SAI0"
amixer -c 0 sset "ASRC0 TX LINK DAI Select" "MEM"
arecord -D hw:0,1 --period-size=1024 --buffer-size=4096 -r
48000 -c 2 -f s16_le /mnt/r.wav

Change-Id: If33f120896f0e5599699ce3081bc7a874055fdb2
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
 2024-07-10 20:14:16 +08:00
Jason Zhu
76925444bd arm64: configs: rockchip_linux_defconfig: enable CONFIG_SND_SOC_ROCKCHIP_ASRC 
Change-Id: Ibd6091631da1cba254c571e59553b0f427d38637
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
 2024-07-10 20:13:46 +08:00
Jason Zhu
f5409b59ef arm64: dts: rockchip: rk3576: add asrc node 
Change-Id: Id122295e5acf838705ccdc87acd6249ef6af340a
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
 2024-07-10 20:12:15 +08:00
Jason Zhu
d4a03cf620 ASoC: rockchip: multicodecs: support DPCM 
Change-Id: I1e856b305bb949791962a1c157bae8981b2663f9
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
 2024-07-10 20:10:58 +08:00
Zhibin Huang
b39062142f arm64: dts: rockchip: add kernel logo for rk3576-rk628 hdmi2gvi 
Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: Ia62e4741b0d1116bdc54969ef089ea73a40a6fd2
 2024-07-10 15:31:07 +08:00
Sugar Zhang
9b72f7d254 ASoC: rockchip: i2s-tdm: Check stream is valid 
Do nothing when stream is invalid, especially for
HDMI-TX-DLP with multi-dais situation.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ieb056147875ca2707b85f8d9962a5593e66abb21
 2024-07-10 15:00:24 +08:00
Sugar Zhang
602e6eab74 ASoC: rockchip: sai: Check stream is valid 
Do nothing when stream is invalid, especially for
HDMI-TX-DLP with multi-dais situation.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5b7387779c6fc166196fff1ef9ab35907b268021
 2024-07-10 15:00:18 +08:00
Sugar Zhang
e22dfe2e09 ASoC: hdmi-codec: Add support for HDMI-TX DLP 
Support for HDMI-TX Audio Digital Loopback.

e.g.

&hdmi {
	audio,digital-loopback;
};

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id5b4490b8bd96559b49fb8225cf93feac7c3d5c2
 2024-07-10 15:00:18 +08:00
Sugar Zhang
e06eeb1d57 ASoC: rockchip: Add debug for TRCM 
Used for measure the time cost between dma guard and stream.

Change-Id: I626f6b892faa31fbf06e7b1100fdf0b0fa3347f7
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2024-07-10 15:00:02 +08:00
Sugar Zhang
8b3a1e4cee ASoC: rockchip: i2s-tdm: Optimize WL for TDM mode 
TDM mode use all FIFOs, the max burst is 16 word of DMAC,
so we used the max FIFO to cover DDR dmc windows.

4 FIFOs controller:

TDL:

16 word: WL = ((32 * 4) - 16) / 4 = 28

RDL:

16 word: WL = 16 / 4 = 4

Change-Id: Idd88e0615d7fd4ec8c36c72af1c0b1b2d716b43e
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2024-07-10 15:00:02 +08:00
Sugar Zhang
730ca484ba ASoC: rockchip: i2s_tdm: Fix params check for TDM mode 
especially fixed for always-on TDM situation.

Change-Id: I2d544320028daa8ca7031f786beb8ba8880d06bb
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
 2024-07-10 15:00:02 +08:00
Zorro Liu
a66f4ce06a drm/rockchip: ebc_dev: release version v6.13 
fix pvi regal waveform data
can force full under overlay

Type: Fix
Redmine ID: #487718, #494878
Associated modifications: N/A
Test: N/A

Change-Id: I78a6689bacf7c289f4988ab15445d252dc6939c0
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
 2024-07-10 09:47:32 +08:00
Tao Huang
bbf37dd197 Merge commit '79977533751854377382278c86afd0a1c0281bad' 
* commit '79977533751854377382278c86afd0a1c0281bad': (50 commits)
  drm/rockchip: panel-notifier: avoid duplicate register notifier
  arm64: dts: rockchip: rk3576-evb1: add mux node for dp
  arm64: dts: rockchip: rk3588-evb1: add mux node for dp
  drm/rockchip: dw-dp: support get hpd status from Type-C interface
  phy: rockchip: usbdp: support not trigger dp hpd
  drm/rockchip: dw-dp: support dynamic control power domain
  phy: rockchip: usbdp: don't access vo grf in phy power on
  drm/rockchip: debugfs: Add vop dump buffer version output prompt
  drm/rockchip: debugfs: Remove unused enable option for vop buffer dump
  video: rockchip: rga3: support RV1103B
  soc: rockchip: fiq_debugger: Fix console sleep too long
  clk: rockchip: Disable CLK_INV/CLK_PVTM on CPU_RV1103B
  video: rockchip: mpp_osal: ROCKCHIP_MPP_OSAL depends on CPU_RV1103B
  soc: rockchip: ROCKCHIP_MINI_KERNEL default y if CPU_RV1103B
  soc: rockchip: Add CPU_RV1103B config
  media: rockchip: vpss: fix online mul_sensor affect offline
  media: rockchip: vpss: fix offline 8k params calc error
  drm/rockchip: Only enable ROCKCHIP_DRM_DEBUG when not use GKI
  arm64: dts: rockchip: rk3562: auto select opps for rk3562j
  media: rockchip: isp: fix aiisp config
  ...

Change-Id: Iea102b1850c9f57dc127c54af9555d166944a143
 2024-07-09 18:17:14 +08:00
Zhibin Huang
7997753375 drm/rockchip: panel-notifier: avoid duplicate register notifier 
If user mistakenly registers the notifier repeatedly, a panic occurs
at the following location:

pc : __list_add_valid+0x68/0xb8
lr : __list_add_valid+0x68/0xb8
sp : ffffffc00abe3a00
x29: ffffffc00abe3a00 x28: ffffff8003048020 x27: ffffff8003048028
x26: ffffff800324d3d0 x25: 0000000000000002 x24: 000000000000000a
x23: ffffffc00a663040 x22: ffffff80032da350 x21: ffffff8004930940
x20: ffffff80032da350 x19: ffffff80047be010 x18: ffffffc00aab1088
x17: 3035336164323330 x16: ffffffffffffffff x15: 0000000000000004
x14: ffffffc00a00d6e0 x13: 000000000000ffff x12: 0000000000000003
x11: 00000000fffeffff x10: c0000000fffeffff x9 : 55386e6b9a94b100
x8 : 55386e6b9a94b100 x7 : 205b5d3836393437 x6 : 382e33202020205b
x5 : ffffffc00a9e3617 x4 : ffffffc00abe3757 x3 : 0000000000000000
x2 : 0000000000000000 x1 : ffffffc00abe37c0 x0 : 0000000000000058
Call trace:
 __list_add_valid+0x68/0xb8
 devm_rockchip_panel_notifier_register+0x9c/0xfc
 panel_simple_probe+0x458/0x514
 panel_simple_platform_probe+0x88/0xc8
 platform_probe+0xa8/0xd0
 really_probe+0x174/0x350
 __driver_probe_device+0xa0/0x128
 driver_probe_device+0x44/0x210
 __device_attach_driver+0x12c/0x154
 bus_for_each_drv+0x84/0xd0
 __device_attach+0xf0/0x170
 device_initial_probe+0x14/0x20
 bus_probe_device+0x34/0x98
 deferred_probe_work_func+0x7c/0xd8
 process_one_work+0x1a8/0x3b8
 worker_thread+0x300/0x430
 kthread+0xec/0x1b8
 ret_from_fork+0x10/0x20

Type: Fix
Redmine ID: #494152
Associated modifications: N/A
Test: N/A

Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: If2bb65ed80d79d9d930d8bf6e82c45a43fd123b1
 2024-07-09 18:12:29 +08:00
Zhang Yubing
302af18f80 arm64: dts: rockchip: rk3576-evb1: add mux node for dp 
Change-Id: I5896df25268af73003d4baf1ac400a06ca769bfa
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:39:12 +08:00
Zhang Yubing
68caa7651d arm64: dts: rockchip: rk3588-evb1: add mux node for dp 
Change-Id: I23fd7869e6f1c8f23655fbb315a38c685962c909
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:39:11 +08:00
Zhang Yubing
9553deccf2 drm/rockchip: dw-dp: support get hpd status from Type-C interface 
Change-Id: I92f30af67c9c5c1e8720d2cdd8a8e1e5c85618a7
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:39:11 +08:00
Zhang Yubing
09d452118b phy: rockchip: usbdp: support not trigger dp hpd 
If a mux device in DPTX driver, usbdp phy should not trigger
dp hpd. DPTX driver will call phy_set_mode to transfer this
info.

Change-Id: I1d13858a9115a688bd9560eb41a2f86c76e73316
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:38:40 +08:00
Zhang Yubing
b41a87b16c drm/rockchip: dw-dp: support dynamic control power domain 
Change-Id: I8692e967d2873a10385bec5d6998ad73cf8f4fa7
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:22:38 +08:00
Zhang Yubing
010bf50479 phy: rockchip: usbdp: don't access vo grf in phy power on 
The power domain for vo grf may not enable when phy power
on. To access vo grf in other callback function to ensure
the power domain enable before access vo grf.

Change-Id: Iba5f8e6b62670bc01084616506ce146fb22d8e3c
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
 2024-07-09 16:05:11 +08:00
Chaoyi Chen
6913ee05a3 drm/rockchip: debugfs: Add vop dump buffer version output prompt 
Change-Id: Ia5afee51ce86224d14eb15c6662e500ae91d1075
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
 2024-07-09 15:32:25 +08:00
Chaoyi Chen
daf6d9c8c5 drm/rockchip: debugfs: Remove unused enable option for vop buffer dump 
The vop buffer dump feature no longer needs to be explicitly enabled via
debugfs, removing the code associated with it.

Change-Id: I73581514fc69616c97047adb4967d488261cee86
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
 2024-07-09 15:32:25 +08:00
Yu Qiaowei
6e5641b333 video: rockchip: rga3: support RV1103B 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I7a4fda6fd994418c6d2e4dea825f03017abdcf5a
 2024-07-09 11:26:23 +08:00
Tao Huang
49807b4717 soc: rockchip: fiq_debugger: Fix console sleep too long 
usleep_range() will take too long on !CONFIG_HIGH_RES_TIMERS,
replace with schedule() and nice.

Change-Id: I2dc6e4620fe4c56f491f1700e7d6c1f54d1c36e9
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2024-07-09 11:23:36 +08:00
Tao Huang
74c68a1e8a clk: rockchip: Disable CLK_INV/CLK_PVTM on CPU_RV1103B 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5bc5e2e9b12cadb07bc8a31a00a21deb36b88916
 2024-07-09 11:06:17 +08:00
Tao Huang
32b44fe550 video: rockchip: mpp_osal: ROCKCHIP_MPP_OSAL depends on CPU_RV1103B 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ieddb8123fbe06f1ebbc65e23f0a1140a55ce61da
 2024-07-09 11:06:17 +08:00
Tao Huang
054daf6edc soc: rockchip: ROCKCHIP_MINI_KERNEL default y if CPU_RV1103B 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I245ee2575fb9f8c6b4c02e79a97900aabcb9a750
 2024-07-09 11:06:17 +08:00
Tao Huang
373239c6c8 soc: rockchip: Add CPU_RV1103B config 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifb03f352c0624a13548394dcecf59d09f3579ce8
 2024-07-09 11:06:17 +08:00
Mingwei Yan
f42fc97328 media: rockchip: vpss: fix online mul_sensor affect offline 
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: I65e0608fe410baee2d8008b3823bd8322edd7c4d
 2024-07-09 10:57:16 +08:00