shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 03:15:31 +09:00
Code Issues Packages Projects Releases Wiki Activity
1,065,107 Commits 55 Branches 2,486 Tags
5b68b2315775c61922c84ec1512febfe5fda8a2f
Commit Graph

1065107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Algea Cao
5b68b23157 phy: rockchip-samsung-hdptx-hdmi: Use udelay instead of usleep in clk enable 
usleep shouldn't be used in an atomic context.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I9c6accd1b17488f4ad25b79681856c47fab29d20
 2022-02-28 20:11:41 +08:00
Tao Huang
35c71f05ee arm64: rockchip_gki.config: update only 
CONFIG_ROCKCHIP_FIQ_DEBUGGER default FIQ_DEBUGGER.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Icecc1afbb068ba35caaeb0112943e3389f455169
 2022-02-28 19:37:45 +08:00
Tao Huang
112dd88035 arm64: rockchip_gki.config: Temporarily disable CONFIG_PCIE_DW_ROCKCHIP 
ERROR: modpost: "dw_pcie_write_dbi2" [drivers/pci/controller/dwc/pcie-dw-rockchip.ko] undefined!

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I450aa9a91753de5cca6c2f1a99f14988e324e1c8
 2022-02-28 19:02:26 +08:00
Tao Huang
0c782f48ae arm64: rockchip_gki.config: Temporarily disable CONFIG_ROCKCHIP_MULTI_RGA 
ERROR: modpost: "arch_dma_prep_coherent" [drivers/video/rockchip/rga3/rga3.ko] undefined!
ERROR: modpost: "iommu_get_dma_domain" [drivers/video/rockchip/rga3/rga3.ko] undefined!

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I7c095ea3ee96da6547309235abb6936db0e9e8c6
 2022-02-28 19:00:49 +08:00
Tao Huang
23b123381e net: rfkill-wlan: Export rfkill_get_wifi_power_state() 
Export the rfkill_get_wifi_power_state() for use by pcie-dw-rockchip.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I122d74da9271f2f808fbd474386994778561cbf8
 2022-02-28 18:58:36 +08:00
Lin Jinhan
58390fe65b ARM: dts: rockchip: rv1106: add crypto node 
Change-Id: I93de0d0d8f89f7c2678fe42afeaa2dfad26a8383
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
 2022-02-28 18:37:48 +08:00
Lin Jinhan
0c4c2e5f42 ARM: dts: rockchip: rv1106: add trng node 
Change-Id: I70aa72440d7e253ef2ffbf293ca06e05833ee627
Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
 2022-02-28 18:37:41 +08:00
Sugar Zhang
2ab5cd125e ARM: dts: rv1106: Add property 'pinctrl' for uart/i2c/dsm nodes 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifb2acb3c4a41335555e6143fbdad8e8cffbb9747
 2022-02-28 18:31:54 +08:00
Lin Jinhan
ab02399797 crypto: rockchip: v2: ahash init/update/final use hardware crypto 
1. disable crypto interrupt when crypto is idle
2. ahash init/update/final use hardware crypto
3. reset crypto cc before cipher/hash hardware init

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Id2c85c36c9f2fbe34af553b3ba12239e3cd281b4
 2022-02-28 16:44:39 +08:00
Lin Jinhan
567bbaa82b crypto: rockchip: v2: modify the algos supported by each platform 
1. add sha224/sha384 support.
2. XTS mode was removed due to panic on some platforms(RV1126 kernel 4.19).

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I339cb21c6abefa684f9d36e8faaa04d6ab43d3b1
 2022-02-28 16:44:39 +08:00
Lin Jinhan
931b0eb60e crypto: rockchip: v2: skcipher: fix bugs for librkcrypto test 
1. On RV1126/RV1109, AES-192 dma-fd should not use hardware crypto.
2. Fixed a bug with CTR rk_iv_copyback in chain mode.
3. Modify cryptodev log information to reduce runtime logging.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: Ib197e0df4f0ff0c7f4cd20832f25be1b21e8cbf3
 2022-02-28 16:44:39 +08:00
Yu Qiaowei
b61d06ed70 ARM: dts: rockchip: Add RGA2 node for RV1106 
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I7e5d9f50b9b602a16d752595cdc79b487466bb7b
 2022-02-28 16:23:47 +08:00
Tao Huang
4a76b481c5 ARM: dts: rockchip: Fix some error for rv1106 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I9676b55c581706c5c1891efbe5dba188707c5463
 2022-02-28 16:00:37 +08:00
Elaine Zhang
af46b9fee0 ARM: dts: rockchip: Add tsadc nodes for RV1106 
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Idcd24edbd417e89288030920539a94002ec34173
 2022-02-28 15:59:15 +08:00
Simon Xue
7a58edc59d ARM: dts: rockchip: rv1106: add saradc/wdt_ns/hw_decompress 
Change-Id: I727e614a6c4385f49737e5bf013f677cc1676067
Signed-off-by: Simon Xue <xxm@rock-chips.com>
 2022-02-28 14:57:22 +08:00
Jon Lin
46553c0153 ARM: dts: rockchip: Add spi and sfc node for rv1106 
Change-Id: I40d45231200f30fc7fc0a122f849d8f2552bcd09
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2022-02-28 14:53:37 +08:00
Jon Lin
ac7ae60a15 spi: rockchip: add compatible string for rv1106 
Change-Id: Ib0cd5150a917ca3f082825bfea8922dc7afcef2e
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
 2022-02-28 14:37:28 +08:00
Tao Huang
6be1c0df05 fiq_debugger: request_nmi when !CONFIG_NO_GKI 
GKI no export enable_nmi/request_nmi symbol.

Fixes: 58e8ae42ae ("fiq debugger: support nmi mode")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia20cfd0241fca379360ae512b5986d05f98dd53f
 2022-02-28 14:20:06 +08:00
Tao Huang
03217a2278 pinctrl: rockchip: Fix rk3588 ioc reg name 
Add RK3588_ prefix.

Fixes: 7c357cd7cf ("pinctrl: rockchip: add rk3588 support")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If4377311deafac122ac6d27f5a00d6337cdbb170
 2022-02-28 11:42:47 +08:00
Tao Huang
e0b522f62b net: ethernet: stmmac: STMMAC_[ETHTOOL|FULL|MMC|PTP]/DWMAC_ROCKCHIP_TOOL default y if !ROCKCHIP_MINI_KERNEL 
STMMAC_ETHTOOL/STMMAC_FULL/STMMAC_MMC/STMMAC_PTP and DWMAC_ROCKCHIP_TOOL
default n if ROCKCHIP_MINI_KERNEL.

Fixes: defb18abcd ("net: ethernet: stmmac: dwmac-rk: Add config option for dwmac-rk-tool")
Fixes: 541323a247 ("net: ethernet: stmmac: Add config option for stmmac ethtool")
Fixes: 2f2111686d ("net: ethernet: stmmac: Add config option for full driver")
Fixes: 2d1e65714c ("net: ethernet: stmmac: Add STMMAC_PTP config option")
Fixes: 41888ca1af ("net: ethernet: stmmac: Add STMMAC_MMC config option")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibb4221bd052aef96f48c722ac61baf069b3af2db
 2022-02-27 15:26:04 +08:00
Tao Huang
4ee33b2d19 drm: DRM_EDID and DRM_DP default y if !ROCKCHIP_MINI_KERNEL 
DRM_EDID and DRM_DP default n if ROCKCHIP_MINI_KERNEL=y.

Fixes: a92ed4afa9 ("drm/edid: add config option of edid function")
Fixes: f031ad34e5 ("drm/rockchip: add config option of DRM DP support")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3e5b42381306edf31e95dfca8690a26a1683aecf
 2022-02-27 15:20:58 +08:00
Tao Huang
5e8a9b4279 init/Kconfig: source init/Kconfig.gki when !ROCKCHIP_MINI_KERNEL 
make gki config invisible when ROCKCHIP_MINI_KERNEL=y.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I63e92df2af93a8022be64755610c890eb1726d3f
 2022-02-27 15:16:43 +08:00
Tao Huang
1d042ec21e soc: rockchip: Add ROCKCHIP_MINI_KERNEL config 
This option make the kernel size smaller.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I0106c8570a6df6e2c8e807b5fae97957406c029e
 2022-02-27 15:15:38 +08:00
Sugar Zhang
857d7f245b ARM: configs: rv1106: Enable THUMB2_KERNEL 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ie4f605879213b33a13dd182b5ad0edc1fc4dde6b
 2022-02-25 18:57:48 +08:00
Sugar Zhang
9950d1eea9 ARM: configs: rv1106: Build device drivers as module 
-CONFIG_VIDEO_ROCKCHIP_CIF=y
-CONFIG_VIDEO_ROCKCHIP_ISP=y
+CONFIG_VIDEO_ROCKCHIP_CIF=m
+CONFIG_VIDEO_ROCKCHIP_ISP=m
-CONFIG_VIDEO_OS04A10=y
-CONFIG_ROCKCHIP_RGA2=y
-CONFIG_ROCKCHIP_MPP_SERVICE=y
+CONFIG_VIDEO_OS04A10=m
+CONFIG_ROCKCHIP_RGA2=m
+CONFIG_ROCKCHIP_MPP_SERVICE=m
+CONFIG_PHY_ROCKCHIP_MIPI_RX=y

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I71ae1c8c9806c4cf918914c7f1990424243fe2f2
 2022-02-25 18:57:48 +08:00
Sugar Zhang
111992965b ARM: configs: rv1106: Disable CONFIG_DRM 
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I47ee991f8ed7aa55353a4f95a6b4be4711191511
 2022-02-25 18:57:48 +08:00
Finley Xiao
b077ae84d9 Revert "HACK: lib/kobject_uevent.c: ignore thermal uevent when suspend" 
This reverts commit fc2be569e8.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I647c757a003a61055211299260222d2f480ca317
 2022-02-25 17:46:18 +08:00
Finley Xiao
6580996b5b soc: rockchip_system_monitor: Add support to set uevent suppress for cpu 
Android healthd try to listen power_supply subsystem uevent,
but which will block system from suspend on big.LITTLE system
because thermal_cooling_device_unregister will called when
cpufreq_exit. So ignore this uevent when suspend.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2ce98efce1bcaa06cfc87f305b6730f67eb1eb3c
 2022-02-25 17:44:51 +08:00
Steven Liu
b8cdbf0c87 ARM: dts: rockchip: Add pinctrl nodes for RV1106 
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Id870403d0b67d4397f03c2a19e62edc1d671d302
 2022-02-25 17:26:42 +08:00
Mark Huang
44d1641bcc arm64: dts: rockchip: rk3588-nvr-demo: support logo for dp 
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I16df6ec7efe5bc1e4fb4532e044e9e1a6b0609ca
 2022-02-25 16:26:33 +08:00
Sugar Zhang
4e4e569501 phy: rockchip: mipi-rx: Fix compile err 
drivers/phy/rockchip/phy-rockchip-mipi-rx.o:
In function `rockchip_mipidphy_probe': phy-rockchip-mipi-rx.c:(.text+0x1104):
undefined reference to `v4l2_async_notifier_parse_fwnode_endpoints_by_port'

Fixes: 5f3c2be123 ("phy: rockchip: mipi-rx-dphy: fix compile error")
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I9491f015f9742aa4e1ca6e72600e32be2b0fbb2e
 2022-02-25 15:54:02 +08:00
Mark Huang
a68ba49925 arm64: dts: rockchip: rk3588-nvr-demo: adjust mode for usb otg 
For nvr product,the USB OTG controller works device mode by default.
for box,the USB OTG controller works otg mode by default.

Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I23942704a0617739b37fe93a319322b03d653bac
 2022-02-25 15:39:32 +08:00
Zefa Chen
dc5b422317 media: i2c: sensor adapter fix bug when set sensor register 
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Icfb7f574bfc47791102b3c3dbfcff85bf62e1bef
 2022-02-25 15:39:04 +08:00
Sandy Huang
82e5690aaa drm/rockchip: vop2: fix splash screen at dual display 
More explanation see: https://redmine.rock-chips.com/issues/336332

Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ia12768d6206e20def068ed3cbf59c08b0a8da7ab
 2022-02-25 15:38:10 +08:00
Zhang Yubing
de30a9e538 drm/rockchip: dw-dp: Support dp show uboot logo 
When dp show uboot logo, It need skip the init process of dp
controller and set the phy status as power on.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I7dc3a00c1e71f92648cbb49ca527eb2a9f9026ac
 2022-02-25 15:37:51 +08:00
Zhang Yubing
0a88c6e023 phy: rockchip: usbdp: Add phy initial status 
When DP show the uboot logo, the usbdp phy will work in uboot.
In this case, the display on DP will be broken if we initialize
the usbdp phy again when system enter kernel.

Reading the lane mux and enable register when probe the usbdp
phy driver. If DP used the usbdp phy in uboot, It should skip
the initialization.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I55dcf8bd9c0b8be94326dd17c53ad47237cd1975
 2022-02-25 15:37:51 +08:00
Mark Huang
39fd1066b7 arm64: dts: rockchip: rk3588-nvr-demo: add force-output for hdmi 
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: Ie34ebc9ab9ac9a3a1605b8b98e55db9e7e494bd2
 2022-02-25 15:35:08 +08:00
Zhang Yubing
f666dbb62a arm64: dts: rockchip: rk3588: add dp uboot logo 
Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I071053ff5acb908e2bafe4234ead7a0a30d31345
 2022-02-25 14:37:40 +08:00
Tao Huang
5e4edefa6f ARM: configs: Rename rv1106_mini_defconfig to rv1106_defconfig 
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ia4af42f2fe7b7899ad172508b12933a35082a4f2
 2022-02-24 16:42:16 +08:00
Algea Cao
a92ed4afa9 drm/edid: add config option of edid function 
rv1126 does not support display interface which need to
read and parse edid, such as hdmi and dp, so add config
option to reduce memory usage.

./ksize.sh  drivers/gpu/drm/

before ksize: 380303 Bytes
after  kszie: 325509 Bytes
save   about:  54794 Bytes

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I0c3813711cfdb4a38ec66136569ca826c94c6c58
 2022-02-24 16:20:22 +08:00
Cai YiWei
c4c4ef6660 media: rockchip: isp: fix bigmode for multi device for isp21 
Change-Id: If9b82e58081c1c09f0a0d387e7cafeed86d25f05
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2022-02-24 16:11:38 +08:00
Cai YiWei
44f4d6c0a0 media: rockchip: isp: 3a params config first for isp21 
Change-Id: Ib8b04ba027527c159bc15e5d757eed055256f740
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2022-02-24 16:11:38 +08:00
Jianwei Fan
e3656e83e6 media: i2c: s5k3l6xx: fix VOD and Tr/Tf registers 
Modify the VOD of sensor output MIPI signal to 450mV and
Rise/Fall time to 60ps.

Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ib80904770ff0561fd10a40d1ba7a467d7aa7a31d
 2022-02-24 15:54:27 +08:00
Binyuan Lan
a212f58bdb ASoC: rockchip: rk817-codec: enable chop and reduce record gain 
Signed-off-by: Binyuan Lan <lby@rock-chips.com>
Change-Id: I144cf8845961f3c03d53afd48754d20fe7789a66
 2022-02-24 15:53:20 +08:00
Ding Wei
8ac72c875a video: rockchip: mpp: Fix issue for multi-core jpeg encoder 
tips:
1. each task may work different core, thus, if use session->mpp
   then it will be change when each alloc task.
2. alloc_task and isr are in the different thread, so, the session->mpp
   will be overwrite when following task alloc.
3. based above, use task->mpp instead of session->mpp is the better.

backtrace when error:
[   36.421939 ][  T160 ] mpp_vepu2 fdba4000.jpege-core: no current task
[   36.623432 ][    C6 ] Unable to handle kernel NULL pointerdereference at virtual address 0000000000000102
[   36.624290 ][    C6 ] Mem abort info:
[   36.624615 ][    C6 ]   ESR = 0x96000005
[   36.624966 ][    C6 ]   EC = 0x25: DABT (current EL), IL = 32 bits
[   36.625509 ][    C6 ]   SET = 0, FnV = 0
[   36.625856 ][    C6 ]   EA = 0, S1PTW = 0
[   36.626212 ][    C6 ] Data abort info:
[   36.626546 ][    C6 ]   ISV = 0, ISS = 0x00000005
[   36.626953 ][    C6 ]   CM = 0, WnR = 0
[   36.627292 ][    C6 ] user pgtable: 4k pages, 39-bit VAs,pgdp=0000000107211000
[   36.627934 ][    C6 ] [0000000000000102] pgd=0000000000000000,p4d=0000000000000000, pud=0000000000000000
[   36.628797 ][    C6 ] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[   36.629365 ][    C6 ] Modules linked in: bcmdhd r8168
[   36.629843 ][    C6 ] CPU: 6 PID: 0 Comm: swapper/6 Not tainted5.10.66 #1092
[   36.630472 ][    C6 ] Hardware name: Rockchip RK3588 EVB1 LP4 V10Board (DT)
[   36.631095 ][    C6 ] pstate: 20400089 (nzCv daIf +PAN -UAO -TCOBTYPE=--)
[   36.631721 ][    C6 ] pc : __queue_work+0x24/0x538
[   36.632154 ][    C6 ] lr : delayed_work_timer_fn+0x24/0x34

Change-Id: I610f16ec33ef29217975779ba5d09c7274009c61
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
 2022-02-24 15:52:15 +08:00
William Wu
2272d9dec7 usb: dwc3: gadget: get the txfifos depth properly 
The DWC3 controller may have different RAM configurations.
For 2-RAM configuration and 3-RAM configuration, the RAM1
depth is used for the TxFIFOs. And for 1-RAM configuration
(e.g. RV1109/RV1106), RAM0 depth contains the descriptor
cache depth, RxFIFOs depth, and TxFIFOs depth.

This patch checks the number of RAM configuration from
the hwparams1 and get the TxFIFOs depth correctly.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Iff0c4d0540d920ca9277496e27d2b9f90e956341
 2022-02-24 15:28:07 +08:00
Huang zhibao
8e32ff5d7e arm64: dts: rockchip: rk3588-nvr: swap cpu big and little 
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I4e3a57f5a61717dbb7577b5ac8cf0d0352489303
 2022-02-24 15:22:45 +08:00
Yu Qiaowei
b405430e1c video: rockchip: rga3: Fix parameter error of RGA3 blend mode 
layer binding:
    src => win0
    src1/dst => win1
    dst => wr

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I12709d578ce65b9a52d5275e873c660a5b1774d9
 2022-02-24 15:00:04 +08:00
Sugar Zhang
5cbd397dce ASoC: rk_codec_digital: Build depends on CPU config 
$ ./scripts/bloat-o-meter rk_codec_digital.o.old rk_codec_digital.o
add/remove: 1/10 grow/shrink: 0/1 up/down: 4/-796 (-792)
Function                                     old     new   delta
rv1126_data                                    8       -      -8
rk3588_data                                    8       -      -8
rk3568_data                                    8       -      -8
rv1126_soc_deinit                             28       -     -28
rk3588_soc_deinit                             28       -     -28
rk3568_soc_deinit                             28       -     -28
rv1126_soc_init                               32       -     -32
rk3588_soc_init                               32       -     -32
rk3568_soc_init                               32       -     -32
rcd_of_match                                1176     588    -588
Total: Before=8057, After=7265, chg -9.83%

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I40332029ac33a29cff039ec07ea3a2d0995badac
 2022-02-24 11:45:22 +08:00
Sugar Zhang
3d04628d29 ASoC: rk_codec_digital: Add support for rv1106 SoC 
This patch adds compatible for rv1106 SoC.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2b8b716330400c43981494aa0826e92293b07eec
 2022-02-24 11:45:03 +08:00