Commit Graph

1276611 Commits

Author SHA1 Message Date
Shawn Lin
4cadd49e1f PCI: dw: rockchip: Add slot power limit support
Change-Id: I135d37768b4fb34e16b7e4a8adc7f8c4cc5d6a1a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2024-10-25 20:34:34 +08:00
Shengfei Xu
d43bf47467 regulator: fixed: Get the configured limit for a current-limited regulator
Change-Id: I0154cdcda406828aff7dcdf884e63e1c74992e4b
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2024-10-25 20:34:34 +08:00
Shengfei Xu
1f5f09ff39 regulator: rk806: Get the configured limit for a current-limited regulator
Change-Id: I96f116dfd21b375cd1cc7e583adfb02c181667cf
Signed-off-by: Shengfei Xu <xsf@rock-chips.com>
2024-10-25 20:34:34 +08:00
Algea Cao
b578fa577b drm/bridge: synopsys: dw-hdmi-qp: Use new edid api
Kernel-6.1 add new api drm_edid_connector_update
can parse hdmi2.1 edid information. Kernel-5.10 old
drm_add_edid_modes in kernel-6.1 is limited to parse
hdmi2.0 edid information. So we must use drm_edid_connector_update
instead of drm_add_edid_modes.

Change-Id: I421049f38ffdec1cb136a02d9100eafd92c1f0a6
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2024-10-25 20:15:38 +08:00
Tao Huang
495fe343ce Merge tag 'v6.1.99'
This is the 6.1.99 stable release

* tag 'v6.1.99': (1975 commits)
  Linux 6.1.99
  Revert "usb: xhci: prevent potential failure in handle_tx_event() for Transfer events without TRB"
  Linux 6.1.98
  nilfs2: fix incorrect inode allocation from reserved inodes
  null_blk: Do not allow runt zone with zone capacity smaller then zone size
  spi: cadence: Ensure data lines set to low during dummy-cycle period
  nfc/nci: Add the inconsistency check between the input data length and count
  kbuild: fix short log for AS in link-vmlinux.sh
  nvmet: fix a possible leak when destroy a ctrl during qp establishment
  platform/x86: touchscreen_dmi: Add info for the EZpad 6s Pro
  platform/x86: touchscreen_dmi: Add info for GlobalSpace SolT IVW 11.6" tablet
  regmap-i2c: Subtract reg size from max_write
  nvme: adjust multiples of NVME_CTRL_PAGE_SIZE in offset
  dma-mapping: benchmark: avoid needless copy_to_user if benchmark fails
  nvme-multipath: find NUMA path only for online numa-node
  ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897
  fs/ntfs3: Mark volume as dirty if xattr is broken
  i2c: pnx: Fix potential deadlock warning from del_timer_sync() call in isr
  clk: mediatek: mt8183: Only enable runtime PM on mt8183-mfgcfg
  clk: mediatek: clk-mtk: Register MFG notifier in mtk_clk_simple_probe()
  ...

Change-Id: Ibf9c2caa3bbffb7a960e82ec6c2b0b497753778c

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	drivers/gpu/drm/rockchip/rockchip_drm_vop2.c
	drivers/phy/rockchip/phy-rockchip-snps-pcie3.c
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/usb/gadget/function/u_audio.c
	include/linux/usb/quirks.h
	mm/cma.c
	sound/soc/rockchip/rockchip_i2s_tdm.c
2024-10-25 17:51:39 +08:00
Tao Huang
af561def2e Revert "regulator: core: Ensure debugfs is fully initialized"
This reverts commit 175fb4a3cc.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-25 17:49:51 +08:00
Jason Zhu
1b1b029fe3 ASoC: codecs: rk_dsm: call regcache_sync() when dsm resume
If not sync regcache when dsm resume, the dsm card occur error
since the value in cache is same with what we set. So that the
value will not sync to dsm registers.

error log:
aplay: pcm_write:2178: write error: Input/output error
rockchip-sai 2a640000.sai: Failed to clear 1

Change-Id: Ia6318dedf12ae696cf05ae59055427932b1638ea
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
2024-10-25 17:36:42 +08:00
Luo Wei
267c32b9db arm64: dts: rockchip: rk3576-vehicle-evb20: fix maxim serdes lock gpio err
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: If64c5cc5db5ec57e63c44eef96ba35eadd36ee44
2024-10-25 16:18:07 +08:00
Luo Wei
7e80a3f182 arm64: dts: rockchip: rk3576-vehicle-evb20: fix adb resume issue
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: If9cefd2b5b1f026ab393e0f28a7db353486382ec
2024-10-25 16:17:48 +08:00
Luo Wei
6ef18fb63d arm64: dts: rockchip: rk3588-vehicle-evb: add reset all for maxim serdes
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I9f71f24458d46ccc3749d89dee7badb43a98ac5f
2024-10-25 16:17:24 +08:00
Luo Wei
afa6bd4208 arm64: dts: rockchip: rk3588-vehicle-evb: keep lcd 12v on
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: I357b28aa26b766604984a7fa9fc18025adf3f657
2024-10-25 16:17:24 +08:00
wei.luo
39864a50c2 arm64: dts: rockchip: rk3588-vehicle-evb: close usb auto suspend
Signed-off-by: Luo Wei <lw@rock-chips.com>
Change-Id: Ia3656f4c3eeec9b31bbe9e939861b0222032f831
2024-10-25 16:17:24 +08:00
Zefa Chen
15a640d32e media: i2c: imx415 fixes error logic of rhs1_old/rhs2_old
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If9f8f245f13f40824a56d95cf315dd88adcf39b8
2024-10-24 18:15:51 +08:00
Huibin Hong
15a69b362c ARM: dts: rockchip: rk3502: support uart frac 96M and 128M
Change-Id: Ifb9c17ee28f4e822836f7aeaa354e3cbd3454e85
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2024-10-24 14:14:22 +08:00
Li Huang
99de7079fe MALI: rockchip: Fix build warning after disable CONFIG_PM
Change-Id: I23002ed6814f4dcdd3f071411907df9328f886b5
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2024-10-24 10:13:25 +08:00
Yao Xiao
e3772da5fa ARM: dts: rockchip: rk3126c-evb-ddr3-v10-linux: fixed ldo5 regulator err
Change-Id: I8aa5bf17c80fe5ba78c8ef1767c0f947ea9b6080
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
2024-10-23 17:16:01 +08:00
Mingwei Yan
46b9b70ded media: rockchip: vpss: online support tile write
Signed-off-by: Mingwei Yan <mingwei.yan@rock-chips.com>
Change-Id: Iab4ca3d82315222543c5f98b5adb8847ed872b3b
2024-10-23 14:16:18 +08:00
Cai YiWei
22ff58327e media: rockchip: isp: fix isp39 no output
Change-Id: Ifd64690705d21cd70f3bd1dd0a81bc18ee2eb796
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-10-23 10:29:22 +08:00
Sandy Huang
c65d2fce11 drm/rockchip: vop2: add reset vp->win_mask
vp->mask must initialize correctly, otherwise after suspend and
resume, the software state[vp->mask] maybe different with hardware
state and lead to close win error or timeout.

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Icc605878b6ac74b24dde44f7933bc761ccdcd526
2024-10-23 10:27:36 +08:00
Binyuan Lan
b021dd5871 ASoC: rk817: fix no sound when capture by tinycap or arecord
Because I2STX_CKE has been set to disable in rk817_codec_shutdown,
then I2STX_CKE_EN should be set when recording.

Change-Id: If1201ad12e33dca21eb443bd32750a73c1fa9f67
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
2024-10-23 09:45:55 +08:00
Shawn Lin
fc59a282e7 PCI: rockchip: dw: Add rockchip,wait-for-link-ms support
Some devices like FPGA or AI cards need a long period of time
after powering up and releasing #PERST. This is due to the slow
firmware loading process happened inside the devices. Without this
support, link will be failed during the limitation.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: I01ecb64ca1b1a1917eb5434c374517387ab11ffc
2024-10-22 18:36:55 +08:00
Zhihuan He
a921bd7a8f memory: dsmc: fix bug in multi cs and region
Change-Id: I792667c6a4a7e9f120da29b1fef19cbd2b40ed9e
Signed-off-by: Zhihuan He <huan.he@rock-chips.com>
2024-10-22 17:24:18 +08:00
Jianlong Wang
87c6fc5b1e net: rfkill: rfkill-wlan: fix compilation error
implicit declaration of function ‘random_ether_addr’

Change-Id: Ibf8c391b43f25b638062686a5e4f396bf79223f0
Signed-off-by: Jianlong Wang <jianlong.wang@rock-chips.com>
2024-10-22 14:43:11 +08:00
William Wu
11ca1d9953 phy: rockchip: usbdp: Fix LFPS detect threshold control
According to the LFPS Tx Low Power/LFPS Rx Detect Threshold [1],
the device under test(DUT) must not respond if LFPS below the
minimum LFPS Rx Detect Threshold 100mV. Test fail on Rockchip
platforms, because the default LFPS detect threshold is set to
65mV.

The usbdp phy LFPS detect threshold voltage could be set to
30mV ~ 140mV, and since there could be 10-20% PVT variation,
we set LFPS detect threshold voltage to 110mV.

[1] https://compliance.usb.org/resources/LFPS_Rx_Tx_Low_Power_Compliance_Update_Rev5.pdf
Change-Id: Idf17df242090027b3b8eb731423a1aa536ed8c09
Signed-off-by: William Wu <william.wu@rock-chips.com>
2024-10-22 14:38:16 +08:00
Shawn Lin
fbdf4ef963 PCI: rockchip: dw: Add remove() support
Add ->remove() support is to meet the requirement of modular
use and test unbind/bind process massively in case we change
the probe() process.

Change-Id: I6267e7e1b55575069179150a10fdfb7b4da5ae52
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2024-10-21 19:40:52 +08:00
Shawn Lin
e15707617c PCI: rockchip: dw: remove wakeup if attached device is down
device_init_wakeup is used for PD driver to leave power-domain
opened during suspend. This feature was originally designed for
Wi-Fi. Check Wi-Fi's power to see if we need to remove wakeup
support before into suspend.

Change-Id: I468157b1d5f9775e3c961d1d059b167c0bb95395
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2024-10-21 19:40:52 +08:00
Shawn Lin
666775e30a PCI: rockchip: dw: Add runtime pm support
Currently, the PCIe pd is in unsupported state which fails to power
down it even if not devices attached.This patch is required when the pcie
controller sits on a bus with its own power domain and clocks which are
controlled via a bus driver like simple pm bus.

Change-Id: Ic0fbaec82a25b92e9b874aa3003f0b18451985a6
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2024-10-21 19:40:52 +08:00
Tao Huang
7073ff96a5 drm/rockchip: dw-dp: Include linux/random.h
drivers/gpu/drm/rockchip/dw-dp.c:567:9: error: implicit declaration of function 'get_random_bytes'

Fixes: 7d048d6dac ("drm/rockchip: dw-dp: Add HDCP function support")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id1c9fc3570877fb6b9900e0a107cff7efb6a91da
2024-10-21 19:40:52 +08:00
Weixin Zhou
ba11507650 arm64: dts: rockchip: rk3576-eink: adjust dmc freq threshold
In order to reduce the power consumption

Change-Id: I251d142bf22526889f7bd7afe3d8a96db2c5dcac
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2024-10-21 19:40:52 +08:00
Liang Chen
6ddfd0766a arm64: dts: rockchip: rk3562j: add opp-table for overdrive mode
Change-Id: I4c39b4e252ec445c080ed0a165853e76c9d1b25c
Signed-off-by: Liang Chen <cl@rock-chips.com>
2024-10-21 10:38:08 +08:00
Elaine Zhang
c4d496df3b arm64: dts: rockchip: rk3562j: remove duplicate can node
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7396ebf0e9a02b395a222a7bedb2d6a353faa544
2024-10-21 10:38:08 +08:00
Shunqian Zheng
f9a997e8c0 ARM: configs: rk3502: use standalone recovery config
Becuase recovery kernel needs initramfs and much smaller than
normal boot kernel, to split them to save disk size and memory usage.

The rk3502-recovery.config and rk3502-robot.config are both based on
rk3506_defconfig.

Change-Id: Id236fe486037aaa958d51ad0a0f5ac84ccaec8fa
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2024-10-18 14:37:26 +08:00
Damon Ding
8f203c43d9 drm/rockchip: gem: remove unused func rockchip_gem_mmap_buf()
The func can be replaced by drm_gem_mmap_obj().

Change-Id: I8a0687ee6f6df70129b8978e993d22158c2c3d64
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2024-10-18 14:36:37 +08:00
Damon Ding
cab061d263 drm/rockchip: fbdev: replace rockchip_gem_mmap_buf() by drm_gem_mmap_obj() in .fb_mmp()
The rockchip_gem_mmap_buf() will call .mmap() of struct
drm_gem_object_funcs twice;

One is:
rockchip_gem_mmap_buf() -> drm_gem_mmap_obj() ->
rockchip_gem_object_funcs.mmap() -> rockchip_drm_gem_object_mmap()

The other is:
rockchip_gem_mmap_buf()-> rockchip_drm_gem_object_mmap()

This will cause the -EBUSY return of vm_map_pages() ultimately.

Change-Id: I3de9eb23f81afa437087e2276d16dd8fb4c003d6
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
2024-10-18 14:36:37 +08:00
Joseph Chen
d883deb664 ARM: configs: rk3506: Add rk801 regulator
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: Iae40ae4b73cde8b1449b53d329b5db5bc1d91a19
2024-10-18 09:37:06 +08:00
Joseph Chen
ef4c4aba2a regulator: rk801: Add driver and fix voltage scale issue
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I0fc66ed8e4279a3fbe1ed9d791de745ffaa30891
2024-10-18 09:35:31 +08:00
Joseph Chen
7db526d176 ARM: dts: rockchip: rk3506-rk801: Add pwrctrl-gpios and vcc_3v3 state mem
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I575a3eaff34e52de4828d80137c87ac6087f5f0e
2024-10-18 09:35:31 +08:00
Tao Huang
c8b3b90ca8 media: i2c: rk628: select CEC_CORE
Fix build error for !CEC_CORE:
drivers/media/i2c/rk628/rk628_hdmirx.c:1235:17: error: implicit declaration of function 'cec_transmit_attempt_done' [-Werror=implicit-function-declaration]
drivers/media/i2c/rk628/rk628_hdmirx.c:1239:17: error: implicit declaration of function 'cec_received_msg' [-Werror=implicit-function-declaration]
drivers/media/i2c/rk628/rk628_hdmirx.c:1252:9: error: implicit declaration of function 'cec_queue_pin_hpd_event' [-Werror=implicit-function-declaration]
drivers/media/i2c/rk628/rk628_hdmirx.c:1284:21: error: implicit declaration of function 'cec_allocate_adapter'; did you mean 'cec_delete_adapter'? [-Werror=implicit-function-declaration]
drivers/media/i2c/rk628/rk628_hdmirx.c:1284:19: error: assignment to 'struct cec_adapter *' from 'int' makes pointer from integer without a cast [-Werror=int-conversion]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib395ed380926d93121ba233b1ce5ce273024de36
2024-10-17 20:10:36 +08:00
Zhibin Huang
efb2e22117 phy: rockchip: mipi-dcphy: optimize pll and ssc calculation
Type: Fix
Redmine ID: N/A
Associated modifications: N/A
Test: N/A

Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com>
Change-Id: If77c1e6526041fdeae07bdc174cddf01bbee4f49
2024-10-17 19:29:27 +08:00
ZiHan Huang
918d45834b ARM: dts: rockchip: rk3506g-demo-display-control disabled uart4 rtsn
Change-Id: Ied346b71a376863d3de204c3195d02233038674c
Signed-off-by: ZiHan Huang <zack.huang@rock-chips.com>
2024-10-17 19:03:40 +08:00
Cai YiWei
a60fdb9e9d media: rockchip: isp: fix dhaz unite for isp39
Change-Id: If7e3587494f454acae74d207c6941c2577439f4b
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2024-10-17 14:37:16 +08:00
Tao Huang
df0794fc58 spi: rockchip-flexbus-spi: Fix build warning for !PM_SLEEP
drivers/spi/spi-rockchip-flexbus-spi.c:367:12: error: 'rk_flexbus_spi_resume' defined but not used [-Werror=unused-function]

Change-Id: I1a8cf00bc51260501847f9797001bf4e10243240
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 19:50:13 +08:00
Algea Cao
bf1992513c drm/rockchip: Fix post csc rgb2rgb matrix
Fixes: 9ce43aae96 ("drm/rockchip: fix some csc parameters error")

Change-Id: I2baaff2c3f9acda2e48c8c6a1cc9cfae1ed232b4
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
2024-10-16 19:48:05 +08:00
Elaine Zhang
42f75109e5 arm64: dts: rockchip: add can nodes for rk3562
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I5cf2df3256e6d3140017766feeacc212930b0f97
2024-10-16 17:47:20 +08:00
Elaine Zhang
ee262b3382 net: can: rockchip: add rk3562 can driver
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ib65f067992701eb73608cc2964b4fc62d792d3f7
2024-10-16 17:47:20 +08:00
Tao Huang
72bf53173b input: touchscreen: parade: Fix build error for !PM_SLEEP
drivers/input/touchscreen/parade/pt_core.c:10591:28: error: 'pt_core_rt_suspend' undeclared here (not in a function)
drivers/input/touchscreen/parade/pt_core.c:10591:48: error: 'pt_core_rt_resume' undeclared here (not in a function)
drivers/input/touchscreen/parade/pt_core.c:17046:28: error: 'pt_core_ebc_resume' undeclared (first use in this function)
drivers/input/touchscreen/parade/pt_core.c:17047:29: error: 'pt_core_ebc_suspend' undeclared (first use in this function); did you mean 'pt_early_suspend'?

Change-Id: Id9594b26941f80d16d13195cf0d8c0e9d5187f9b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 11:38:37 +08:00
Tao Huang
0dc19d1b5f input: touchscreen: ft5726: Fix build warning for !PM_SLEEP
drivers/input/touchscreen/focaltech_touch_ft5726/focaltech_core.c:2096:12: error: 'fts_core_pm_resume' defined but not used [-Werror=unused-function]
drivers/input/touchscreen/focaltech_touch_ft5726/focaltech_core.c:2081:12: error: 'fts_core_pm_suspend' defined but not used [-Werror=unused-function]

Change-Id: Iad119c9a603205e7fd393e28a5c4aff512f57603
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 11:38:33 +08:00
Tao Huang
d93b6deaf2 input: touchscreen: cyttsp5: Fix build error for !PM_SLEEP
drivers/input/touchscreen/cyttsp5/cyttsp5_core.c:6212:28: error: 'cyttsp5_core_late_resume' undeclared (first use in this function); did you mean 'cyttsp5_core_rt_resume'?
drivers/input/touchscreen/cyttsp5/cyttsp5_core.c:6213:29: error: 'cyttsp5_core_early_suspend' undeclared (first use in this function); did you mean 'cyttsp5_core_rt_suspend'?

Change-Id: I820b2bd29f8e3db7c7e8b4af81943b5a6d879a47
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 11:38:29 +08:00
Tao Huang
e6a2a95fb8 drm/rockchip: dw-dp: Fix build warning for !PM_SLEEP
drivers/gpu/drm/rockchip/dw-dp.c:5980:12: error: 'dw_dp_resume' defined but not used [-Werror=unused-function]
drivers/gpu/drm/rockchip/dw-dp.c:5970:12: error: 'dw_dp_suspend' defined but not used [-Werror=unused-function]
drivers/gpu/drm/rockchip/dw-dp.c:5959:12: error: 'dw_dp_resume_noirq' defined but not used [-Werror=unused-function]
drivers/gpu/drm/rockchip/dw-dp.c:5948:12: error: 'dw_dp_suspend_noirq' defined but not used [-Werror=unused-function]

Change-Id: Id49b85c3aaee3da324753b089f5c9617cc581113
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 11:38:19 +08:00
Tao Huang
443adc0c67 drm/rockchip: dw_hdmi: Fix build warning for !PM_SLEEP
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c:4592:12: error: 'dw_hdmi_rockchip_resume' defined but not used [-Werror=unused-function]
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c:4574:12: error: 'dw_hdmi_rockchip_suspend' defined but not used [-Werror=unused-function]

Change-Id: I664da3e2e0df5991aa7f8ffe20487a04dded9e82
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2024-10-16 11:38:07 +08:00