Commit Graph

1065751 Commits

Author SHA1 Message Date
David Wu
b4ffd6bfee ethernet: stmmac: Add dma size option property
Sometimes, no need to use more DMA buffer, add a configurable
option from DTB.

Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I81883c1a3531b8805d554a34e07dc50735829ecc
2022-04-07 16:43:33 +08:00
Huibin Hong
b7d5398aee serial: 8250: do not compile codes that are not used by dw 8250
To save memory space for ROCKCHIP_MINI_KERNEL

Changes to vmlinux size:
Before:
   text	   data	    bss	    dec	    hex	filename
4249223	1766500	 134616	6150339	 5dd8c3	vmlinux

After:
   text	   data	    bss	    dec	    hex	filename
4248379	1763012	 134616	6146007	 5dc7d7	vmlinux

delta: 4332 (dec)

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ib1cefe62cf968489cffe37043b29c341d4c60788
2022-04-07 14:39:09 +08:00
Huang zhibao
0fa3507e0d ARM: configs: rockchip: add rv1106-uvc-spi-nor for uvc spi nor board
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I9d00759a7bfbc531c6748f184679598ed9b3cf2a
2022-04-07 14:26:24 +08:00
William Wu
d471d7168a usb: gadget: uvc: fix NULL pointer dereference when usb hotplug
When do uvc hotplug test on RV1126 EVB, it may crash in the
uvc_v4l2_streamon() with the following error log. Because
it tries to enable the video stream after usb disconnect.

[ 1748.947755] configfs-gadget gadget: uvc_function_disable
[ 1748.947947] android_work: sent uevent USB_STATE=DISCONNECTED
[ 1748.955347] Unable to handle kernel NULL pointer dereference at virtual address 00000003
[ 1748.956158] pgd = ef2a7e72
[ 1748.956550] [00000003] *pgd=6dde7835
[ 1748.956893] Internal error: Oops: 17 [#1] PREEMPT SMP ARM
[ 1748.957381] Modules linked in: galcore(O) bcmdhd
[ 1748.957819] CPU: 3 PID: 2706 Comm: uvc_gadget_pthr Tainted: G        W  O      4.19.111 #9
[ 1748.958567] Hardware name: Generic DT based system
[ 1748.959218] PC is at uvcg_video_enable+0xb8/0x228
[ 1748.959775] LR is at vb2_core_streamon+0x11c/0x15c
......
[ 1749.041063] [<b056a2cc>] (uvcg_video_enable) from [<b0569968>] (uvc_v4l2_streamon+0x28/0x70)
[ 1749.041906] [<b0569968>] (uvc_v4l2_streamon) from [<b0590b54>] (__video_do_ioctl+0x1c8/0x3a0)
[ 1749.042681] [<b0590b54>] (__video_do_ioctl) from [<b0594288>] (video_usercopy+0x200/0x494)
[ 1749.043475] [<b0594288>] (video_usercopy) from [<b0220c38>] (do_vfs_ioctl+0xac/0x798)
[ 1749.044178] [<b0220c38>] (do_vfs_ioctl) from [<b0221358>] (ksys_ioctl+0x34/0x58)
[ 1749.044843] [<b0221358>] (ksys_ioctl) from [<b0101000>] (ret_fast_syscall+0x0/0x4c)

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I6bb58133aaade0ff389fa4af2cfc05fe598de250
2022-04-07 14:13:09 +08:00
William Wu
886ed642c8 usb: gadget: udc: core: fix NULL pointer dereference when handle disconnect
This patch fix NULL pointer dereference with the following log
when usb gadget is configured as uvc.

PC is at usb_gadget_disconnect+0x3c/0x4a
LR is at dwc3_gadget_pullup+0xllb/0xl28
 pc : [<b0lfa202>] lr : [<b0le67a7>] psr : 60000033
......
 [<b0lfa202>] (usb_gadget_disconnect) from [<b0lfa227>] (usb_gadget_deactivate+0xl7/0x34)
 [<b0lfa227>] (usb gadget-deactivate) from [<b0lf6e3b>] (usb function deactivate+0x3d/0x86)
 [<b0lf6e3b>] (usb_function_deactivate) from [<b0202421>](uvc_function_disconnect+0xd/0x30)
 [<b0202421>] (uvc_function_disconnect) from [<b0202a9b>](uvc_v412_release+0xlb/0x52)
 [<b0202a9b>] (uvc_v412_release) from [<b0210291>](v412_release+0x73/0x7e)
 [<b0210291>] (v412_release) from [<b007ea9f>] (_fput+0x43/0xc8)
 [<b007ea9f>] (_fput) from[<b00239db>](task_work_run+0x5d/0x76)
 [<b00239db>] (task_work_run) from [<b0016767>] (do_exit+0x2db/0x648)
 [<b0016767>] (do_exit) from [<b0017343>] (do_group_exit+0x33/0x84)
 [<b0017343>] (do_group_exit) from [<b00id2bf>](get_signal+0xl91/0x49a)
 [<b00ld2bf>] (get_signal) from [<b000delf>] (do_work pending+0x87/0x26e)
 [<b000delf>] (do_work pending) from [<b000828f>](slow_work _pending+0x9/0xl6)

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I838d62244e38a20f37ad9b530d5171c5e8de25c4
2022-04-07 14:13:09 +08:00
Xing Zheng
5d45129989 ARM: dts: rockchip: rv1106-ipc: add support acodec sound
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Ib82fd5156c17f4526f27a8313610781f7187e8ad
2022-04-07 14:12:44 +08:00
Cai YiWei
378ece6ad5 media: rockchip: isp: disable ISP_FRAME_IN irq
Change-Id: Ic8c26da72e757863290b6000f28cd1300c1a91c8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 20:37:20 +08:00
Yandong Lin
fa60562f7a media: rockchip: isp: support soft dvbm for vepu
Add interruption every quarter frame to trigger vepu.

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: I57bc0476677f325902224a7dfda3acc2f83c0424
2022-04-06 20:37:20 +08:00
Yandong Lin
0e80bdc8bb video: rockchip: dvbm: support soft dvbm
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I7585e59fbc8fac053e0d03fddc3f23e974c19508
2022-04-06 20:37:20 +08:00
Jianqun Xu
3596edf8a8 ARM: configs: rv1106-evb: enable rk procfs
+CONFIG_RK_MEMBLOCK_PROCFS=y
+CONFIG_RK_DMABUF_PROCFS=y
+CONFIG_RK_CMA_PROCFS=y

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I279d18743c483ebb835aa4a8556c99c9a611b34c
2022-04-06 20:31:45 +08:00
Jianqun Xu
61a59410bf soc: rockchip: Add a dmabuf procfs for rockchip
Dump dmabuf information by a procfs node, support to build as module.

Step1: insmod /oem/usr/ko/rk_dmabuf_procfs.ko

Step2: cat /proc/rk_dmabuf

NAME             EXPORT                 SIZE:KiB   SGLIST

ff660000.npu     rk-dma-heap-cma         432 KiB   0: 0x05711000..0x0577cfff (       432 KiB)
ff660000.npu     rk-dma-heap-cma          20 KiB   0: 0x0570c000..0x05710fff (        20 KiB)
ff660000.npu     rk-dma-heap-cma          20 KiB   0: 0x05707000..0x0570bfff (        20 KiB)
ff660000.npu     rk-dma-heap-cma          20 KiB   0: 0x05702000..0x05706fff (        20 KiB)
ff660000.npu     rk-dma-heap-cma          72 KiB   0: 0x056f0000..0x05701fff (        72 KiB)
ff660000.npu     rk-dma-heap-cma          72 KiB   0: 0x056de000..0x056effff (        72 KiB)
ff660000.npu     rk-dma-heap-cma          72 KiB   0: 0x056cc000..0x056ddfff (        72 KiB)
ff660000.npu     rk-dma-heap-cma        2096 KiB   0: 0x054c0000..0x056cbfff (      2096 KiB)
vmpi             rk-dma-heap-cma          64 KiB   0: 0x054b0000..0x054bffff (        64 KiB)
vmpi             rk-dma-heap-cma          64 KiB   0: 0x054a0000..0x054affff (        64 KiB)

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I70860eea3f1668d98f7e0a11db2e935481accdf9
2022-04-06 20:30:10 +08:00
Jianqun Xu
54a36908c3 soc: rockchip: Add a cma procfs for rockchip
Support to build as module and push to /oem/usr/ko/.

Tested on rv1106 evb:

Step1: insmod /oem/usr/ko/rk_cma_procfs.ko
Step2: cat /proc/rk_cma/rk-dma-heap-cma

Then shows:
Total: 65536 KiB
 Used: 24052 KiB

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: Iab8312cb2467e445259b572c823b775a8b95171a
2022-04-06 19:47:43 +08:00
Jianqun Xu
3b9c49de87 soc: rockchip: Add a memblock procfs for rockchip
Dump memblock information by a procfs node.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I5994851a56db7997134fa628420d026d7258bf06
2022-04-06 19:11:20 +08:00
Jianqun Xu
e09f0c4d0c Revert "dma-buf: dump each dmabuf info"
This reverts commit dde8daabfc.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I79a01a5f7eddb204cbef97d5b300d7ecf49342d7
2022-04-06 19:08:11 +08:00
Jianqun Xu
d700c5c3f9 Revert "mm/memblock: show memblock reserved with size information"
This reverts commit 1fc0ecb55f.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Change-Id: I4ea80186ac8e80c882aee85a15a8e9898a52d433
2022-04-06 19:07:56 +08:00
Shawn Lin
dd3e0d2141 mmc: core: fix vendor DH SD cards as CMD23 broken
Dahua issues a series sd cards against SD spec that cannot support
CMD23 as a mandatory. We need to fix them.

Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
Change-Id: Ic2f4b082df9094e264e20f51a3a79dc0819f191c
2022-04-06 18:14:26 +08:00
Xing Zheng
3bad55bc2e ASoC: codecs: add ADC mode controls for RV1106/RV1103 codec
Generally speaking, the RV1106/RV1103 differential mode
via 1-MIC can meet the needs of most users. If the user
has other ADC mode usage requirements, you can configure
the corresponding ADC mode before starting the recording.

Please do not switch during recording as it will cause
pop noise due to the need to deinitialize the ADC.
Also, the RV1103 does not support full-differential
inputs for both ADCs.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I72c2aec3cc061dcf5884da55dca4deeb2dabd98b
2022-04-06 16:44:27 +08:00
Xing Zheng
a8cfd6151b ARM: dts: rockchip: rv1103: add compatible name of acodec
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I2fbf4b7c349b61b06662e1db8facb7948cc61aad
2022-04-06 16:44:27 +08:00
Cai YiWei
6c7fb6544e media: rockchip: isp: update procfs for isp32
Change-Id: I3b34089f7250eb49a5a987abe6e6f9c24b7014c0
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 16:25:38 +08:00
Cai YiWei
8cb493d7ae media: rockchip: isp: add isp interrupt runtime debug
echo Y > /sys/module/video_rkisp/parameters/irq_dbg

Change-Id: Ic80388d8022ada369f833dcf102c0ee8d4738ae4
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 16:25:38 +08:00
Cai YiWei
2d6219c388 media: rockchip: isp: fix stream link error
Change-Id: I91db78e4e1427ce9d7402c471d205a0878199539
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-06 16:25:38 +08:00
shengfei Xu
e32911345c mfd: rk806: add sysfs debug node
debug node:
	"sys/rk806master/debug" and
	"sys/rk806slave/debug"

Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I845ab17a74586cce181c9e7f093e4492422abb48
2022-04-06 15:02:42 +08:00
Lian Xu
9b24b183d5 media: rockchip: isp: Solve the cmsk problem
Change-Id: I25fe5245b3ea2b757cfca43aca38275e3c9b0c19
Signed-off-by: Lian Xu <xu.lian@rock-chips.com>
2022-04-06 14:32:21 +08:00
Ziyuan Xu
259b3cda10 ARM: rv1106-evb.config: Enable CONFIG_ELF_CORE for coredump
Changes to vmlinux size:
Before:
   text    data     bss     dec     hex filename
4261155 1763832  134672 6159659  5dfd2b vmlinux

After:
   text    data     bss     dec     hex filename
4264247 1764120  134672 6163039  5e0a5f vmlinux

delta: 3380 (dec)

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I8012925cb6fbe422e438eee5a477947afd106f2c
2022-04-06 11:03:07 +08:00
Yiqing Zeng
ed66ba7af4 ARM: dts: rockchip: update camera dts for rv1103g-evb-v10
cause ircut gpios are different between rv1106 and rv1103

Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I851ec2279184a3e5e06d4e4ce42a4de912c6506b
2022-04-06 10:18:23 +08:00
Xing Zheng
42c40c6592 ASoC: codecs: rv1106_codec: Remove unused handlings
Don't need to re-init MICs and keep ADC_BIST_MODE_SEL
by default.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I5dd81e724bd8aeda1f5dce816625ed26eafa00b2
2022-04-06 09:41:22 +08:00
Xing Zheng
2cf5810f2f ARM: dts: rockchip: rv1103-evb-v10: add support acodec sound
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I8b3b31b96120c14c5757c9123bcec76dd6be8fbf
2022-04-06 09:41:06 +08:00
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