1268083 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tao Huang	972ef7bb84	Merge commit 'c10152d3e7dd7eea6c9e65cdc8fc97d46692fec1' ... * commit 'c10152d3e7dd7eea6c9e65cdc8fc97d46692fec1': media: i2c: sc450ai: add 1344X760 config drm/rockchip: vop2: force to disable cluster-win1 when cluster-win0 is disabled ARM: dts: rockchip: rv1106: add dvbm node to isp media: rockchip: isp: frame start to check and config next buf arm64: dts: rockchip: rk3588-vehicle-evb: set 40ms delay for display mfd: display-serdes: rohm gpio0 support 1MHZ used for pwm mfd: display-serdes: change default pinctrl to init Change-Id: I9d5e4ab36103192d4657c8d4c4bf4e316396700f	2024-01-19 21:14:17 +08:00
Tao Huang	f302276d4e	Merge commit 'e3f7d79af1b514a182765d6d95e65d88aba6f94f' ... * commit 'e3f7d79af1b514a182765d6d95e65d88aba6f94f': (84 commits) media: i2c: rk628: Compatible with both kernel-5.10 and kernel-6.1 media: i2c: rk628: fix audio fs in large offset media: i2c: rk628: check for overflow when i2c operation media: i2c: rk628: add register debugfs node media: i2c: rk628: Auto derepeat media: i2c: rk628: allows the PHY to lock to a low control period media: i2c: rk628: update driver for dsi mode media: i2c: rk628: fix hdmi1.4 change format not recognized media: i2c: rk628: fix i2c timeout media: i2c: rk628: fix display error media: i2c: rk628: fix combtxphy mipi lp-tx output slew-rate media: i2c: rk628: set default timing when driver probe media: i2c: rk628: add support for rk628f hdmirx audio media: i2c: rk628: cru: add hdmirx aud apll support media: i2c: rk628: add apll regmap_range media: i2c: rk628: cru: Add rk628f APLL media: i2c: rk628: read raw state must delay some time when clear interrupt media: i2c: rk628: move some function to rk628_mipi_dphy.c media: i2c: rk628: add csc matrix support media: i2c: rk628: add csi1 support and dual mipi mode for rk628f ... Change-Id: If91f3e03071c93d46cdff8afbf9e45da420bb9f2 Conflicts: drivers/media/i2c/rk628/rk628_bt1120_v4l2.c drivers/media/i2c/rk628/rk628_csi_v4l2.c	2024-01-19 21:10:47 +08:00
Tao Huang	f7bab29ae0	Merge commit '3710e830ff41bf4f9cae6752427d1c82768ba36c' ... Merge made by the 'ours' strategy. * commit '3710e830ff41bf4f9cae6752427d1c82768ba36c': drm/bridge: dw-hdmi-qp: Support hdmi force output dt-bindings: display: rockchip: dw_hdmi-rockchip: Add force output property drm/bridge: synopsys: Support hdmi force output Change-Id: I319d5d72b2e99fa6a94448c1776f020a7494404e	2024-01-19 21:04:41 +08:00
Lan Honglin	c10152d3e7	media: i2c: sc450ai: add 1344X760 config ... fix i2c communication error when fastae convergence too slow Change-Id: Id5f522f139aa1f2982877efac45179830478d4c1 Signed-off-by: Lan Honglin <helin.lan@rock-chips.com>	2024-01-19 21:02:38 +08:00
Algea Cao	ed5631fa51	drm/bridge: dw-hdmi-qp: Support hdmi force output ... Support hdmi output specific resolution and color format regardless of whether hdmi is connected. Signed-off-by: Algea Cao <algea.cao@rock-chips.com> Change-Id: I3f18aeb04427846e06b6a4397a4c6df77bbbcab2	2024-01-19 20:59:47 +08:00
Algea Cao	b318f17508	drm/bridge: synopsys: Support hdmi force output ... Support hdmi output specific resolution and color format regardless of whether hdmi is connected. Signed-off-by: Algea Cao <algea.cao@rock-chips.com> Change-Id: I228a74d128aa818166f589798897729473d97610	2024-01-19 20:57:27 +08:00
Tao Huang	048df626ea	Merge commit '334c7192e6a968d1d6272fec5c956ae35a02a3db' ... * commit '334c7192e6a968d1d6272fec5c956ae35a02a3db': drm/rockchip: drv: display logo when specify force output mode arm64: dts: rockchip: rk3588-vehicle-maxim-cameras-s66.dtsi: camera module and lens name using default arm64: dts: rockchip: rk3588-vehicle-evb-maxim-max9671(/2)2-d(c)phy0(/3).dtsi: camera module and lens name using default arm64: dts: rockchip: rk3588-vehicle-evb: move port dts to bridge node for evb20 Change-Id: I13e8ae92a8f8f9143e2ac5c0cc86b07770354a8d	2024-01-19 20:52:25 +08:00
Sandy Huang	f1f585a98a	drm/rockchip: vop2: force to disable cluster-win1 when cluster-win0 is disabled ... the IC designed need use cluster-win0 first, and at the following case, will appear close cluster-win0 before cluster-win1 and lead to panic: reboot: -> drm_file_free()@drm_file.c -> drm_fb_release(file); -> schedule_work(&arg.work) -> drm_mode_rmfb_work_fn() -> drm_framebuffer_remove(fb) -> atomic_remove_fb(fb); -> drm_atomic_commit(state); -> drm_atomic_helper_check -> drm_atomic_normalize_zpos -> vop2_plane_atomic_check -> vop2_cluster_two_win_mode_check[panic] error log: [ 46.626480][ T27] pc : vop2_cluster_two_win_mode_check+0xd8/0x160 [ 46.626692][ T17] binder: send failed reply for transaction 35888, target dead [ 46.627357][ T27] lr : vop2_plane_atomic_check+0x5e0/0x790 ... [ 46.638943][ T27] Call trace: [ 46.639227][ T27] vop2_cluster_two_win_mode_check+0xd8/0x160 [ 46.639759][ T27] vop2_plane_atomic_check+0x5e0/0x790 [ 46.640241][ T27] drm_atomic_helper_check_planes+0xf0/0x1f8 [ 46.640768][ T27] drm_atomic_helper_check+0x50/0x90 [ 46.641234][ T27] drm_atomic_check_only+0x428/0x920 [ 46.641711][ T27] drm_atomic_commit+0x5c/0xd0 [ 46.642124][ T27] drm_framebuffer_remove+0x278/0x47c [ 46.642596][ T27] drm_mode_rmfb_work_fn+0x40/0xa8 [ 46.643044][ T27] process_one_work+0x1a8/0x3b8 [ 46.643474][ T27] worker_thread+0x300/0x430 [ 46.643875][ T27] kthread+0xec/0x1b8 [ 46.644230][ T27] ret_from_fork+0x10/0x20 Signed-off-by: Sandy Huang <hjc@rock-chips.com> Change-Id: I4ebfe9715515e3b547138461975d32fbd0441e85	2024-01-19 20:44:12 +08:00
Cai YiWei	0f0f4a1576	ARM: dts: rockchip: rv1106: add dvbm node to isp ... Change-Id: Ic78df4181ff8ab565e437aca2eb4279d74a0b7da Signed-off-by: Cai YiWei <cyw@rock-chips.com>	2024-01-19 20:42:38 +08:00
Cai YiWei	ea5b7f59a7	media: rockchip: isp: frame start to check and config next buf ... Change-Id: I6329dc9638b9f4cef2b7fac3a8ba77c255723a38 Signed-off-by: Cai YiWei <cyw@rock-chips.com>	2024-01-19 20:42:12 +08:00
Luo Wei	e4e3454d08	arm64: dts: rockchip: rk3588-vehicle-evb: set 40ms delay for display ... Signed-off-by: Luo Wei <lw@rock-chips.com> Change-Id: Id0961505a8b4ce9e3aa4ada0223bd9ec5eecf44a	2024-01-19 19:57:52 +08:00
Luo Wei	46adc2c927	mfd: display-serdes: rohm gpio0 support 1MHZ used for pwm ... Signed-off-by: Luo Wei <lw@rock-chips.com> Change-Id: I358b2f9c51ecbdc0c913a1123818a2e22a1e4078	2024-01-19 19:57:36 +08:00
Luo Wei	4d84c1dabe	mfd: display-serdes: change default pinctrl to init ... Signed-off-by: Luo Wei <lw@rock-chips.com> Change-Id: I28261b1c785f89859c7c4758a57dcffdba223036	2024-01-19 19:57:36 +08:00
Algea Cao	e3f7d79af1	media: i2c: rk628: Compatible with both kernel-5.10 and kernel-6.1 ... Signed-off-by: Algea Cao <algea.cao@rock-chips.com> Change-Id: I44d2e7e78c0b340daff88d98833ba72a24156a69	2024-01-19 10:11:22 +08:00
Shunhua Lan	bd0e0fedb6	media: i2c: rk628: fix audio fs in large offset ... Signed-off-by: Shunhua Lan <lsh@rock-chips.com> Change-Id: I902243808166273f5b606ca62aa8d7cb3e61c980	2024-01-19 10:11:22 +08:00
Jianwei Fan	ed06aa310c	media: i2c: rk628: check for overflow when i2c operation ... Change-Id: Ia99a7149be4e79589b89345d3f538c64cea5550b Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	24193e127e	media: i2c: rk628: add register debugfs node ... This patch adds support for register debugfs nodes to allow access to the registers without modifying the regmap subsystem configuration. for example: read rk628 csi registers: cat /d/rk628/3-0050/registers/csi write rk628 csi register: echo addr val > /d/rk628/3-0050/registers/csi Change-Id: I1bb4b4acff939718eca43fc24c25cf673726cb4c Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Chen Shunqing	4bbec20710	media: i2c: rk628: Auto derepeat ... Change-Id: I1265250b5cbb6d46eac47b787754a9788064e4d1 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:21 +08:00
Chen Shunqing	ee96162939	media: i2c: rk628: allows the PHY to lock to a low control period ... Change-Id: I5031bfa06bbada16a8d27252f72666f2d80951d7 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	a09738071d	media: i2c: rk628: update driver for dsi mode ... Change-Id: I895e49a64f5164d3665db6d7d7562a5f579ef725 Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Chen Shunqing	a671b1e8c8	media: i2c: rk628: fix hdmi1.4 change format not recognized ... Change-Id: I347f641584aed18e525e114c7b86ab5c41612887 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:21 +08:00
Chen Shunqing	cd5cc57055	media: i2c: rk628: fix i2c timeout ... Change-Id: I21643e939b4b6566b23d72395eaaf74854199e9f Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:21 +08:00
Chen Shunqing	1f2cf41703	media: i2c: rk628: fix display error ... 1. fix black screen when plugout/plugin. 2. fix abnormal display when resolution change. Change-Id: Iecc06805fa1d4f7abbc5d496200ad411185eecd7 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	1619991c86	media: i2c: rk628: fix combtxphy mipi lp-tx output slew-rate ... Change-Id: Ic5373f70af47ac8edc5192275bf7669508181f79 Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	d88d306316	media: i2c: rk628: set default timing when driver probe ... Change-Id: I0f92974fef4a970ae21d24fa685e0f4a94f9e6e4 Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Shunhua Lan	0c3c6c21e8	media: i2c: rk628: add support for rk628f hdmirx audio ... Signed-off-by: Shunhua Lan <lsh@rock-chips.com> Change-Id: I27ca13d2f875be6c1498a3b913b1f358f05bf0e9	2024-01-19 10:11:21 +08:00
Shunhua Lan	a0befaf85d	media: i2c: rk628: cru: add hdmirx aud apll support ... Signed-off-by: Shunhua Lan <lsh@rock-chips.com> Change-Id: I48096a61485b856f09eed0fa53976e0536625515	2024-01-19 10:11:21 +08:00
Shunhua Lan	d8bbd5d31a	media: i2c: rk628: add apll regmap_range ... Signed-off-by: Shunhua Lan <lsh@rock-chips.com> Change-Id: If0b990e76198bceb691d2c5e58263b3fb22f2c5b	2024-01-19 10:11:21 +08:00
Shunhua Lan	a980c4c57c	media: i2c: rk628: cru: Add rk628f APLL ... Change-Id: I109a9662d5a12dba5da3d5c3f4b97e2ede6058de Signed-off-by: Algea Cao <algea.cao@rock-chips.com> Signed-off-by: Shunhua Lan <lsh@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	08ffa240c1	media: i2c: rk628: read raw state must delay some time when clear interrupt ... Change-Id: Ieccfd9135edf3a94d1b74d8c3492984c1b30d6e3 Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	ff0626fcc2	media: i2c: rk628: move some function to rk628_mipi_dphy.c ... Change-Id: I01a826edaf8c766f616a997d7c83f2009d10adac Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	47faf865bc	media: i2c: rk628: add csc matrix support ... Change-Id: If48350f4e9555852785bb2188ab29ae3c0b99961 Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	8468446c8a	media: i2c: rk628: add csi1 support and dual mipi mode for rk628f ... Change-Id: I64907270bcc85ece125f61a6991cfd9d949fe58d Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:21 +08:00
Jianwei Fan	4ef6752418	media: i2c: rk628: bt1120: fix g_mbus_config for dual edge ... Change-Id: I7c1d264d4f93157d9881bd55119e48bebca4463b Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:20 +08:00
Jianwei Fan	94ab144534	media: i2c: rk628: fix r2y_csc_mode when RGB color format input ... Change-Id: I63ab2e27ef17dc0d4af4446da4e6ec50fba8624b Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	08be2e3816	media: i2c: rk628: optimized get resolution probability abnormal ... Change-Id: I99433dc24d993a6ceae8fbc1472cb39d43a72ad1 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	2ef107a7a5	media: i2c: rk628: set background when no signal ... Change-Id: Id7832b2287a4c6eb1747e5ff7dd103d41c762821 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	749fe7836d	media: i2c: rk628: bt1120: compatible with rk628f ... Change-Id: Ia7064e107a326d79bb40381cba3b1dfed31a72c1 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	6e006e21ca	media: i2c: rk628: csi: compatible with rk628f ... Change-Id: I94b7bcf6e2bc5487b34f09961f2294f939ca302c Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	b96278ea87	media: i2c: rk628: hdmirx: compatible with rk628f ... Change-Id: I82c1159ed5307c9bad695fdc8e66dfa1724768e3 Signed-off-by: Chen Shunqing <csq@rock-chips.com>	2024-01-19 10:11:20 +08:00
Chen Shunqing	60857b5b0e	media: i2c: rk628: add version parse func ... Change-Id: I079bcf7a95d38d1e902543fbc522e75a7695db72 Signed-off-by: Chen Shunqing <csq@rock-chips.com> Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>	2024-01-19 10:11:20 +08:00
Guochun Huang	e22969020a	arm64: configs: rockchip_defconfig: enable CONFIG_RK628_MISC ... 1.enable the rk628 misc driver use on rk3568-evb-rk628 2.disable the rk628 drm driver Change-Id: I0fbeb1e56915cf25a0db460c76378a5ccf628518 Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>	2024-01-19 10:11:20 +08:00
Algea Cao	266aa947bf	misc: rk628: Compatible with both kernel-5.10 and kernel-6.1 ... Signed-off-by: Algea Cao <algea.cao@rock-chips.com> Change-Id: Ib170fb0b1a03a211564c88aaad62aa6adf2dd1b1	2024-01-19 10:11:20 +08:00
Zhibin Huang	2daa256567	misc: rk628: rgb/bt1120: optimize dts parsing rgb/bt1120 properties ... 1. change the "bt1120_dual_edge" property from macro definition to parsing in dts 2. "bt1120_dual_edge" and "vccio_rgb" are unique to rk628 rgb, so put them in the rk628_rgb structure. 3. dts property related to rk628 rgb are parsed in rk628_rgb_parse function, including those related to rgb in/out and bt1120 in/out. 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: I1bd7edb9dd28a13cd298142e067e851ef98f83c5	2024-01-19 10:11:20 +08:00
Guochun Huang	fe62e532d4	misc: rk628: fix display anormal after resume form suspend ... rk628->fb_nb.notifier_call helper will be called multi times in Multi-display suspend/resume scenario, process fb_event with FB_BLANK_UNBLANK/FB_BLANK_POWERDOWN only once. Type: Fix Redmine ID: #462145 Associated modifications: gerrit links Test: pass Change-Id: Id323a392b28892c8440c813571a7808bb6e860ed Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>	2024-01-19 10:11:20 +08:00
Zhibin Huang	57be89d348	misc: rk628: dsi: fix bug in dsi signal optimization settings ... Type: Fix Redmine ID: N/A Associated modifications: N/A Test: pass Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com> Change-Id: Icc494d1c4c345ca01c9636ad8a2b47e0d9351972	2024-01-19 10:11:20 +08:00
Zhibin Huang	e39eb26f17	misc: rk628: rgb/bt1120: optimize signal ... Type: Fix Redmine ID: N/A Associated modifications: N/A Test: pass Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com> Change-Id: Ib3fdaf00bc666535a68ccb424dc09619d4319360	2024-01-19 10:11:20 +08:00
Zhibin Huang	efcb534a24	misc: rk628: fix rk628 summary ... Type: Fix Redmine ID: N/A Associated modifications: N/A Test: cat /d/rk628/2-0050/summary Signed-off-by: Zhibin Huang <zhibin.huang@rock-chips.com> Change-Id: Ifdd75679d65a4b6887b1f9909ae194125f2cbf1a	2024-01-19 10:11:20 +08:00
Chaoyi Chen	7fa3e04a00	misc: rk628: lvds: Add support for media bus format dt-bindings ... In previous versions, the bus-format of lvds could be set with prop "vesa_24", "jeida_24", etc. In order to maintain consistency with the panel node, this patch adds support to for set bus-format via the `MEDIA_FORMAT` number macro. rk628-lvds { /* Equivalent to bus-format = "vesa_24"; */ bus-format = <MEDIA_BUS_FMT_RGB888_1X7X4_SPWG>; }; Change-Id: I3a8e51c58cfb52ff6b03917d9b33e96fa419bea1 Signed-off-by: Chaoyi Chen <chaoyi.chen@rock-chips.com>	2024-01-19 10:11:20 +08:00
Sandy Huang	331fc6de1e	misc: rk628: gvi: enable panel/backlight after gvi locked ... This can avoid display splash screen before gvi locked. Signed-off-by: Sandy Huang <hjc@rock-chips.com> Change-Id: Id32d637cd4af8c33f9629abd7c788db6b7e13df9	2024-01-19 10:11:20 +08:00