Commit Graph

858690 Commits

Author SHA1 Message Date
Liang Chen
fd8173d58e arm64: dts: rockchip: add RK3568 evaluation board devicetree
Add some board files for RK3568 SoCs, rk3568-evb1-ddr4-v10-linux is
for Linux Platform, others for Android Platform.

Change-Id: I632a8504e13c4069b17c2282af702ab44dec72db
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-10 14:23:07 +08:00
Hu Kejun
c3b44b185e media: i2c: gt9760s: add ioctl to set vcm config
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I8c4c8746ff5ddd69c4953d41f24498fec90125ad
2020-10-10 14:19:12 +08:00
Hu Kejun
3adf8acd1f media: i2c: vcm: add ioctl for iris/zoom
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib00e28f01aa68f4463cc15c7268393f515e37efb
2020-10-10 14:19:12 +08:00
Ziyuan Xu
5b586c6dcc ARM: configs: rv1126-battery.config: enable leds_pwm and heartbeat trigger
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I672c2b8b9955f0d2afe8bea44b65a54a7bba1aae
2020-10-10 14:11:05 +08:00
Ziyuan Xu
b0c94bdffb ARM: dts: rv1126-bat-ipc-v10: enable pwm-leds for state-aware
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ibcbeeba727085c91f85b189bfb8cbdbe15982e8a
2020-10-10 14:10:41 +08:00
Ziyuan Xu
919304ff8e ARM: configs: rv1126-battery.config: use sc210iot only
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I5f3ebb0ba87fcfa2ea922ae0222986ba2ebaa50a
2020-10-10 14:10:06 +08:00
Ziyuan Xu
79efb02c7d ARM: dts: rv1126-bat-ipc-v10: prefer use sc210iot for low power
Test scenario:
1080p rtsp (only video) preview
ov2718: 999.7mw
sc210iot: 793.5mw

The sc210iot is lower power dissipation about 206mw than ov2718.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ib743f9ca85ea911385f90620431e8592b0c70444
2020-10-10 14:09:24 +08:00
Jon Lin
2542a9a36c drivers: rkflash: Fix last data block vpn has been modify issue
Change-Id: Ief1b572d6f1321b9dcdd6d8eae31ff21e2e2f57f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-10 09:30:50 +08:00
Xing Zheng
1e5032696c ARM: dts: rv1126-bat-ipc-v10: add some optional properties
Keep 0dB for adc/dac volume, 6(18dB) for adc-pga-gain,
and using hardware loopback which is dac_l+adc_r.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I713e25984cfe20f3e50d14d381a6825e48d5296b
2020-10-10 09:12:47 +08:00
Xing Zheng
7a2a6a332d ASoC: es8311: add handling the optional property 'adc-pga-gain'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I2da3f8f0bc310fc2c25517633f1803e9f9482a16
2020-10-10 09:12:20 +08:00
Xing Zheng
e14240a31a dt-bindings: sound: es8311: add the optional property 'adc-pga-gain'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I59c283d5d3ddb359fa4828a53caf7e21670f19db
2020-10-10 09:12:03 +08:00
Ziyuan Xu
f8d1a6ca51 ARM: configs: rv1126-battery.config: enable sound feature
They have a minuscule impact on boot time, codec and simple-card spend a
lot of time as far as we know.

Tested on rv1126-battery-v10 board:
[   17.492609 ] probe of 4-0018 returned 1 after 2116 usecs
[   17.492915 ] initcall es8311_i2c_driver_init+0x0/0x1000 [snd_soc_es8311] returned 0 after 2405 usecs
[   17.510095 ] asoc-simple-card i2s0-sound: ES8311 HiFi <-> ff800000.i2s mapping ok
[   17.512578 ] probe of i2s0-sound returned 1 after 20870 usecs

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ie25e9dde2cd87616cb4777b4ceeebc1083678d42
2020-10-10 09:11:48 +08:00
Hu Kejun
a52cba96f5 media: rockchip: isp: only rx mode can use when link with cif
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I6873708e4ac5cc5e90e2449f74c252d12d58d057
2020-10-09 17:36:19 +08:00
Hu Kejun
5b80188e21 media: rockchip: isp: set tmo bit in gain by tmo enable
normal mode also use tmo module now, so we should set tmo bit in gain by tmo enable

Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I35395cf20c53ab92645b419a5d162a23f65c5274
2020-10-09 17:35:41 +08:00
Shunqing Chen
ec1fdcdef9 power: supply: cw2015_battery: add power supply property for Android R
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I905e0399e61c0d51ff6b167755a6099adc2697d2
2020-10-09 16:36:06 +08:00
Shunqing Chen
d38d1406aa power: supply: rk816_battery: add power supply property for Android R
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I2346a76b5dc866c5e468923786c508aa7f8dc7a2
2020-10-09 16:36:06 +08:00
Shunqing Chen
a8f3d5a48a power: supply: rk817_battery: add power supply property for Android R
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I3621212fe6ed941d5d595fbcfd5865e1e265fdb1
2020-10-09 16:36:06 +08:00
Shunqing Chen
1dff96f5fe power: supply: rk818_battery: add power supply property for Android R
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I585aec225da6925bd592111c0dfcc0576f8b9968
2020-10-09 16:36:06 +08:00
Jianqun Xu
d2e366d488 arm64: dts: rockchip: rk3568 pinctrl core dts file update
Change-Id: Ic58507f7f66cfa606346dad9616e590c77b5d03d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-09 16:27:30 +08:00
Vicent Chi
b93496804f driver: media: add sc210iot sensor support
Change-Id: Ib8bda8d9612d6dde919ff73b471ea1361653dd2c
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2020-10-09 16:25:59 +08:00
Tao Huang
4c84333098 Revert "arm64: configs: rockchip_defconfig select ION_LEGENCY"
This reverts commit 1d8f622667.

Change-Id: I6ce44d77b486a7f35af306ced77a138a26f03b07
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-10-09 15:52:41 +08:00
Jianqun Xu
59cab3cae5 Revert "staging: android: add ion_legency driver"
This reverts commit b53e459d52.
This reverts commit 32364c4431.

Change-Id: Ibffd99caf31e756870ac45d5e93c831a12b241bd
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-10-09 15:50:23 +08:00
Li Huang
403778342a RK3368 GPU: Remove ion client
Need to revert ion_legency.

Signed-off-by: Li Huang <putin.li@rock-chips.com>
Change-Id: I7a9a0dcfe0147a015db416f94c68edafb1f5632a
2020-10-09 15:50:23 +08:00
Cai YiWei
4abc0352ea media: rockchip: isp: request buf to alloc dummy buf
Change-Id: I9aea544b67ca546031234b6746552c2393b45476
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-09 15:45:50 +08:00
Huibin Hong
63031da897 ARM: dts: rockchip: rv1126: set debug-signal irq 127 for fiq debugger
Change-Id: I40a5846a197bf8b90cb9141dae0e982e68a5e2b1
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2020-10-09 14:18:25 +08:00
Cai YiWei
c840edbad4 media: rockchip: ispp: fix config err for tnr init off
Change-Id: I20303d777ecd2ff0db84ab289f525a4392ffedae
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-10-02 12:42:53 +08:00
Ziyuan Xu
ed79c04af5 ARM: configs: rv1126-battery.config: disable decoder configurations
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id28d5e98d365b584a833fe45626f089c3a8588d3
2020-09-30 15:25:04 +08:00
Ziyuan Xu
61fd70fe38 ARM: dts: rockchip: rework rv1126 battery-ipc common devices
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I246830a302453c6c5f5ae3920ddc3a9ce02c4144
2020-09-30 14:19:33 +08:00
Ziyuan Xu
c715edfe85 ARM: dts: rockchip: get sensor data without vicap for rv1126-bat-v10
Plan A: MIPI/LVDS-->VICAP-->ISP-->ISPP
Plan B: MIPI/LVDS-->ISP-->ISPP

The performance of Plan B is enough for 1080P sensor. Moreover, it saves
about 12+mw than Plan A.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I5abbc76e831625b822c6b15b90f0b2c8e530483d
2020-09-30 14:16:58 +08:00
Finley Xiao
814f01255f arm64: dts: rockchip: rk3399: Fix pmu pvtm resets
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I95e3f61ce8f1c76ad8a4410a98292bae32f38007
2020-09-30 11:49:06 +08:00
Cai YiWei
c2fdaf9593 media: rockchip: ispp: scl add yuyv format
Change-Id: I1e8e77927b01f437d5818c433753884a8f9efcc5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-09-30 09:14:23 +08:00
Liang Chen
0ae3c5a366 arm64: dts: rockchip: add core dtsi for RK3568 Soc
RK3568 is a Soc from Rockchip, which embedded with quad
ARM Cortex-A55.

This patch add basic core dtsi file for RK3568.

Change-Id: Ib555d4402e4dceb4dcd59989c3a8ee14c8bfbe76
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-09-29 19:39:33 +08:00
Ren Jianing
6b55083a5e usb: gadget: u_audio: fix the risk of strcpy out of bounds
We use strlcpy instead of strcpy to ensure that array won't out
of bounds.

Fixes: a322b6c50d (FROMLIST: usb: gadget: f_uac*: Support multiple sampling rates)
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Iebda94fea94dc929320273c16de996ff0d2d6397
2020-09-29 17:29:20 +08:00
Ren Jianing
83aa893b04 usb: gadget: legacy: audio: fix error parameter of sizeof
This patch fixes the issue that a pointer is used as the parameter
of sizeof.

Fixes: 9de5fa6df1 (FROMLIST: usb: gadget: f_uac*: Reduce code duplication)
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I66bfc58e71c498dd8a82f9b5045f851585e1f441
2020-09-29 17:28:57 +08:00
Wyon Bi
3c43df1143 drm/bridge: analogix_dp: Don't handle adjust request if clock recovery is already ok
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I44aa6678285607c838cb8c27dc566349a17d59c5
2020-09-29 17:28:20 +08:00
Elaine Zhang
bcec179ee8 rtc: hym8563: set init time
remove the buf[0] & HYM8563_SEC_VL, it's unsuitable for some hym8563.
set rtc init time for first power on.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Iaa207d554d9df9ad8f138fc2f196c8a7a991b141
2020-09-29 17:27:36 +08:00
Liang Chen
bb9a41524c soc: rockchip: pvtm: support module
This submit supports to compile rockchip pvtm into a module.

Change-Id: Id32b2dad80af8657b28e308d155539e3c7dac48a
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-09-29 15:12:39 +08:00
Finley Xiao
d4f55632eb soc: rockchip: ipa: Add support to be build as module
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I71caeb44f4d31da03e3a5ca56c2a24edc6486ebd
2020-09-29 14:59:54 +08:00
Ziyuan Xu
b3fc2ac3b2 ARM: configs: rv1126-battery.config: rework by standard process
Update by:
make ARCH=arm rv1126_defconfig rv1126-tb.config
cp .config rv1126.config
make ARCH=arm rv1126_defconfig rv1126-tb.config rv1126-battery.config
scripts/diffconfig -m rv1126.config .config > arch/arm/configs/rv1126-battery.config

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I9f24066c7bb3679898b81e3229715c964a000856
2020-09-29 09:19:16 +08:00
Weiwen Chen
a814718222 ARM: configs: rv1126-emmc-drivers-builtin.config: add CONFIG_VIDEO_IMX307
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Iba82831e0a6241ff708fe44bbecc4857930ab67e
2020-09-28 15:18:21 +08:00
Jianqun Xu
412436b9d7 gpio: rockchip: make gpio-bank name with bank index
Fix the name of gpio bank to be more general, make it with bank index
instead of node name.

Change-Id: Ia7e61e2eaa2cdd8f3ff0482cfc7c857f2a505935
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-27 17:28:54 +08:00
Tao Huang
1dbe7f3096 ARM: rockchip_defconfig: Disable CONFIG_ROCKCHIP_ONE_INITRD
For support generic + vendor ramdisk.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I52af171f8d1e5179a98cdd499cc6272ea0c0be17
2020-09-27 17:18:41 +08:00
Tao Huang
15f7fbbe28 arm64: rockchip_defconfig: Disable CONFIG_ROCKCHIP_ONE_INITRD
For support generic + vendor ramdisk.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4df08194b80d20d288f4e1e61eec1037ef80dcfe
2020-09-27 17:18:41 +08:00
Tao Huang
78c27ecb0c init: Introduce config ROCKCHIP_ONE_INITRD
This feature is conflict with Android 11 which has the generic ramdisk
and the vendor ramdisk.

Fixes: c44194873a ("HACK: get ramdisk correct size with rk bootloader")
Change-Id: I4d158862398973f3ca205fbbbaa48022c2903936
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-09-27 17:18:41 +08:00
Tao Huang
acf4d3c4f9 rk: scripts: Fix repack bootimg for boot image v3
v3 do not support second.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5cd6d402be5adb35f0634a5af19c4310582d25ee
2020-09-27 17:09:56 +08:00
Paul Kocialkowski
f8e9631789 UPSTREAM: rtc: hym8563: Read the valid flag directly instead of caching it
The RTC has a valid bit in the seconds register that indicates whether
power was lost since the pevious time set. This bit is currently read
once at probe time, cached and updated with set_time.

Howeever, caching the bit may prevent detecting power loss at runtime
(which can happen if the RTC's supply is distinct from the the platform's).

Writing the seconds register when setting time will clear the bit,
so there should be no downside in reading the bit directly instead of
caching it.

Change-Id: I85d1dcfb32b12ed24d5f42f67fb9beb5d8d03876
Signed-off-by: Paul Kocialkowski <paul.kocialkowski@bootlin.com>
Link: https://lore.kernel.org/r/20191212153111.966923-2-paul.kocialkowski@bootlin.com
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
(cherry picked from commit e2ed7507ae)
2020-09-27 16:23:28 +08:00
Jon Lin
69f3c341d9 drivers: rkflash: Support spinand non aligned read
Change-Id: I185838a57024af141fdd24f076186e3e068df3b1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-09-27 15:47:48 +08:00
Wang Panzhenzhuan
5e0cb7287b media: i2c: gc2145: reduce rkisp1: CIF_ISP_PIC_SIZE_ERROR 0x00000001
Add delay to enable oneframe signal complete, when gc2145 stream off.
For uncompleted frame signal may cause rkisp1: CIF_ISP_PIC_SIZE_ERROR,
when gc2145 switch to new resolutions.

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I6be22471fabfba5da2cac9806d634837d6a08fb9
2020-09-27 15:46:38 +08:00
Yiqing Zeng
93ae71db76 media: i2c: imx335 fix set sensor vertical invert failed
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I5366c832086756e821ff43125764803b831264d1
2020-09-27 14:10:17 +08:00
Yu Qiaowei
2c3c5733d2 video/rockchip: rga2: Add src/dst/dst_over blend modes.
Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: If6d46c7e3c9883b7be16ace4e8fd36ab61a7ca67
2020-09-27 10:23:10 +08:00