Commit Graph

1066174 Commits

Author SHA1 Message Date
Cai YiWei
8742dacb51 media: rockchip: isp: isp32 fix bay3d config
1. memory with diff case
2. fix higaus3_mode
3. lobypass_en=0, no support to switch

Change-Id: Ic7bdc5a924509806a7bb8668dcebcf01b95688f4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 09:31:09 +08:00
Cai YiWei
eb98b5025e media: rockchip: isp: enable mipi drop interrupt
Change-Id: I5eb33c135cb84469a98e2b6b3f932eb3aeee1900
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 09:29:36 +08:00
Sugar Zhang
9a5e5e2408 ARM: dts: rv1106: Fix arm-pmu irq num
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I3969826922658707f027eb0be21d96e0680f046b
2022-04-05 15:33:47 +08:00
Yu Qiaowei
94e75a9785 video: rockchip: rga3: Fixup some error on insmod ko
1. Fixup misc_register fail
2. Move timer init after register success

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I2df5e79054ff6a44d329d4558b105ff5603d6331
2022-04-02 19:28:52 +08:00
Yu Qiaowei
163cdad8ff video: rockchip: rga3: Set the core value when single core
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: I58fa90f96de054467dd1a1d61658377594c73c7a
2022-04-02 19:28:52 +08:00
Yu Qiaowei
86e7631272 video: rockchip: rga3: Decrement the reference of handle when the user exits
Update driver version to 1.2.7

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ied7a0cf3237bfbfb250791a9d0847dad3f6c41f9
2022-04-02 19:28:52 +08:00
Frank Wang
3c93ff8613 usb: gadget: audio: fix sample rate error in uevent
The previous codes did not distinguish the saple rate was playback or
capture in uevent, so fix it.

Fixes: 1abe6982f8 ("BACKPORT: usb: gadget: u_audio: add uevent for set_alt and set_srate")
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I191ba7b303ba8289a6acc054b6be6d224b2f5f89
2022-04-02 19:26:33 +08:00
Damon Ding
e856596ed2 drm/rockchip: rgb: fix the regmap_write logic of rv1106_rgb_enable()
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: Iaea35697ef4b3b91180d68e3c71bcbf732929293
2022-04-02 19:17:08 +08:00
Caesar Wang
725742573d arm64: dts: rockchip: enable hdmi0 and hdmi1 logo for rk3588 evb1 linux
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I75ec8e4903446ad3506f438d1f6c201f7d1d44fc
2022-04-02 19:16:10 +08:00
Caesar Wang
6601bc8398 arm64/configs: update rockchip_linux_defconfig
1/ Enable RK628 HDMI to CSI/BT1120

2/ Enable CONFIG_DRM_DISPLAY_CONNECTOR
Enable the bridge driver for VGA/DP/HDMI display connectors.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Id57abfbc703367ebb8095fea28250c53dbe93697
2022-04-02 19:16:10 +08:00
Yiqing Zeng
89007af35d ARM: dts: rockchip: support ircut for rv1106-ipc
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I6129e618b9f88e2456c01a0d818a5ce52a11adb3
2022-04-02 19:15:02 +08:00
Elaine Zhang
7344989b7e rtc: support rockchip rtc
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I4baae019f411207fb56340b4122ef1d151dcf32d
2022-04-02 18:03:50 +08:00
Yiqing Zeng
da45b1b5e7 ARM: dts: rockchip: rv1106-evb-cam ircut open by default
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I735881f6145a45b4315051fc7c08136d3f3b4c37
2022-04-02 17:14:28 +08:00
Li Huang
42d0222e9f ARM: rv1106-evb.config: Enable ROCKCHIP_RVE_PROC_FS
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: If5e5613e7bc96f7750225e8196ea2799c71c07e4
2022-04-02 17:11:54 +08:00
Li Huang
443c01eb8d ARM: configs: rockchip: rv1106: enable rve
Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I8402c5c811007a157ce42da6e9ddde76e9b1bd11
2022-04-02 17:11:29 +08:00
Zhang Yubing
f14693316b drm/rockchip: dw-dp: reset dp controller status
After disable dp controller, reset it status to avoid something
wrong if the status is abnormal.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I9de6ab056317a09b104ef604a6ef4ec20610fb65
2022-04-02 16:49:54 +08:00
Tao Huang
a36ea1eeec ARM: rv1106-evb.config: Update by diffconfig
Change-Id: Iac6ead2efbade8dc9afa3cf2a83b6a615b9121b0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2022-04-02 15:37:06 +08:00
Jianqun Xu
bd56a6cd51 video: mpp: print error for mpp dma import fd
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ia6f23a599f9570c2296cf067b78cf9ccdc499afb
2022-04-02 15:34:07 +08:00
Zhang Yubing
0c820d56b9 phy: rockchip: usbdp: wait aux channel ready when dp phy power on
If dp send data by aux channel too fast after phy power on,
the aux may be not ready which will cause aux error. Adding
delay to avoid this issue.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I92075e729e637078456ae67897dfb1cbda5da1cb
2022-04-02 15:32:59 +08:00
Finley Xiao
aa228e28b6 soc: rockchip_system_monitor: Separate out custom OPP handler specific code
On some platforms, the dmc driver uses internal rockchip_ddr_set_rate()
to set dmc clock rate, so the system monitor can't use clk_set_rate() to
change dmc clock rate.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: If74f740d87a11f6a6563c3af35a8f335561a88af
2022-04-02 15:32:23 +08:00
Jianqun Xu
3905a45ed5 Revert "ARM: configs: rv1106_defconfig not select DMA_CMA"
This reverts commit 67e0f49d56.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Ifb2677a2c3abf3a5ec5f7ba682b64b5651a62a65
2022-04-02 15:16:49 +08:00
Sugar Zhang
e031e830dd ARM: dts: rv1106: Set arm clk 1.1G default
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I1ee33d10660636e860875c85aa782f123ecd30bc
2022-04-02 15:10:39 +08:00
Sugar Zhang
398f4e6a9c ARM: configs: rv1106: Enable CONFIG_RK_CONSOLE_THREAD
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Id125aa7e5789aa23d696ea053b722e01b225f6bf
2022-04-02 15:07:07 +08:00
Sugar Zhang
bef1ac8669 ARM: configs: rv1106: Disable CONFIG_BLK_DEV_INITRD
-CONFIG_BLK_DEV_INITRD=y

which is used for ramdisk.

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I862718ba843a06c5e50938709966f2da8599294e
2022-04-02 15:07:07 +08:00
Sugar Zhang
c217ac98a1 ARM: configs: rv1106: Enable CONFIG_DEBUG_INFO
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I4f1532dfb80ea6ea4b8e9a21eb9bbfc96b797d84
2022-04-02 15:07:07 +08:00
Ziyuan Xu
b256a98dd1 mmc: block: prefer the host's capability(card_busy) than send_status
According to the specification, the controller should check the device
status before data transport. Generally, it can get the status of device
via CMD13. It's upset that command communication will produce a little
interrupt inside the controller.

To avoid interrupt storm whilst heavily I/O request, use card_busy
instead of send_status(CMD13).

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I3ba79ba2f563006112b0157b78aab5b31911b61a
2022-04-02 15:02:38 +08:00
Sugar Zhang
82a3ed9053 ARM: dts: rv1106: Fix cpu hwid mismatch on !CONFIG_SMP
Fixes:

Booting Linux on physical CPU 0x0
DT missing boot CPU MPIDR[23:0], fall back to default cpu_logical_map

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I02dea605ef1def0bed65e94363661eeb8368f1fb
2022-04-02 15:00:23 +08:00
Lin Jinhan
6c2683a627 crypto: rockchip: v2: pka: Optimize poll time
The most time-consuming operation is the RSA private
 key EXP_MOD operation, which sets the poll time separately.

Signed-off-by: Lin Jinhan <troy.lin@rock-chips.com>
Change-Id: I6307e6134e99dbdfbe2ce75539ba8bed1a703f43
2022-04-02 14:33:34 +08:00
Sandy Huang
d7c77171a7 arm64: rockchip_defconfig: enable CONFIG_ROCKCHIP_DRM_CUBIC_LUT
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ic5c41f191ab3b5afbf1e7e1485ff99540f47a40a
2022-04-01 20:26:59 +08:00
Cai YiWei
118ec0fa14 media: rockchip: isp: vicap->isp online set clk according to sensor rate
Change-Id: I28afea949121509221e2b4ef355455eefdf39dbb
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-01 20:24:42 +08:00
Zefa Chen
da211ba628 media: rockchip: vicap: sditf support get pixel rate
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: If5d902255cec0f81266f5a925420df4de7d597c1
2022-04-01 20:24:42 +08:00
Zhichao Yu
412afcda10 ARM: dts: rockchip: add camera config for rv1103g-evb-v10
Signed-off-by: Zhichao Yu <zhichao.yu@rock-chips.com>
Change-Id: I6ec1b2a7ae2f2707e74d62baeb4187001e74fcdf
2022-04-01 19:52:29 +08:00
Chen Shunqing
0b224f6d4d arm64: dts: rockchip: rk3588: add PCLK_S_HDMIRX for hdcp1.4
Signed-off-by: Chen Shunqing <csq@rock-chips.com>
Change-Id: I09ca47b7171488c90e4e64aae05e1ce5ff47d2f6
2022-04-01 18:02:19 +08:00
Mark Huang
3851d8abf1 arm64: dts: rockchip: rk3588-nvr-demo-v10-spi-nand: update ubi.mtd to 4
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
Change-Id: I72d31311c482d46f646ec9b8af87adca1b8a597f
2022-04-01 17:12:18 +08:00
YouMin Chen
a57fc15ec9 arm64: dts: rockchip: rk3588s: Add more OPPs for dmc
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Icc5ec2946897a8e3e895aac14038167d2cb2b46c
2022-04-01 16:29:01 +08:00
YouMin Chen
b5599a8a61 PM / devfreq: rockchip_dmc: rk3588 set vdd_center to sleep_volt in suspend
Signed-off-by: YouMin Chen <cym@rock-chips.com>
Change-Id: Ia72a4877cd1b3d2bbd7de612bdb9cc92245a6088
2022-04-01 16:29:01 +08:00
Finley Xiao
041c735d54 arm64: dts: rockchip: rk3588-rk806: Change voltage range for vdd_ddr and vdd_log
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I28e5e0a7496115e76ec8d685c8a0b6ad4b3a794b
2022-04-01 16:29:01 +08:00
Zhichao Guo
f827805318 ARM: dts: rockchip: rv1106g-evb1-spi-nand: support wifi and SDcard
spi-nand dts includes rv1106g-evb1-v10.dts to support
wifi and SDcard devices

Signed-off-by: Zhichao Guo <zhichao.guo@rock-chips.com>
Change-Id: Ife7b4fa5d8af70715f5d2b3defa7325f4e639342
2022-04-01 16:12:21 +08:00
Andy Yan
a3e8a9039a drm/rockchip: vop2: Clear splice_mode_right flag of splice_vp
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ie06c61537f87da8616e04bc301a32df1d0864cf5
2022-04-01 16:08:01 +08:00
Jianqun Xu
654739143f ARM: dts: rockchip: rv1106-evb-v10: add coherent_pool=0
When the CONFIG_DMA_CMA is selected, the atomic_pool will be initialized
and allocates 256 KiB defaultly from the default cma area.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I77045a0b9c9f185f33035a406794e4be4d0e2e66
2022-04-01 11:03:02 +08:00
Damon Ding
bd911bb60e ARM: configs: enable DRM_EDID and DRM_SII902X on rv1106-evb.config
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I9645be18d5639848038adfba338adcb590446fee
2022-04-01 11:01:01 +08:00
Damon Ding
a2692740bc drm: Kconfig: DRM_EDID select CONFIG_HDMI by default
Fixes: a92ed4afa9 ("drm/edid: add config option of edid function")
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I01d731a9fd13e11206fcaadc98491835566c948e
2022-04-01 10:59:40 +08:00
Damon Ding
c3509dd346 drm/bridge: sii902x: modify the config select to reduce memory usage
Not to select DRM_MIPI_DSI and SND_SOC_HDMI_CODEC when
ROCKCHIP_MINI_KERNEL selected.

Fixed: 0dace269aa ("drm: bridge: fix LONTIUM use of mipi_dsi_() functions")
       efaede77b8 ("drm/bridge: sii902x: Select SND_SOC_HDMI_CODEC if SND_SOC is configured")
Signed-off-by: Damon Ding <damon.ding@rock-chips.com>
Change-Id: I639e35736f93b7304eac3614b983d6e3e83994ca
2022-04-01 10:58:15 +08:00
William Wu
01ccdd1489 usb: gadget: u_audio: improve uac compatibility
Some PC USB Hosts (e.g Dell laptop) fail to send
SetInterface(AltSet=0) to stop capture/playback
when PC enter suspend or play YouTube Video.

To be compatible with these PC, add this patch to
stop capture/playback prior to start again if the
stream_state is true.

Change-Id: Iced57de39b6b88a7c987897dcb123cf8d7cf6473
Signed-off-by: William Wu <william.wu@rock-chips.com>
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:17 +08:00
Ren Jianing
1abe6982f8 BACKPORT: usb: gadget: u_audio: add uevent for set_alt and set_srate
This patch add uevent to notify the application layer when it should
playback or capture and setting the accuration sample rate.

The event consists of three parts, namely USB_STATE, STREAM_DIRECTION
and STREAM_STATE. For example:

g_audio_work: sent uac uevent USB_STATE=SET_INTERFACE STREAM_DIRECTION=IN STREAM_STATE=OFF
g_audio_work: sent uac uevent USB_STATE=SET_INTERFACE STREAM_DIRECTION=OUT STREAM_STATE=ON
g_audio_work: sent uac uevent USB_STATE=SET_SAMPLE_RATE STREAM_DIRECTION=OUT SAMPLE_RATE=44100

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>

(backported from develop-4.19 commit 55c7a54911)
Change-Id: I9115a8aa57875a440df96b67bb02c3d50f237b29
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:10 +08:00
William Wu
02c6e7f24b BACKPORT: usb: gadget: f_uac1: finalize wMaxPacketSize according to bandwidth
According to USB Audio Device 1.0 Spec, Ch4.6.1.1:
The wMaxPacketSize of endpoint is defined as follows:
Maximum packet size of endpoint is capable of sending
or receiving when this configuration is selected. This
is determined by the audio bandwidth constraints of
the endpoint.

In current code, the wMaxPacketSize is limited to 200,
and the bInterval is set to 4 (1ms). That is, the maximum
bandwidth over USB bus is 200 * 1000 = 200000 bytes.

We find an issue about bandwidth limitation when we try to
support UAC1 with 8ch * 16bit * 16KHz on RK3308 platform,
which needs more bandwidth than it can support.

This patch sets the wMaxPacketSize dynamically according
to the parameters of UAC1. It is similar to the same thing
done earlier for f_uac2.

Signed-off-by: William Wu <william.wu@rock-chips.com>

(backported from develop-4.19 commit 573d2e1e2e)
Change-Id: I3304f9eb4d1eee18f4beb44af46a246940c2dfe3
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
2022-04-01 10:48:03 +08:00
David Wu
931b12539b net: stmmac: Add integrated phy powe up/down for ethernet up/down
For integrated PHY, there is no stmmac_mdio_reset(), so add callback for
the PHY power control during ethernet interface up/down, and suspend/resume.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ib8ae375ee885aecefc7f5b9a6617523186a3f0e1
2022-04-01 10:47:47 +08:00
Li Huang
c002048f4f video: rockchip: rga3: fixup crash on rga_job_next
1. Free job resource when user exit to call release
2. Support rga_seesion.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I87d01ce24d80769bb379c6117798063133e922b3
2022-04-01 10:46:41 +08:00
Li Huang
295acc8ce8 video: rockchip: rga3: code optimization
Use pointer to get scheduler form job.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: Ie928eb30c171763e31f659da0fc6a8f11b1e3a0e
2022-04-01 10:46:41 +08:00
Li Huang
2be1c5ce62 video: rockchip: rga3: code optimization
1. rename rga_scheduler to scheduler
2. sort rga_internal_ctx_* func

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I1a5fd7f1b8b400728ac00c55b684d401ad269dc1
2022-04-01 10:46:41 +08:00