Commit Graph

1072827 Commits

Author SHA1 Message Date
Jianwei Fan
edfb48bcad phy: rockchip: csi2-dphy: modify to adapt fast reverse camera if CONFIG_VIDEO_REVERSE_IMAGE=y
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: I9ce4c20ea056f1b39b2f29e57a55d79331919759
2022-10-28 16:25:50 +08:00
Wyon Bi
ce5b84ec53 drm/bridge: analogix_dp: Don't poll hpd status in analogix_dp_detect_hpd()
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I6008193c58b878ca01abf775c6f61258a1818d8c
2022-10-28 16:25:50 +08:00
Yandong Lin
3c86c6018e video: rockchip: mpp: Optimize ktime_get for each task issue
Get the time only when DEBUG_TIMING flag is enabled

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I7ac49815f24d155cab3967af61dc75e4d92b9d60
2022-10-28 16:25:50 +08:00
Yandong Lin
033bd78a44 video: rockchip: mpp: add calc hw real times per task
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: Ibf21463caae403f7c71884647c546fc46a614f06
2022-10-28 16:25:50 +08:00
Yiqing Zeng
952472b9e7 ARM: dts: rockchip: rv1103-evb-cam: delete ircut for rv1103 evb
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I71230c982489056d626e9f0eb20d1fbe6ce8bc38
2022-10-28 16:25:50 +08:00
Weiwen Chen
fbb4e1f674 ARM: configs: rv1106-battery-ipc.config: enable CONFIG_MSDOS_PARTITION
size vmlinux
after:
   text    data     bss     dec     hex filename
3027212 1332668  180768 4540648  4548e8 vmlinux

before:
   text    data     bss     dec     hex filename
3025900 1332444  180768 4539112  4542e8 vmlinux

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I86bebed3dcd017a8ba3e8111fedd9334b8132173
2022-10-28 16:25:50 +08:00
Sugar Zhang
dcf7535a30 ASoC: rockchip: Add driver support for SAI controller
This patch add support for rockchip sai controller:

* support flexible timing creation, e.g. I2S, PCM, TDM...
* support up to 128 slots per lane
* support up to 4 lanes per direction
* support slot mask
* support mono transfer and receive
* support digital loopback
* support data counter for flow control
* support clk sync among controllers which varies on chips

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I3cd5eb1c1178cc3ca3b6069863787d1fa040b60c
2022-10-28 16:25:50 +08:00
Tao Huang
240a5660d7 phy: rockchip: inno-usb3: Use fallthrough pseudo-keyword
Replace /* fall through */ comment with pseudo-keyword macro fallthrough[1]

[1] https://www.kernel.org/doc/html/latest/process/deprecated.html?highlight=fallthrough#implicit-switch-case-fall-through

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I862e6acd6d9d202131d3cbc7e7fb461a8997a1f2
2022-10-28 16:25:49 +08:00
Yu Qiaowei
b7cda70045 video: rockchip: rga3: modify the process of session exit
When the session exits, there is no need to operate the rga_job directly.

Update driver version to 1.2.21

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I0369dce427dc749795803eae064dc80e33747a7e
2022-10-28 16:25:49 +08:00
Yu Qiaowei
dc81be56db video: rockchip: rga3: add reference counting in rga_job
fixup 'BUG: KASAN: use-after-free in rga_job_next'

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I93bbe7723f923482dd8598f8a7155efdf6cb46d6
2022-10-28 16:25:49 +08:00
Lin Jianhua
dc81a14034 ARM: configs: rockchip_linux_defconfig: enable CONFIG_RFKILL_RK for wifi
Signed-off-by: Lin Jianhua <linjh@rock-chips.com>
Change-Id: I87a2cbd6f7a79033b389d4d2b2da9b2bd9443087
2022-10-28 16:25:49 +08:00
Cai YiWei
25ee175508 media: rockchip: isp: remove unsupported formats
Change-Id: Idb5e1b4350230f156fa5e8cea43893b0526998d9
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-28 16:25:49 +08:00
Weiwen Chen
13b4acb9e4 ARM: configs: rv1106-battery-ipc.config: enable mount vfat
insmod dw_mmc.ko
insmod dw_mmc-pltfm.ko
insmod dw_mmc-rockchip.ko
insmod mmc_block.ko
insmod nls_cp936.ko
insmod fat.ko
insmod vfat.ko

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I7d2e7b5eab74e77dece58036d2a7bcf085fd35dd
2022-10-28 16:25:49 +08:00
Weiwen Chen
55fb389095 ARM: dts: rockchip: rv1106g-evb2-v10: sdmmc support sdcard
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ie803dc6a5f44f89a80250150b2cafc1741516039
2022-10-28 16:25:49 +08:00
Jieyao Hu
a377232464 ARM: dts: rockchip: rv1106g-evb2-v10: extend ramdisk to run rkipc
Signed-off-by: Jieyao Hu <toxicant.bane@rock-chips.com>
Change-Id: I462edeb8d0e03f1d55b485df95461a494c5e376c
2022-10-28 16:25:49 +08:00
Zefa Chen
2b919461fe media: rockchip: vicap: thunderboot support multi camera
if all cameras need deal by isp, only support readback mode

Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Id943e8150fec09e1e7d4eddc0fd92a23ce94c669
2022-10-28 16:25:49 +08:00
Yifeng Zhao
394f669714 mmc: sdhci-of-dwcmshc: improve HS400ES compatibility for some eMMC devices
There is a compatibility problem between the RK3588 and some eMMC devices
with HS400ES mode.

log:
mmc2: mmc_ select_ hs400es failed, error -84
mmc2: error -84 whilst initialising MMC card

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: Ib617b25ed404000ff2c890a423d74c15cd1a60db
2022-10-28 16:25:49 +08:00
Herman Chen
07284976d5 video: rockchip: mpp: Fix mmu sharing on multi device
When the mmu is shared between multi devices the iommu pagefault handler
and its arg should switch to corresponding device for each task.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Id639c7010fb4632a8f03dea6102ac635bc99c4bd
2022-10-21 19:38:17 +08:00
Sugar Zhang
5a2779fa42 ASoC: codecs: Add driver support for rk730
This patch add support for RK730 audio codec.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ia3d883d10cb8a0418f5f4313154f593cc90a1700
2022-10-21 18:11:24 +08:00
Finley Xiao
15e0f834bd soc: rockchip: power-domain: Add new keepon_startup module parameter
Add a new keepon_startup module parameter to allow restoring pd flag.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I1736dc7ecad5c705270e11a167a9cf896a614b2c
2022-10-21 18:10:19 +08:00
Yu Qiaowei
0664d56706 video: rockchip: rga3: remove useless functions in rga_job.c
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I25b4af91709baaff89bed290aadcb419e5c2f6f7
2022-10-21 17:55:54 +08:00
Jon Lin
eb119e2aa5 PCI: rockchip: dw: Support applications that do not perform phy operations
Change-Id: I3762f684b47d634cb7302e2865b9f7f42f53955c
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-21 17:42:50 +08:00
Li Huang
bd4aec9190 dma-buf: heaps: sram_heap: init sram-heap depend on sram driver
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ide523ee2691407afb6bdc18423afaa095dafbb9f
2022-10-21 17:35:13 +08:00
Simon Ser
77d8457938 UPSTREAM: drm: log errors in drm_gem_fb_init_with_funcs
Let the user know what went wrong in drm_gem_fb_init_with_funcs
failure paths.

v2: use proper format specifier for size_t (kernel test robot)

Signed-off-by: Simon Ser <contact@emersion.fr>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: Andrzej Pietrasiewicz <andrzej.p@collabora.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ZS4eX0PtTuNvHezILcTWeWINOkRyMS4krXND3cIE@cp4-web-032.plabs.ch
(cherry picked from commit f7f5250308)
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I94cbf9ccf6e11a48c73dd7e25258b028b5665d01
2022-10-21 17:15:59 +08:00
Huang zhibao
a5f9550317 arm64: dts: rockchip: rk3588-nvr: add dp sound support
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I9b293d3a156c9b62dd8920344f175501386cbc91
2022-10-21 17:08:37 +08:00
Cai YiWei
390394c77d media: rockchip: ispp: fec add compat_ioctl32
Change-Id: I502f46478ffa4f79065fbdbb59f5b26753301adb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-21 17:08:22 +08:00
Cai YiWei
2a2d61d9be media: rockchip: isp: fix stream switch when readback mode
Change-Id: I087f7d6fd266f857c05120226f2505ae51fb1144
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-21 16:58:50 +08:00
Cai YiWei
7cbb5846dc media: rockchip: isp: frame start to update buf for isp30
Change-Id: Ied04130500b7e1d33907b1be2e1baab97118dd45
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-21 11:59:35 +08:00
Cai YiWei
02ffc39dd9 media: rockchip: isp: fix fbc output for isp30 multi sensor
Change-Id: I3509d9ba0d57693976380e37092c227ee2242945
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-21 11:59:35 +08:00
Wyon Bi
6b734afe88 Revert "drm/bridge: analogix_dp: Fix sync polarity configuration in msa packet"
This reverts commit 3cf189f222.

VOP only supports the negative polarity of vsync/hsync on rk3588.

Change-Id: I67ea19f04213739149e245fa1aa5a556e92b5698
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2022-10-21 09:06:55 +08:00
Sugar Zhang
f7d4e932d8 ASoC: rockchip: i2s-tdm: Add support for platform shutdown
This patch allow driver to stop controller in shutdown flow.
A clean stage is safety to reboot. otherwise, there maybe
a risk to hang on DMAC-AXI-I2S state.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I7d04d7a128004ef371cf94bec04aedc895370cd6
2022-10-20 18:50:29 +08:00
Zhichao Yu
9c64acb34a ARM: dts: rockchip: add rv1106g-evb-v11-spi-nand-cvr.dts
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I44fbf74dc8cfbd361f35dbed277a712c0d545701
2022-10-20 15:13:03 +08:00
Yiqing Zeng
d27e9147e7 media: i2c: update hi556 sensor driver
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: If069f3e11074eb7635754c47b39a7b8ca3434219
2022-10-20 15:11:11 +08:00
Weiwen Chen
bf06746858 ARM: dts: rockchip: add rv1103g-evb-v11.dts
diff rv1103g-evb-v11 with rv1103g-evb-v10
1. delete USB OTG power supply
2. modify gpio
   GPIO2_D2: VICAP_VSYNC_M1/LCD_VSYNC/LED_PWM_WHITE
		--> VICAP_VSYNC_M1/LCD_VSYNC/IRC_BIN
   GPIO2_D3: VICAP_CLKOUT_M1/LCD_CLK/IRC_BIN
		--> VICAP_CLKOUT_M1/LCD_CLK/LED_PWM_WHITE
   GPIO3_C5: MIPI_RST0/LCD_PWREN
		--> MIPI_RST0/VICAP_RST
   GPIO3_C6: MIPI_RST1/VICAP_PDN/LCD_BL_PWM
		--> MIPI_RST1/VICAP_PDN/LCD_INT/LCD_PWREN

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I6882fda9a911bbc59f2c4f3e296947f39e5b8d2c
2022-10-20 15:07:30 +08:00
Weiwen Chen
a3bf5c75fc ARM: dts: rockchip: rv1106-evb: Add adc-key
As saradc is disabled, so adc-key is disabled default.
To enable adc-key, add saradc as follow:

&saradc {
    status = "okay";
    vref-supply = <&vcc_1v8>;
};

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ia111f503ed187432ca13dd9a6d37cc000ac25d2b
2022-10-20 15:06:21 +08:00
Weiwen Chen
3c9fec717e ARM: rv1106-evb.config: enable CONFIG_KEYBOARD_ADC
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I465db2552b9fb8d0839b331ed4bcea6bb70391af
2022-10-20 15:06:15 +08:00
Finley Xiao
7bd3db8109 soc: rockchip: power-domain: use power_off_work to release pd
The pd without devices also will power off when release keepon.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I3e37d5909b6fbc28400320959f448f3c92116e17
2022-10-20 14:40:17 +08:00
Finley Xiao
54d4b6b301 soc: rockchip: power-domain: Add always on configuration for power domain
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic57f7f3a564f7d71b680e3c435d0460474b5a4a0
2022-10-20 14:40:17 +08:00
Liang Chen
61e4e95dc6 ARM: configs: rockchip_linux_defconfig: enable some ROCKCHIP configs
CONFIG_ROCKCHIP_CPUINFO=y
CONFIG_ROCKCHIP_GRF=y
CONFIG_ROCKCHIP_IODOMAIN=y
CONFIG_ROCKCHIP_IPA=y
CONFIG_ROCKCHIP_OPP=y
CONFIG_ROCKCHIP_SYSTEM_MONITOR=y

Change-Id: Ia90f5a188226426454cd98e9f8ab15d0c0e26d75
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-10-20 14:37:18 +08:00
Andy Yan
e8cba68e46 drm/rockchip: vop2: no round up parent rate for low freq
rockchip_rk3588_pll_round_rate will return a -EINVAL for
a too low or too high freq, which will make the clk framework
auto round up to a higher freq.

So there is no need to do this at clk driver.

static long rockchip_rk3588_pll_round_rate(struct clk_hw *hw,
                            unsigned long drate, unsigned long *prate)
{
        if ((drate < 37 * MHZ) || (drate > 4500 * MHZ))
                return -EINVAL;
        else
                return drate;
}

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: I3f521e07b1a7639d44efbe12bdc05c4b88621a6e
2022-10-20 14:36:46 +08:00
Yu Qiaowei
7ab31ceb53 video: rockchip: rga3: modify idr
1. idr_alloc uses GFP_NOWAIT.
2. replace idr_alloc with idr_alloc_cyclic.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I52b7d4580462aa7843113777aa09a79091db4502
2022-10-20 10:57:41 +08:00
Cai YiWei
c2af7fd006 media: rockchip: isp: multi sensor for fast case
Change-Id: I47399e80066ff64fe39b026da070c64ffab0c43e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-20 09:18:59 +08:00
Cai YiWei
2209baff7f media: rockchip: isp: second frame first run for fast
Change-Id: Ia67acbcf97d2e93fbf688f4d63b7e8d92a15adff
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-10-20 09:17:05 +08:00
Felix Zeng
02a071c6a4 driver: rknpu: Fix build error when CONFIG_PM_DEVFREQ is not set
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I4dda1b517b1a90e4c95bff964f8a9b58192f5132
2022-10-19 18:59:36 +08:00
Jon Lin
181dca2e09 drivers: rkflash: Support read retry for spinand read ECC fail
Change-Id: I498bc8a133a709ac66c3aeeb1cdd5a5ef2e0b466
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-10-19 18:42:12 +08:00
Guochun Huang
a0c3349037 ARM: configs: rockchip_linux_defconfig: enable CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY
enable CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY for inno mipi dphy

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I78121f4a67fa025890c51b8c290f6c6aa79d5afa
2022-10-19 18:40:15 +08:00
Guochun Huang
2aaca40d95 ARM: dts: rockchip: rk312x: modify dsi node description
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I849b799c4346c1ab039d4650b0e7c0fd27d6cf58
2022-10-19 18:38:28 +08:00
Guochun Huang
ddaecd89d2 drm/rockchip: dsi: add rk312x support
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: Iedf823a62e28b760444f064d6ccfed6a4fe5f36c
2022-10-19 18:38:09 +08:00
Zhichao Yu
2908129ccd ARM: dts: rockchip: add rv1106g-evb-v11-cvr.dts
Add dts for CVR products which enable display panel by default.

Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: Ief34fb5d805fc0bce7ae656eb8a8939b9f840ef7
2022-10-19 18:37:15 +08:00
Guochun Huang
b314c3296f drm/rockchip: logo: call bridge mode_set helper in rockchip_drm_show_logo
drm_bridge require a display mode which pass through by calling
mode_set hooks, but mode_set only be called after setting mode_changed
flags, so call bridge->funcs->mode_set once in advance during kernel
logo which will not setting mode_changed flags.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I81a9c0f05f42dd68a376b669af823c6130462df3
2022-10-19 18:20:23 +08:00