Commit Graph

1065794 Commits

Author SHA1 Message Date
Cai YiWei
554bc72503 media: rockchip: isp: fix init format for struct no clean
Change-Id: I95d3ed7fdcab9347909d0c21bee6084a852ff878
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2022-04-11 17:46:01 +08:00
Sugar Zhang
e9f7fb01ed ARM: configs: rv1106-ipc: Disable CONFIG_DEBUG_FS
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: I6c463e080ecfd43d5dac01317ceb8e5c4a357ebb
2022-04-11 17:35:41 +08:00
Sugar Zhang
8176a3e43b ARM: configs: rv1106: Disable SUSPEND
Before:
   text	   data	    bss	    dec	    hex	filename
2722849	1132060	  88232	3943141	 3c2ae5	vmlinux

After:
   text	   data	    bss	    dec	    hex	filename
2691259	1120796	  85232	3897287	 3b77c7	vmlinux

Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ifaff6a772e0b4891e6acb22a785da6881f6ec80d
2022-04-11 17:35:13 +08:00
Liang Chen
1d32c1eda0 cpufreq: rockchip: ignore error of rockchip_set_opp_prop_name()
Use default opp_prop_name if rockchip_set_opp_prop_name() failed.

Change-Id: If086d8beaab69e35657a9c8e9087a2e20eac67ab
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-11 17:28:32 +08:00
William Wu
f1ac6da358 phy: rockchip: inno-usb2: tuning phy for rv1106 and rv1103
This default usb2 phy configuration of rv1106 and rv1103
isn't the best for HS signal quality. We should tuning
phy to get better HS eye height and slew rate.

And this patch also decrease the Rx squelch trigger point
for better compatibility.

Change-Id: Ie0356ac8f1250a820eddc2076c7258c60c0f3910
Signed-off-by: William Wu <william.wu@rock-chips.com>
2022-04-11 12:37:53 +08:00
Jon Lin
4ede567fb0 mtd: spi-nor: core: Info data line
Change-Id: If3d05a695ef738438b905564a76af21f69ad7c94
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-04-11 11:05:55 +08:00
Cai YiWei
8713ec7589 media: rockchip: isp: fix rv1106 clk to 350
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
Change-Id: Ic51964325ad49a746f358cab0da83966bb3896cb
2022-04-11 08:51:10 +08:00
Tao Huang
b346fa7155 android: default disable ANDROID_STRUCT_PADDING if NO_GKI
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ie80bff8b17fee0c574a69119e79a196754c044e8
2022-04-11 08:50:12 +08:00
Qingqing Zhou
4a04b93fc7 UPSTREAM: ANDROID: Configure out the macros in android_kabi and android_vendor
Add one CONFIG to control removing the macros or not. On some platform,
configureing out the macros removes the associated members from the
structs, this reduces the object size of the slabs related with the
structs, therefore reduces the total slab memory consumption of system.

Besides, this also reduces vmlinux size a bit, therefore the total
kernel memory size increses a bit.

The macros are ANDROID_KABI_RESERVE, ANDROID_VENDOR_DATA,
ANDROID_VENDOR_DATA_ARRAY, ANDROID_OEM_DATA, ANDROID_OEM_DATA_ARRAY.

Bug: 206561931
Change-Id: I0868d299ccce3c4b39f42af17916828500be6cc4
Signed-off-by: Qingqing Zhou <quic_qqzhou@quicinc.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit b7a6c15a6f)
2022-04-11 08:50:12 +08:00
Liang Chen
fb16e65a3d cpufreq: dt-platdev: Add rv1103 project into blacklist
Change-Id: I813b2cb95d908313281882e01784b53571b4394f
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-09 15:56:08 +08:00
Yu Qiaowei
c5666b7c9e video: rockchip: rga3: Fix the physical contiguous memory can not get iova
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Iadf28d87e77bb29581420a18e2e4a688d8973c47
2022-04-08 21:31:53 +08:00
Frank Wang
89826f50a8 usb: gadget: uac: add mute and volume uevent support
Send uevent for application when mute or volume was changed.

Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Change-Id: I482ee595fae893c6ae7a0d040588fa9ffcbc5538
2022-04-08 21:31:17 +08:00
Jon Lin
0e31ad550f UBI: Force write recheck
At the moment of power lost, flash maybe work in a unkonw state,
and result in page write fail.

Using Reset IC 2.93v threshold to detect 3.3V IO can improve the
situation and revert this commit.

Change-Id: I0dbc4c971b4be13b0137269515a68e6593937087
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-04-08 21:31:02 +08:00
William Wu
b26a8f8ccc phy: rockchip: inno-usb2: add helpers to update bits of registers
Add three helpers phy_clear/set/update_bits() for registers operation.

Change-Id: Ie11d355ca1d8856baced39c2caf82e143284e5a3
Signed-off-by: William Wu <william.wu@rock-chips.com>
2022-04-08 21:29:22 +08:00
Jon Lin
9514fbc87b mtd: spi-nor: Enable w25q128 SPI_NOR_QUAD_READ
Change-Id: I79e2b7c7c987328a2ae524108142e44718d26304
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2022-04-08 21:25:03 +08:00
Jason Zhu
62a4f41407 ASoC: codecs: rv1106_codec: disable pop sound
If enable pop sound with DAC, pop sound may be recorded when the
ADC is opened to record sound with intermittent opening DAC.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I8cec66b9c62fafa404a6a016d33d15680d5b780a
2022-04-08 21:22:22 +08:00
Sugar Zhang
46a05a3661 ARM: dts: rockchip: rv1106: Change uart console baudrate to 115200
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: If5336b6dc32fdfd1a5f9c823e03afd15bcaffed6
2022-04-08 21:21:11 +08:00
Liang Chen
75b7e91ee6 ARM: dts: rockchip: rv1106-evb-v10: add cpu-supply for cpu node
Change-Id: I2c442bbd715e8dc184b207b9e41373d86233c0cf
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-08 21:19:40 +08:00
Liang Chen
1f70aa07f7 ARM: dts: rockchip: rv1106: add opp-table for cpu
Change-Id: Ia1f9b8b3a68da741199258a04ea58002307afe40
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-08 21:19:19 +08:00
Liang Chen
098afc57a1 clk: rockchip: rv1106: add pvtpll support
Change-Id: I8e96bc9f6f9c1694d96c8bb3ab0db1689a746709
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-08 21:17:49 +08:00
Jianwei Fan
320a7be3f6 media: i2c: add max96714 GMSL2/GMSL1 to CSI-2 Deserializer driver
Signed-off-by: Jianwei Fan <jianwei.fan@rock-chips.com>
Change-Id: Ia7c19e83a9135cc4a800df32def110c1a1e3796d
2022-04-08 15:07:38 +08:00
Liang Chen
ff40d01889 cpufreq: dt-platdev: Add rv1106 project into blacklist
Change-Id: Iba91e872a57c00e7443c3731727ed8fa7e324b29
Signed-off-by: Liang Chen <cl@rock-chips.com>
2022-04-08 14:59:23 +08:00
Zefa Chen
823502ed08 media: rockchip: cif: build depends on CPU config
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I0dee5f7f43da3eb58a65342319ccb77b5501e0ce
2022-04-08 14:54:53 +08:00
Zefa Chen
ca56ba4d64 media: i2c: sensor adapter support config dphy param
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia9b4bac3f809fc870a024dfff5b92e14d9bc07fa
2022-04-08 14:52:52 +08:00
Zefa Chen
0ea608c497 media: i2c: sensor adapter fixed get_selection error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I97601673c032e9e83af305010063806aaa6db355
2022-04-08 14:50:04 +08:00
Zhenke Fan
19a8e6183b media: i2c: jx_k17: add jx_k17 sensor driver
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: I0afa06161013cab5fa719af26ee8e8d526ba8594
2022-04-08 14:32:18 +08:00
Zefa Chen
280f919d43 media: i2c: sc500ai fix compile error
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I2c77e19dfe67e943bf18d6f775d30b4180f59b95
2022-04-08 14:29:45 +08:00
Zefa Chen
2b4692408b media: rockchip: vicap: rv1106 support set fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ia31e6ef65a638cb7860c15c8425a2e835d33acb1
2022-04-08 14:29:24 +08:00
Zefa Chen
354a15b789 phy: rockchip: csi2-dphy: rk3588 dcphy tx/rx combine to one driver
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I5c28feef615dd4a6b8d7e8ec0514c32625da567b
2022-04-08 14:11:07 +08:00
Zefa Chen
58b77814a2 arm64: dts: rockchip: combine dcphy tx/rx for rk3588
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3c4f3f539cc906258ad36e7627575da6a78c6e23
2022-04-08 14:09:34 +08:00
Sandy Huang
4764cd7c19 drm/rockchip: debugfs: fix dump 10bit afbc yuv format error
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: I2aa75d691de794d62c2eada5419ab441da69f471
2022-04-08 10:55:51 +08:00
Andy Yan
4559374ca9 drm/rockchip: vop2: Check activated vp when power off a internal PD
A internal PD can only power off by vsync when it attached
to a activated VP.

This fix this log:
[drm:vop2_crtc_atomic_disable] *ERROR* unexpected power on pd7

Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Change-Id: Ia6694ccc761f93e36dca3218a455f8ef73d04e86
2022-04-08 10:54:02 +08:00
Tony Xie
b6cd8cd681 firmware: arm_sdei: add some functions for fiq debugger.
1. add sdei_event_routing_set()
2. add sdei_event_routing_set_nolock()
3. add sdei_event_enable_nolock() and sdei_event_disable_nolock()

Signed-off-by: Tony Xie <tony.xie@rock-chips.com>
Change-Id: Ia2471a3ac6a9189888a465a529875957ab9661b6
2022-04-08 10:52:35 +08:00
Zefa Chen
b05b62da92 include: rk-camera-module: add dphy param control
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I3914f8af1eb469f8d57c9d59f28826cd7d8e2156
2022-04-08 10:49:08 +08:00
Tao Huang
dc02893714 fiq_debugger: FIQ_DEBUGGER_FIQ_GLUE depends on ARM
Hide this option for arm64.

Fixes: f6e083bcf5 ("ARM: fiq_glue: Add fiq_glue")
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2006f74b0ee590f8de813268082cdabbe2438e6f
2022-04-08 10:42:25 +08:00
Zefa Chen
8eb5d8beab include: rkcif-config: add cmd RKCIF_CMD_SET_FPS
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Iee6c419795c04b7b1ecee2b726e7f38418a6d719
2022-04-07 17:57:06 +08:00
Zefa Chen
dd3c020416 media: rockchip: vicap disables DMA capture when there is no active buffer
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I38a705b8b495473acb1f3cfdf50eabda9e61330e
2022-04-07 17:56:35 +08:00
Zefa Chen
3435f139fd media: rockchip: vicap add shutdown function
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I957415449aa3f6efc3832a10cee049135d4c76af
2022-04-07 17:55:02 +08:00
Huibin Hong
f4d48b8c25 ARM: configs: rv1106: enable FIQ_GLUE
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ied16bb6f7909b1be6c061e331dd4c4eaa9da7c6d
2022-04-07 17:11:15 +08:00
Huibin Hong
a698d04614 fiq_debugger: fix issue for FIQ_GLUE
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I0f6b3746dc54a4a42d372068db53320e3d852f98
2022-04-07 17:11:15 +08:00
Huibin Hong
4c9f0407c6 irq-gic: support fiq
1. set all irq non-secure
2. add gic_set_irq_secure and gic_set_irq_priority

Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: Ie84ed3dae3110d8a4bb538ecbf96ea971ca29846
2022-04-07 17:11:15 +08:00
Huibin Hong
f6e083bcf5 ARM: fiq_glue: Add fiq_glue
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
Change-Id: I27d2554e07d9de204e0a06696d38db51608d9f6b
2022-04-07 17:11:15 +08:00
David Wu
0467bb65b8 ARM: dts: rockchip: rv1106: Configurate ethernet dma size to 256
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: I0940e7417ea27c630aff0dab236305608e297df9
2022-04-07 16:43:42 +08:00
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