shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,280,383 Commits 55 Branches 2,486 Tags
12f0cb64318fbb4d072cf0785516c81a792c8a43
Commit Graph

1280383 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Damon Ding
12f0cb6431 drm/rockchip: vop2: not to create plane_mask property of CRTC for VOP3 
RK3528/RK3562/RK3576 use the VOP3 architecture, which supports
flexible switching of planes between different VPs. User can switch
planes between different CRTCs based on the &drm_plane.possible_crtcs
in userspace, so the 'PLANE_MASK' property is not required.

Change-Id: Icbd75bc4602fcfd69a10f2be9f5a8375bd7f2abe
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2025-02-11 11:19:50 +00:00
Damon Ding
591e580fcd drm/rockchip: vop2: add cycles_per_pixel check for both rgb and mcu interfaces 
The RGB interface also supports formats that have multiple cycles per
pixel, such as MEDIA_BUS_FMT_RGB888_3X8, MEDIA_BUS_FMT_RGB565_2X8_LE,
and so on. And the &drm_display_mode.crtc_clock should be multiplied by
the return value of rockchip_drm_get_cycles_per_pixel().

Fixes: 3cb261be89 ("drm/rockchip: drv: fix the dclk calculation of mcu interface")
Change-Id: Idbb6f6ef2ac17dc0dd63d67519733dbd1e29e9dd
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2025-02-11 16:35:45 +08:00
Damon Ding
825560b30c drm/rockchip: vop: add cycles_per_pixel check for both rgb and mcu interfaces 
The RGB interface also supports formats that have multiple cycles per
pixel, such as MEDIA_BUS_FMT_RGB888_3X8, MEDIA_BUS_FMT_RGB565_2X8_LE,
and so on. And the &drm_display_mode.crtc_clock should be multiplied by
the return value of rockchip_drm_get_cycles_per_pixel().

Fixes: 3cb261be89 ("drm/rockchip: drv: fix the dclk calculation of mcu interface")
Change-Id: I85c0168ccfaedbf5566a2c6b8f86e881fbc93ad0
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2025-02-11 16:28:47 +08:00
Cai YiWei
e6270f2d22 media: rockchip: isp: fix bilinear scale no output if unite mode 
Change-Id: Ic8ea66fdde4b139d961803e16fab2481dd72355a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2025-02-11 06:10:32 +00:00
Tao Huang
596e50f65e Revert "Wifi: add rtl8723au & rtl8723bu wifi support." 
This reverts commit 522c0bb37a.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I92b585b8eff58cd585717d0dffda7701f1875a5e
 2025-02-11 06:09:47 +00:00
Algea Cao
cbb33e40aa drm/rockchip: vop2: Ensure rk3576 sharp/post-scaler/split are mutually exclusive 
VOP sharp/post-scaler/split use the same line buffer.
They must be mutually exclusive, otherwise the picture
will display abnormally.

Change-Id: Ia8e7877826bf2a4484a4060ea4d704a2edc611c3
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
 2025-02-10 12:19:47 +00:00
Ding Wei
8f25f9d7c3 arm64: dts: rockchip: rk3528: Add iommu shared bitmask for avsd and vdpu 
Change-Id: I42807997f85e9e43c2a7f490fd9af7c87b30fec6
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2025-02-10 16:15:29 +08:00
Ding Wei
a6943befb9 video: rockchip: mpp: fix share iommu issue for rk3528 on Arch32 
Issue:
1. On arm32 platform iommu use the mapping->domain, while use the
   group->domain on arm64 platform.
2. __iommu_attach_group use group->default to judge whether new device
   in kernel 5.10 branch, while use group->domain in kernel 6.1 branch.
   For this change, when two devices share the iommu, the first device
   attach success, while the second device failed in kernel 6.1 branch.

Method:
1. Set driver_managed_dma=true to ensure that during the IOMMU probe
phase,
   even if attach group failed, the mapping will not be released.
2. After the IOMMU probe succeeds, record info->domain=mapping->domain
and
   detach it, ensuring that group->domain is set to NULL. This prevents
the
   next device which sharing the IOMMU, not return -EBUSY when attach
the
   group.
3. Before hardware running, the shared IOMMU should check whether the
   device has been switched. If so, it needs to attach the current
   device's info->domain.
4. When removing a shared IOMMU, it must also ensure that group->domain
   corresponds to the current device.

Change-Id: If0fec01a0bcf9c49850129bfa5ac28484fece9a2
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2025-02-10 16:15:29 +08:00
Tao Huang
f346f25228 Revert "power: add universal charger driver support" 
This reverts commit 9f2ddf5a0c.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I56ad273f1da0a8d55a0e53a010a3b3c680212e7f
 2025-02-10 06:15:48 +00:00
Simon Xue
e5ecfb7289 iio: adc: rockchip_saradc: fix crash cause by saradc 
fix the crash caused by interrupt occurring before info->last_chan is ready

Change-Id: I6a57d49d5af6fb35708e009c33422ad936af0d3f
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2025-02-10 06:15:15 +00:00
Simon Xue
bb5e238d4f iio: adc: rockchip_saradc: fix the variable naming conflict 
fix the variable naming conflict with "lock" when CONFIG_ROCKCHIP_SARADC_TEST_CHN enabled

Change-Id: I9f2925fb6e4be642cacf8e5d5c764e33d13b9cc4
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2025-02-10 06:15:15 +00:00
Damon Ding
3ae279210e drm/bridge: analogix_dp: add support for ASSR mode 
According to the eDP v1.3 chapter 3.6 Table 3-15, Alternative
Scramble Seed Reset(ASSR) is a recommended way for eDP Sink devices
to support Display Authentication and Content Protection as Method
3a, while Method 1 HDCP is normally not expected in an eDP Sink
device.

In addition, the ASSR support capability should be the bit 0 of
DPCD register 0000Dh according to the eDP v1.4 'Revision History'
table 2:

......
Table 3-4: Corrected reference to DPCD Address 0000Dh, bit 0 (was bit 4)
......

Change-Id: Iafad97755fd4c9e688c47164d099b290af905036
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
 2025-02-10 06:10:07 +00:00
Abel Vesa
8281b215f4 UPSTREAM: phy: Add Embedded DisplayPort and DisplayPort submodes 
In some cases, a DP PHY needs to be configured to work in eDP mode.
So add submodes for both DP and eDP so they can be used by the
controllers for specifying the mode the PHY should be configured in.

Change-Id: I130b491edcf2624697489b18a3ab24add535840f
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20240324-x1e80100-phy-edp-compatible-refactor-v5-1-a0db5f3150bc@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
(cherry picked from commit 368d67dab4cc4a3ffd39fbd062b2f5796cdbb37b)
 2025-02-10 06:10:07 +00:00
Yu Qiaowei
2f5b41f4aa video: rockchip: rga3: enable scale/FBC-in error intr 
Update driver version to 1.3.8

Change-Id: I40371f680c4d67e4a78338dad84f73b268e8877d
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2025-02-08 16:21:16 +08:00
Yu Qiaowei
60e3a31479 video: rockchip: rga3: fix boundary protection for RGA2 average 
Change-Id: Id646a2c5fd1a4e5335cbb049a8263ca9c25deabc
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
 2025-02-08 15:29:00 +08:00
Sandy Huang
668a142bfb drm/rockchip: dsi2: update for dsi timing limit 
rk3576:
    max_vfp:8191, max_vsync:1023, max_vbp:1023
rk3588:
    max_vfp:1023, max_vsync:1023, max_vbp:1023

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I0f7777c1dbbd7de6f4b86bf6a0647ef1a1a46516
 2025-02-08 07:00:35 +00:00
Tao Huang
aa897b8ab2 Revert "misc: add gpio-detection driver" 
This reverts commit d0d2368bf8.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5d38c29967a7a284fd1bb048fdd96247931a0b0d
 2025-02-08 02:06:33 +00:00
Tao Huang
fdce2e1ee0 Revert "power: charger: add new sy6982c/sy6982e driver" 
This reverts commit 38c57424d4.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibad478fd393cb69fa78a00020eebc65d43c5ac5d
 2025-02-08 01:50:35 +00:00
Yandong Lin
0d5f21d790 video: rockchip: dvbm: sync code from 5.10 
Merge from kernel 5.10

video: rockchip: dvbm: support dual dvbm wrap config
video: rockchip: dvbm: simplify the dvbm module codes
video: rockchip: dvbm: modify api to adapt rv1103b

Change-Id: Idd1e0e98392cc1314d6dc67e512cfe1f660d691c
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
 2025-02-08 01:46:43 +00:00
Tao Huang
ecd317b0bd Revert "power: add ec battery driver" 
This reverts commit 620a4f67a4.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5bfeb24fdda20fb2b0ff93cebdc9d7dd878841dc
 2025-02-08 01:00:38 +00:00
Tao Huang
0143c72295 Revert "misc: add usb camera pd pin control driver" 
This reverts commit 3344984bec.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ic45376d824f855353960f8969f3073c606b38599
 2025-02-07 20:11:58 +08:00
Tao Huang
87d2d0e0e1 Revert "Documentation: DT: ASoC: add for rockchip HDMIIn" 
This reverts commit 949f0095eb.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2466644a1618e50380d54e546102680a6d0facdd
 2025-02-07 19:57:02 +08:00
Tao Huang
704255dd5a Revert "Documentation: DT: ASoC: add toshiba tc358749x" 
This reverts commit cd8c7b5b05.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I45ce51c96e592657c3fa0d107ce9945dc9e02ae5
 2025-02-07 19:56:29 +08:00
Tao Huang
28235e6dc3 Revert "ASoC: dw-hdmi-audio: add dummy codec for DesignWare hdmi" 
This reverts commit 1d660dce67.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4f1c7275b718f90dd0e6075018239c31b2bbfd2a
 2025-02-07 19:55:12 +08:00
Tao Huang
40b645fcb2 Revert "Documentation: sound: add rt3261 codec documentation." 
This reverts commit 85d067dc7e.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I150018be86c69bb1182e04977bf0726a13191d2d
 2025-02-07 19:54:16 +08:00
Tao Huang
4f8e410b81 Revert "ASoC: Add gva codec driver" 
This reverts commit 3655e45471.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I64fb3d8525bcf8cbed7c46b6eee9ccb73daa0ab4
 2025-02-07 19:53:23 +08:00
Tao Huang
f314f93295 Revert "drm/panel: add support for Sharp F402 2048x1536 panel" 
This reverts commit e8308567c1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ib31ea08e072f1091149623f70c0ece3056944d4c
 2025-02-07 19:51:51 +08:00
Tao Huang
f65a051e7c Revert "drm/panel: simple: Add support for LG LM270WR3-SSA1" 
This reverts commit a5ca275f86.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If8b97afc79a26fbfb535327b03bc7cb3005fcaad
 2025-02-07 19:50:24 +08:00
Tao Huang
ae8ae3b771 Revert "drm/panel: simple: Add support for LG LM238WR2-SPA1" 
This reverts commit 8b76818914.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie27f8f403cbe0b6636bf538bb33e90d49cbff8cb
 2025-02-07 19:50:00 +08:00
Tao Huang
fcef954628 Revert "drm/panel: simple: Add support for INNOLUX N125HCE-GPA 1920x1080 panel" 
This reverts commit bc41bde50a.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5672d18405db65dd7a6f147316316720e61786f1
 2025-02-07 19:49:28 +08:00
Tao Huang
d950bee6db Revert "drm/panel: simple: Add support for BOE NV124FHM-N73 1920x1080 panel" 
This reverts commit f67be24239.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ifd888cbb5fd9630a05528dd5639ad58a67493766
 2025-02-07 19:48:51 +08:00
Tao Huang
d6992856f6 Revert "drm/panel: simple: Add support for BOE MV270QUM-N10" 
This reverts commit db8a437fd3.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iae5175ce87b3d110cb0cd9bae6b2d0095b7e96ff
 2025-02-07 19:48:19 +08:00
Tao Huang
90ca19f9a5 Revert "drm/panel: simple: Add support for BOE MV238QUM-N20" 
This reverts commit 7ba25eea80.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I22eda1c029691e4053cd5a8b0f79fdaebcd25fdc
 2025-02-07 19:47:46 +08:00
Tao Huang
66190a3935 Revert "drm/panel: simple: Add support for AUO B125HAN03.1 1920x1080 panel" 
This reverts commit f712e42bd1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I71101db366c3d11585944aab606db4dcfa55c849
 2025-02-07 19:46:43 +08:00
Tao Huang
a76724bff4 Revert "dt-bindings: Add support for AUO B101EW05 1280x800 panel" 
This reverts commit 92c763a6a1.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5204028bfcde0dc745f08ea6f710442b10c708e6
 2025-02-07 19:45:41 +08:00
Lin Jianhua
5abb1bd80b ARM: dts: rockchip: rk3506-evb2-v10: update matrix-keypad 
Change-Id: I8fefeb356ae23285300b869eb4640902f1261c91
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
 2025-02-07 15:01:28 +08:00
Huang zhibao
9e2ef257d6 arm64: dts: rockchip: rk3576-evb2: Remove vcc3v3_lcd_n 
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ieb50556d5ed41c23005137c60153d604906f79c7
 2025-02-06 06:32:40 +00:00
Tao Huang
35f9183723 mmc: dw_mmc: Explicitly include linux/pinctrl/consumer.h for pinctrl_select_state 
Change-Id: I94a11f222ed5ae7ed3be1b8e69f71a19667aa381
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 18:44:58 +08:00
Tao Huang
47102b506a regulator: rk806: Explicitly include linux/pinctrl/consumer.h 
Change-Id: I9b4c7b5ec442536bef78aeec3e0ea151ec670c35
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 18:44:58 +08:00
Tao Huang
7166d5f4bb mfd: rk806: Explicitly include linux/pinctrl/consumer.h 
Change-Id: I4cb4f8d7b88319100f5646b4f96fbe5b73cc96a1
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 18:30:08 +08:00
Tao Huang
4f984d8890 ASoC: aw87xxx: Explicitly include vmalloc.h 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Id22433d505871dbaecc5fe717d11393a193bcc1c
 2025-02-05 18:24:00 +08:00
Tao Huang
e5dac74356 firmware: rockchip_sip: Explicitly include vmalloc.h 
Change-Id: Ibdbd04178e7da485a0187b33c327c7f35c33a8a5
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 18:17:09 +08:00
Tao Huang
b77ddffd87 drm/rockchip: tve: Explicitly include linux/platform_device.h 
Change-Id: If99af821b63244229912fc0797d241a211a4fbea
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 17:51:38 +08:00
Tao Huang
c6443c0b46 drm/rockchip: dsi2: Explicitly include linux/platform_device.h 
Change-Id: Ie4b6eb3e89618984f7fdc4aeb305b065779552d6
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 17:47:47 +08:00
Tao Huang
643604e150 clk: rockchip: rk3328: Explicitly include linux/platform_device.h 
Change-Id: Idfe90228e880090a19ab944f34f13e973b84e20c
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 17:43:38 +08:00
Tao Huang
a355f5a2a0 clk: rockchip: rk1808: Explicitly include linux/platform_device.h 
Change-Id: Icdd546d52a9fb37fd96e0b2a628fda41f910561b
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 17:41:50 +08:00
Tao Huang
aa258f62fb input: touchscreen: parade: use "prompt" instead of "bool" for choice prompts 
Change-Id: I0119334ded45a6431f5657b64118b14ebfe376e8
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 09:25:52 +00:00
Tao Huang
c9c714620d input: touchscreen: cyttsp5: use "prompt" instead of "bool" for choice prompts 
Change-Id: Ie5635f06817a6191be30cbb36d227bb43f7a498f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
 2025-02-05 09:25:52 +00:00
Tao Huang
be7b2f21b3 drivers: rkflash: Fix Kconfig Segmentation fault 
Fix following error:
[scripts/kconfig/Makefile:56: menuconfig] Segmentation fault (core dumped)
on v6.12.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie767e45e4ee9025efe95186e3d1a4a7f6a7d0867
 2025-02-05 16:47:55 +08:00
Tao Huang
e9991c5bc2 media: i2c: imx498: Fix typo in Makefile 
Fixes: 0ad1b882f4 ("media: i2c: add imx498 sensor driver")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5a153b90c76eb75450f2590db03820570ab45d1d
 2025-02-05 16:15:42 +08:00