Commit Graph

1065071 Commits

Author SHA1 Message Date
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
Sugar Zhang
42bfca03de ASoC: dt-bindings: rockchip: Add compatible for rv1106 codec digital
This patch adds compatible string for rv1106 codec digital.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I5e3b522223be705b6c799ad84730d9661820ccb4
2022-02-24 11:43:54 +08:00
Sugar Zhang
d98628f00f ASoC: rockchip: i2s-tdm: Add compatible for rv1106 SoC
This patch adds compatible for rv1106 SoC.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Iedae362b8af237d539c6259f8d7376cc0e79a4c3
2022-02-24 11:43:18 +08:00
Sugar Zhang
400db294a9 ASoC: dt-bindings: rockchip: Add compatible for rv1106 i2s-tdm
This patch adds compatible string for rv1106 i2s-tdm.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I2f96883af5d519fe2a9fe3236767ccff8177b8b6
2022-02-24 11:41:19 +08:00
Tao Huang
a6b7505c2b ASoC: rockchip: i2s-tdm: Add HAVE_SYNC_RESET config
$ ./scripts/bloat-o-meter rockchip_i2s_tdm.o.old rockchip_i2s_tdm.o
add/remove: 0/2 grow/shrink: 0/3 up/down: 0/-948 (-948)
Function                                     old     new   delta
rockchip_i2s_tdm_hw_params                  2768    2760      -8
rockchip_i2s_tdm_trigger                    1232    1216     -16
of_i2s_resetid_get                           124       -    -124
rockchip_i2s_tdm_probe                      1676    1496    -180
rockchip_snd_xfer_sync_reset                 620       -    -620
Total: Before=12012, After=11064, chg -7.89%

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I3cffc57ca5fe4271d4a2c9584383777871123f14
2022-02-24 11:37:13 +08:00
Sugar Zhang
1c97242e31 ASoC: rockchip: i2s-tdm: Build depends on CPU config
$ ./scripts/bloat-o-meter rockchip_i2s_tdm.o.old rockchip_i2s_tdm.o
add/remove: 0/8 grow/shrink: 0/1 up/down: 0/-992 (-992)
Function                                     old     new   delta
rk1808_txrx_config                            16       -     -16
px30_txrx_config                              16       -     -16
rk3568_i2s_soc_data                           24       -     -24
rk3308_i2s_soc_data                           24       -     -24
rk1808_i2s_soc_data                           24       -     -24
px30_i2s_soc_data                             24       -     -24
rk3308_txrx_config                            32       -     -32
rk3568_txrx_config                            48       -     -48
rockchip_i2s_tdm_match                      1176     392    -784
Total: Before=13004, After=12012, chg -7.63%

Change-Id: Iaedb9e9b11b38255a7a5b57a9a77c1523fc9d515
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2022-02-24 11:34:50 +08:00
Sugar Zhang
646d6556ee ASoC: rockchip: i2s: Build depends on CPU config
$ ./scripts/bloat-o-meter rockchip_i2s.o.old rockchip_i2s.o
add/remove: 0/1 grow/shrink: 0/1 up/down: 0/-1968 (-1968)
Function                                     old     new   delta
rk3399_i2s_pins                                8       -      -8
rockchip_i2s_match                          2548     588   -1960
Total: Before=8656, After=6688, chg -22.74%

Change-Id: Iabb0a00ab27ce5623164d40de6b379272a81e4e5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2022-02-24 11:33:59 +08:00
Herman Chen
e677dbefa4 video: rockchip: mpp: Fix message batch issue
One mpp_session session can be target of multi-thread ioctl process.
So we need to make struct mpp_task_msgs be independently operated.

Fixes: baccd98fb9 ("video: rockchip: mpp: Add message batch process")
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Ic7b8b6ac75f1508772707399cb7711cfb05a9e6d
2022-02-24 11:29:21 +08:00
Sugar Zhang
26090c38af ARM: dts: rockchip: Rename rv1106/3 to rv1106/3g
RV1103G - QFN88
RV1106G - QFN128
RV1106  - BGA

Currently, the HW PCB is renamed with suffix 'G'
for QFN package. So, we do the same change.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id71e271f04f34f7cfb66ee338154f37236835763
2022-02-23 21:43:20 +08:00
David Wu
41888ca1af net: ethernet: stmmac: Add STMMAC_MMC config option
Add this config option to reduce memory usage about 4388 bytes,
if it was not necessary.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ia0cac913d226f97ea75b67d9c071ad1323a54535
2022-02-23 19:57:42 +08:00
David Wu
2d1e65714c net: ethernet: stmmac: Add STMMAC_PTP config option
Add this config option to reduce memory usage, if it was not necessary.

./ksize.sh drivers/net/ethernet/stmicro/

before size: 70125 Bytes
after  size: 65984 Bytes
save   size: 4141  Bytes

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I82c404a41a7abde6adf38557d8b2096b17b4b6e5
2022-02-23 19:36:01 +08:00
Simon Xue
d3bf1f97b4 dma-buf: heaps: cma: add uncached
Change-Id: I80d8af626693b16eef4b576143c3093fa9ba19d3
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2022-02-23 19:19:15 +08:00
Wyon Bi
965af3f6dc arm64: dts: rockchip: rk3588s-tablet: Enable psr support for edp
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: If66981c3641623bf77ea9d92aa89f36b4aa12769
2022-02-23 11:05:19 +08:00
Yu Qiaowei
9b0e3b157c video: rockchip: rga3: Fix "unknown ioctl cmd" error
Because of the difference in pointer size between 32/64 bit systems.

Update driver version to 1.2.4

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If557cdeb69f1f811eed6cf44419cbb73679dada0
2022-02-22 20:15:36 +08:00
Damon Ding
a87b81ab11 ARM: dts: rockchip: add DSS, VOP and RGB nodes for rv1106
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Iae549241adfc4418a7c149024385df6b81a55bea
2022-02-22 18:56:48 +08:00
David Wu
2f2111686d net: ethernet: stmmac: Add config option for full driver
Add this config option to reduce memory usage, if it was not necessary.

./ksize.sh drivers/net/ethernet/stmicro/

before size: 109539 Bytes
after  size: 70125 Bytes
save   size: 39414 Bytes

Change-Id: I5f6b4573d7358c3b6f046e960c7ddf7d53541b14
Signed-off-by: David Wu <david.wu@rock-chips.com>
2022-02-22 18:41:35 +08:00
David Wu
541323a247 net: ethernet: stmmac: Add config option for stmmac ethtool
Add this config option to reduce memory usage, if it was not necessary.

./ksize.sh drivers/net/ethernet/stmicro/

before size: 121861 Bytes
after  size: 109539 Bytes
save   size: 12322 Bytes

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I828130d961846a955b998d63afffbabcc9dd5925
2022-02-22 18:38:46 +08:00
Chen Shunqing
a42414454f power: supply: bq25890: disable auto dp/dm detection if pd support
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: Ib37679d60fa645771f6152309d0701d2bf768f7d
2022-02-22 18:11:04 +08:00
Damon Ding
6c4fc169ef drm/rockchip: vop: add support for rv1106
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Ibae1c984f55757d95bde9c83ca008a71387f3245
2022-02-22 18:10:34 +08:00
Damon Ding
544d0c6dec drm/rockchip: rgb: add support for rv1106
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I882b7d4724c3d5c6b082cc50218306d9d6983329
2022-02-22 18:10:20 +08:00
William Wu
09c03ebbdf phy: rockchip: inno-usb2: Add usb2 phy support for rv1106
This patch adds phy configuration for rv1106 usb2 phy
which has only one otg port.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: Ida93914f3eae3d692265bcf9751d9150619098af
2022-02-22 17:53:40 +08:00
William Wu
11b7143224 dt-bindings: phy: rockchip-inno-usb2: add binding for rv1106 usb2 phy
This adds "rockchip,rv1106-usb2phy" compatible property.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I84021f8ca2323a4f40b8ac574c89de7e9e78a48d
2022-02-22 17:53:40 +08:00
Jon Lin
592eb21c88 mtd: spi-nor: eon: Enable SECT_4K erase for en25qh128 and en25qh256
Change-Id: I62b462ba666a7975618bf467ec8296353538515f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-02-22 15:04:44 +08:00
Jubin Zhong
83c382f436 FROMLIST: kbuild: Enable armthumb BCJ filter for Thumb-2 kernel
xz_wrap.sh use $SRCARCH to detect the BCJ filter. However, assigning
arm BCJ filter to Thumb-2 kernel is not optimal. In my case, about 5%
decrease of image size is observed with armthumb BCJ filter:

Test results:
  hardware:      QEMU emulator version 3.1.0
  config:        vexpress_defconfig with THUMB2_KERNEL & KERNEL_XZ on
  arm BCJ:       4029808
  armthumb BCJ:  3827280

Choose armthumb BCJ filter for Thumb-2 kernel to make smaller images.

Signed-off-by: Jubin Zhong <zhongjubin@huawei.com>

Link: https://lore.kernel.org/lkml/1637323647-19988-1-git-send-email-zhongjubin@huawei.com/
Change-Id: I23c6e0fd2e54fdc84e78f122d6f4f06e54026696
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-02-22 15:04:18 +08:00
Wyon Bi
8e1b286c67 arm64: dts: rockchip: rk3588-evb2-lp4-v10-edp2dp: Use hpd pinmux
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I1d2bd4e31df86a17fa0a30d78643bf1915d6c066
2022-02-22 14:53:36 +08:00
Wyon Bi
1a4c9d772a drm/bridge: analogix_dp: Rework irq handling
Tested on RK3588.

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Iee8bbe592ea89e29b5e412727312398d3cfb3924
2022-02-22 14:53:17 +08:00
Wyon Bi
6502496d17 soc: rockchip: grf: Connect EDP hpd to IO for RK3588
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Idacba64036c06dbeddd3744f33a300ee79848503
2022-02-22 14:32:47 +08:00
Wyon Bi
1cdd3036b1 drm/bridge: analogix_dp: Send hotplug uevent on modeset failure
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: Ib5db167aff5d8685b021790dcb7d79b63fbedebf
2022-02-22 14:29:06 +08:00
Xiao Ya peng
8e62d08c49 arm64: rk3588_nvr.config: disable PCIE_RK_THREADED_INIT.
Signed-off-by: Xiao Ya peng <yp.xiao@rock-chips.com>
Change-Id: I64bab5cdbe1206374b8760450a4412c5a77750c5
2022-02-22 14:21:37 +08:00
Weixin Zhou
05d63392b5 arm64: dts: rockchip: rk3588s-tablet-rk806-single: Set panel frames to 60fps
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ifae6abf26219a710ff30bf06d832d4a7861091b4
2022-02-22 14:13:38 +08:00
Li Huang
65cfe5f2c0 video: rockchip: rga3: use get_dma_buf to add ref for mpi dma_buf
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ie08cf1a296a166ed5b5bd273d485f6e56a6be022
2022-02-22 11:58:32 +08:00
Li Huang
ffcf7864ac video: rockchip: rga3: fixup rga load
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Id09a22819f4d118d1702b6eb7299279f0bd3fcc8
2022-02-22 11:58:31 +08:00
Li Huang
3392d01212 video: rockchip: rga3: support batch mode
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ib2f9a7815024d468ce1babb0e19789c458653329
2022-02-22 11:58:20 +08:00
William Wu
06f6b703b2 ARM: dts: rockchip: Add usb nodes for rv1106
This patch adds u2phy node and usb controller node for rv1106.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I368acc1dde145b3a985490667e2f4df748e3b3bd
2022-02-21 19:22:43 +08:00
Shaoxing Chen
762bde6c28 r8168: disable CONFIG_SOC_LAN
The function of this configuration is to be used in early SoCs.
limiting the PCIe max request size to reduce the loading of PCIe
transmission performance, it may cause performance degradation.

Signed-off-by: Shaoxing Chen <csx@rock-chips.com>
Change-Id: I35927fde49d96473c01cab62d1b0e461bda43738
2022-02-21 18:28:40 +08:00
Mark Huang
4857316426 arm64: configs: update rk3588_nvr.config
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I38d5bbc0c6d7199a784616b590d9d66b073fc67f
2022-02-21 16:41:07 +08:00
Yu Qiaowei
8cea529be7 video: rockchip: rga3: Synchronization of user-space image formats
Update driver version to 1.2.3

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I73ff1105bf52f67809be42fb1b45ca08451e17cf
2022-02-21 16:04:48 +08:00