shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,256,288 Commits 55 Branches 2,486 Tags
a11cf7949a00840ae94a91bb6b05da2dfa7b00de
Commit Graph

1256288 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tao Huang
a11cf7949a Merge commit 'c575feaee97f3c3f0d29ec8e5e4948e08f56cd61' 
* commit 'c575feaee97f3c3f0d29ec8e5e4948e08f56cd61':
  Revert "usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI"
  media: i2c: os02k10: fix setting exposure error
  media: i2c: dw9800w: add ioctl set max logical pos
  video: rockchip: rga3: prevent calling mmget()/mmput() in spin_lock
  video: rockchip: rga3: refining time-consuming logs
  video: rockchip: rga3: destroy internal_buffer when user exits
  video: rockchip: rga3: signaled fecne after request commit failed
  UPSTREAM: mmc: dw_mmc: Fix potential null pointer risk
  drm/rockchip: rk628: vrefresh should not be zero
  phy/rockchip: inno-dsidphy: fref and _prediv should not be zero
  drm/rockchip: dsi2: sys_clk and pixel_clk should not be zero
  drm/rockchip: dsi: the bpp should not be zero
  media: rockchip: isp: fix build warning
  soc: rockchip: rk_dmabuf_procfs: check return value of platform_device_register_full()

Change-Id: I82396eff6f509f835cf56a36c87ed76394339549
 2023-11-16 15:58:06 +08:00
Tao Huang
ee62f01508 Merge commit '2182c42cb8df4d11eff3812a7ce10ea1bbba2e8d' 
* commit '2182c42cb8df4d11eff3812a7ce10ea1bbba2e8d':
  media: i2c: add Maxim Dual GMSL2/GMSL1 to CSI-2 Deserializer driver.
  media: i2c: sc200ai: get camera param from cam-tb-setup

Change-Id: Ieea0e5189859c2365195a5f94a9a394dfc6e20b4

Conflicts:
	drivers/media/i2c/Makefile
 2023-11-16 15:57:37 +08:00
Zhen Chen
b72fff5ed8 MALI: rockchip: upgrade bifrost DDK to g21p0-01eac0, from g18p0-01eac0 
"/sys/kernel/tracing/events/power/gpu_work_period/*" required by Android 14.0 is implemented.

NOTE:
For RK3588, the mali_csffw.bin used with this driver MUST be from DDK g21p0-01eac0 correspondingly.

Change-Id: Ifab61806a6a350ba53c5dc0296d20628c28d633a
Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
 2023-11-16 14:18:32 +08:00
Zefa Chen
6a55166690 media: rockchip: vicap always notifier sditf to isp when work with GKI 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I4f466abaad2350eed7da039baec7440c82689afb
 2023-11-14 10:30:31 +08:00
Zefa Chen
e9312febc7 phy: rockchip: mipi-rx: skip unready sensor and lens-focus device for GKI 
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ib7dae1144a5f1923db41a489147f2aa5b2f2b358
 2023-11-10 11:40:30 +08:00
Zefa Chen
973b4ed0cc phy: rockchip: mipi csi2 dphy skip unready sensor and lens-focus device for GKI 
This applies to situations where multiple cameras need to be supported in one DTS,
and camera devices need to be registered with GKI
Note: phy-rockchip-csi2-dphy.ko must be insmod last

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If915530d4b982df9500851df89b776e18ed7dd38
 2023-11-10 11:39:34 +08:00
Zefa Chen
3bfffd34a4 phy: rockchip: mipi-rx: fixes issue of parse endpoint 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I9a7f9c8a90079f3ea17e746d42cc04dca7b18b9f
 2023-11-10 11:37:45 +08:00
Zefa Chen
9537649113 phy: rockchip: mipi csi2 dphy fixes issue of parse endpoint 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I8891e18935d4bcabd4a2af620119fcab50524a95
 2023-11-10 11:35:42 +08:00
Zefa Chen
5e482a1da3 media: rockchip: vicap: mipi csi2 fixes issue of parse endpoint 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I51d706a30a525b367e4d662d448595349ca6954c
 2023-11-10 11:34:08 +08:00
Tao Huang
c575feaee9 Revert "usb: typec: typec_port_register_altmodes() depends on CONFIG_NO_GKI" 
This reverts commit afaeb74a36.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2023-11-07 18:57:40 +08:00
Lan Honglin
be8938d206 media: i2c: os02k10: fix setting exposure error 
Change-Id: Id945ead34286b485eb38b860cc751158534b27d7
Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>
 2023-11-07 18:43:38 +08:00
Hu Kejun
4a0a1b85cb media: i2c: dw9800w: add ioctl set max logical pos 
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib0c1fb970aeeae3cbf85d1a4108ed58ef7101881
 2023-11-07 18:42:29 +08:00
Yu Qiaowei
0edaeafbfc video: rockchip: rga3: prevent calling mmget()/mmput() in spin_lock 
Change-Id: Iab49cf67340fa2a476bb5931a927b04f7c8edb01
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 18:33:16 +08:00
Yu Qiaowei
59b58f06c5 video: rockchip: rga3: refining time-consuming logs 
1. Add map/unmap time-consuming
2. Use more intuitive log printing

Change-Id: Id70bc4cce42bb33580ceaf18220fe2454481e78d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:40:44 +08:00
Yu Qiaowei
0011fa588c video: rockchip: rga3: destroy internal_buffer when user exits 
When a user imports the same buffer from multiple threads, relying only
on put to reduce the reference count after the process exits will lead
to memory leaks.

Change-Id: I22e48eb89d23d0d1bc3066048235f1d58ba93511
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:39:57 +08:00
Yu Qiaowei
08092751f1 video: rockchip: rga3: signaled fecne after request commit failed 
Change-Id: I32b35bece1b20aa3228d6d4107b0dad1f4ce6c22
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2023-11-07 17:39:57 +08:00
Wen Zhiwei
d85f16835d UPSTREAM: mmc: dw_mmc: Fix potential null pointer risk 
we previously assumed 'host->slot' could be null,
null pointer judgment should be added

Signed-off-by: Wen Zhiwei <wenzhiwei@kylinos.cn>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Link: https://lore.kernel.org/r/20211229023814.53372-1-wenzhiwei@kylinos.cn
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
(cherry picked from commit 4a835afd80)
Change-Id: Iffade4e1d3ab6ad5bde7b6f05aaf3ce03ba28922
 2023-11-07 17:09:44 +08:00
Guochun Huang
16239e4037 drm/rockchip: rk628: vrefresh should not be zero 
Change-Id: Ia9bde450208f72aa8f9d5dd77b6086abc715bd5e
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
c15b005b73 phy/rockchip: inno-dsidphy: fref and _prediv should not be zero 
Change-Id: I51bcc4ca83e176d2c3de82b7dadabd3a409d16b7
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
ec130295af drm/rockchip: dsi2: sys_clk and pixel_clk should not be zero 
Change-Id: I8a92a1d12093b3562566349707c7ee0308e7d01c
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Guochun Huang
f16cdb0b9b drm/rockchip: dsi: the bpp should not be zero 
Change-Id: I41d4ec692475014951beb3295e912995a2b17d16
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
 2023-11-07 16:54:13 +08:00
Cai YiWei
097fce7074 media: rockchip: isp: fix build warning 
Change-Id: I44ce213cf48379e496cf47906bcad2cef685b93d
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2023-11-07 16:47:57 +08:00
Huibin Hong
d7c2994c9b soc: rockchip: rk_dmabuf_procfs: check return value of platform_device_register_full() 
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I2d6b83fd4eba02c587b9af52aa91e6b92618085a
 2023-11-07 14:46:12 +08:00
Cai Wenzhong
2182c42cb8 media: i2c: add Maxim Dual GMSL2/GMSL1 to CSI-2 Deserializer driver. 
1. maxim deserializer support: max96716/max96718
1.1 local maxim deserlializer depend on CONFIG_VIDEO_DES_MAXIM2C

2. maxim serializer support: max9295/max96715/max96717
2.1 remote max9295 serializer depend on CONFIG_MAXIM2C_SER_MAX9295
2.2 remote max96715 serializer depend on CONFIG_MAXIM2C_SER_MAX96715
2.3 remote max96717 serializer depend on CONFIG_MAXIM2C_SER_MAX96717

Signed-off-by: Cai Wenzhong <cwz@rock-chips.com>
Change-Id: Iff158e3a05927c8e3d2c17e4aa04bfc0fcc86a37
 2023-11-07 11:28:01 +08:00
Weiwen Chen
dbf5c36476 media: i2c: sc200ai: get camera param from cam-tb-setup 
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ie9aae3722e23f72a5381b64583044c86810c61dc
 2023-11-07 09:51:00 +08:00
Tao Huang
91e80a06a1 Merge commit '64ab42efa552b21f5d9cd259f7f13c8b5125842d' 
* commit '64ab42efa552b21f5d9cd259f7f13c8b5125842d':
  net: can: rockchip: use soft reset for bus off
  net: can: rockchip: fix rx stuck and timeout
  net: can: rockchip: support Listen-only mode
  net: can: rockchip: fix tx error in special application
  arm64: dts: rockchip: rk3588-vehicle-evb-v22: Switch to use standalone NCA9539 driver
  video: rockchip: mpp: fix rkvenc2 run crash issue
  arm64: dts: rockchip: rk3588: dmc add SYS_STATUS_DEEP_SUSPEND
  PM / devfreq: rockchip_dmc: add support SYS_STATUS_DEEP_SUSPEND
  media: rockchip: isp: support change work mode to online with quick stream
  arm64: dts: rockchip: rk3588-vehicle-s66\*maxim\*: Fix pins default pinctrls
  arm64: dts: rockchip: rk3588-vehicle\*maxim\*: Fix pins default pinctrls
  backlight: pwm_bl: fix the state check in power-off
  arm64: dts: rockchip: rk3528: Add low temperature config for opp table
  net: phy: rk630: Fixed for reboot && ping issue

Change-Id: I24998055c32c70cc92b97550bd54fd755ce0430e
 2023-11-06 17:37:03 +08:00
Elaine Zhang
64ab42efa5 net: can: rockchip: use soft reset for bus off 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I8950b7ee8fa677376600599922aa6c40d1af2d0a
 2023-11-06 17:15:22 +08:00
Elaine Zhang
9038fae6bd net: can: rockchip: fix rx stuck and timeout 
In some special applications, tx has read data from the fifo, rx to read
the fifo is 0 when there is no need to do timeout waiting.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7f4bc88ace026088228396da96d628bebb9e4b94
 2023-11-06 17:15:22 +08:00
Elaine Zhang
e903c65661 net: can: rockchip: support Listen-only mode 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I6b566f3f0834ff01e9cff1c1b7ef3934c2e5ec37
 2023-11-06 17:15:22 +08:00
Elaine Zhang
4314dcc88f net: can: rockchip: fix tx error in special application 
add wait tx req cmd.
fix warning: "BUG! echo_skb %d is occupied!"
disable space_rx_mode when tx req to fix extended frame probability
change standard frame.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I0b11d985224682700f43cb155f357b28622dc4be
 2023-11-06 17:15:22 +08:00
Cody Xie
ecd2f7a8a0 arm64: dts: rockchip: rk3588-vehicle-evb-v22: Switch to use standalone NCA9539 driver 
Change-Id: Iff456e2bf6644185a164fba601e914f19c86effa
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
 2023-11-06 16:18:00 +08:00
Yandong Lin
d9794ef01e video: rockchip: mpp: fix rkvenc2 run crash issue 
Calling an interface containing mutex lock after
schedule_preempt_disabled caused the problem.

Call trace:
 dump_backtrace+0xf4/0x118
 show_stack+0x18/0x24
 dump_stack_lvl+0x60/0x7c
 dump_stack+0x18/0x3c
 __schedule_bug+0x6c/0x8c
 __schedule+0x64c/0x9cc
 schedule+0x7c/0xe8
 schedule_preempt_disabled+0x24/0x40
 __mutex_lock+0x224/0xdac
 __mutex_lock_slowpath+0x14/0x24
 mutex_lock+0x40/0xec
 clk_get_rate+0x50/0x134
 rkvenc_run+0x4ec/0x728 [rk_vcodec]
 mpp_task_worker_default+0x2b4/0x494 [rk_vcodec]
 kthread_worker_fn+0x10c/0x244
 kthread+0x104/0x1d4
 ret_from_fork+0x10/0x20

Fixes: ca7fd65693 ("video: rockchip: mpp: rkvenc2: optimize iommu fault handle")
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I1bceea441495a1c6c94776a648601d670b7a29d2
 2023-11-06 16:16:58 +08:00
YouMin Chen
59cc6c2107 arm64: dts: rockchip: rk3588: dmc add SYS_STATUS_DEEP_SUSPEND 
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ia15fc5ce372aeaaef1a009da20e2759f599988bf
 2023-11-06 16:09:59 +08:00
YouMin Chen
8abd0d3f68 PM / devfreq: rockchip_dmc: add support SYS_STATUS_DEEP_SUSPEND 
Set the frequency of SYS_STATUS_DEEP_SUSPEND to devfreq->suspend_freq,
which is the device frequency set during deep suspend phase.

Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ic33ded5cc6a17335404ef65dd071e856bdf7e598
 2023-11-06 16:09:59 +08:00
Zefa Chen
dbcf24dd4c media: rockchip: isp: support change work mode to online with quick stream 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic44728b9e98cb8d15967f3ebdc94ca3d05f7d0e3
 2023-11-06 14:25:38 +08:00
Cody Xie
87742febe2 arm64: dts: rockchip: rk3588-vehicle-s66\*maxim\*: Fix pins default pinctrls 
Change-Id: Ide7bc019d2599888ee52bc1d257f5ba5a598631d
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
 2023-11-06 14:23:09 +08:00
Cody Xie
ce8fb3bb30 arm64: dts: rockchip: rk3588-vehicle\*maxim\*: Fix pins default pinctrls 
Set all default pins to expected input/output values to
prevent glitch during probe.

Change-Id: I29e882f47b8ab1e4d89e29cc1525187a434cba53
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
 2023-11-06 14:23:09 +08:00
Damon Ding
18df0d10b7 backlight: pwm_bl: fix the state check in power-off 
If the default-brightness-level is 0 and related pwm
has been enabled in uboot, the pwm_backlight may not
actually be turned off.

Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I92c0c363a13040e300dd8aa2d40edcad87fa50d0
 2023-11-06 14:21:06 +08:00
Finley Xiao
99f2737534 arm64: dts: rockchip: rk3528: Add low temperature config for opp table 
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7f8813c2508bc1eb024f2e2b327dc298bbe5bcb6
 2023-11-06 11:35:20 +08:00
David Wu
6a5f6ee5bf net: phy: rk630: Fixed for reboot && ping issue 
Fixes: ee144563a5 ("net: phy: rk630: Enable aps && uaps to save power consumption")
Fixes: b67f47f242 ("net: phy: rk630phy: Add adc performance")

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I9519024f839e1648570ea98c77d2c22e58b9bc76
 2023-11-06 11:34:25 +08:00
Tao Huang
2e205b21b6 Merge commit '1dfbd3db7bcb48ddcd94d0803618bb529c805770' 
* commit '1dfbd3db7bcb48ddcd94d0803618bb529c805770':
  pwm: rockchip: add debugfs to dump regs
  drm/rockchip: vop2: fix NULL point when dump regs or active_regs
  arm64: dts: rockchip: rk3308-amp: support ap rpmsg
  ARM: configs: rockchip: enable CONFIG_PWRSEQ_SIMPLE for rv1106-tb-nofastae.config
  arm64: dts: rockchip: rk3588s: Add hclk for npu opp table

Change-Id: Iadea43e59b8fb03f247daa4476d05b57cddf79a0
 2023-11-06 11:25:02 +08:00
Tao Huang
2f4c1463d8 Merge commit 'a4ed886f15adaf1dcdc47c89b6f65408eb48026e' 
Merge using ours merge strategy.

* commit 'a4ed886f15adaf1dcdc47c89b6f65408eb48026e':
  drm/rockchip: lvds: using readable connector name when dual lvds enabled

Change-Id: Ie7cfb06bc1db68503ba9a75650e9cba3d01f9bf4
 2023-11-06 11:24:26 +08:00
Chaoyi Chen
42b9e7680e drm/rockchip: lvds: using readable connector name when dual lvds enabled 
When we enable Dual LVDS, there will be the following
output in the VOP summary node:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-1
...

The connector information here is not clear enough. When Dual LVDS is enabled,
both LVDS-0 and LVDS-1 will be enabled (but we will only expose one connector
to user space for operation, which can shield the underlying differences).

In addition, if only LVDS1 is enabled instead of using Dual LVDS,
"LVDS-1" will also be printed here.

In order to express this information more accurately, we will change
the corresponding connector name to "LVDS-DUAL" when using Dual LVDS:

$ cat /sys/kernel/debug/dri/0/summary
...
Video Port1: ACTIVE
    Connector: LVDS-DUAL
...

Change-Id: I9621338c8bdec4b32772c3558d55b5b426d3ccc4
Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>
 2023-11-06 11:19:34 +08:00
Tao Huang
ee2ea83260 Merge commit '510972e61e134b53564795e4f5319be7a2faae95' 
* commit '510972e61e134b53564795e4f5319be7a2faae95':
  rpmsg: rockchip: Add Soft IRQ Mode Support
  arm64: dts: rockchip: rk356x-evb: update claa070wp03xg panel timing
  ARM: dts: rockchip: update the map of mmc_idmac for rv1106-tb*_mmc
  ARM: dts: rockchip: add clock refs for rv1106-tb*_mmc
  soc: rockchip: thunderboot_mmc: enable clk_emmc before accessing
  drm/rockchip: vop: check for valid sdr2hdr eoth
  drm/rockchip: vop2: make sure the bpp is not zero
  ARM: rv1106-evb.config: enable CONFIG VIDEO SC450AI/SC401AI/SC200AI
  ARM: dts: rockchip: rv1106-evb-cam: add sc450ai/sc401ai/sc200ai

Change-Id: I606b631e81fab4c5f92d3a53b4577bc4da0e93dc
 2023-11-06 11:12:00 +08:00
Tao Huang
df9e22fec7 Merge commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b' 
* commit 'ef1fb629c500d75ae3cd1bf7fbfe38ade30edd0b':
  media: i2c: add sc450ai support

Change-Id: I39d21053083223db0fbf4727744e5d542e240549

Conflicts:
	drivers/media/i2c/Kconfig
 2023-11-06 11:11:30 +08:00
Tao Huang
796ecb79e1 Merge commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2' 
* commit 'ccc60a624971b61ccbe2780289b39fae1c2e88d2':
  media: rockchip: vicap support to do reset in online mode
  media: rockchip: isp support to do reset in online mode
  arm64: dts: rockchip: rk3588 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk356x boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3528 boards: Fix bitclock-inversion
  arm64: dts: rockchip: rk3399-tve1205g: Fix bitclock-inversion
  arm64: dts: rockchip: rk3326-evb: Fix bitclock-inversion
  video: rockchip: mpp: Add uapi header
  soc: rockchip: tb_service: add memory-no-free property support

Change-Id: I068ca307ee0ec53eb570ce4f7fd5604c6bb796d8
 2023-11-06 11:06:11 +08:00
Damon Ding
1dfbd3db7b pwm: rockchip: add debugfs to dump regs 
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I2cef534c3cb9c655258f6fc6e66e696b6293307e
 2023-11-03 18:44:23 +08:00
Sandy Huang
fb2ea0c6bc drm/rockchip: vop2: fix NULL point when dump regs or active_regs 
when vp0 is disabled, the vop2->vps[0].rockchip_crtc.crtc.state is NULL.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I93b3ea4f3ddc6076f2105ebcabf7317627b602a3
 2023-11-03 09:09:30 +08:00
Hongming Zou
4334bb68c1 arm64: dts: rockchip: rk3308-amp: support ap rpmsg 
Change-Id: I0f50eb6e8a4653f4298c499b29168f0031076c7a
Signed-off-by: Hongming Zou <hongming.zou@rock-chips.com>
 2023-11-02 10:32:30 +08:00
Weiwen Chen
2deb8446dd ARM: configs: rockchip: enable CONFIG_PWRSEQ_SIMPLE for rv1106-tb-nofastae.config 
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I67caa4711b664174f0192133d5b6280573b72fc1
 2023-11-02 09:52:39 +08:00