Commit Graph

858673 Commits

Author SHA1 Message Date
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
Allon Huang
0e98f42cbb media: rockchip: cif: fix frame_id is not identical with sof count
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ifb60f9d6d8b01da3fb3cfd634aa4200c1047a351
2020-09-25 17:26:40 +08:00
Finley Xiao
1fb4143e70 soc: rockchip: power-domain: add power domain support for rk3568
This driver is modified to support RK3568 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I5895cedad8c8e89f0657276c913e6e99d9544762
2020-09-25 15:09:21 +08:00
Finley Xiao
37d732f459 dt-bindings: power: add binding for rk3568 power domains
Add binding documentation for the power domains
found on Rockchip RK3568 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7544a643096948e75f59fb8126201b0de142440d
2020-09-25 15:09:12 +08:00
Finley Xiao
b35518d619 dt-bindings: add power-domain header for RK3568 SoCs
According to a description from TRM, add all the power domains.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I7205cbf6e38c9d5abb1ef58e45641cc27fcf6ec9
2020-09-25 15:09:01 +08:00
YouMin Chen
e214fede43 arm: dts: rockchip: rv1126: add dmcbug node for ddr debug
Change-Id: Ied4e4aef80d1e376f9b02c98c4245d206f532a38
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:06:30 +08:00
YouMin Chen
2ff072c85c ARM: configs: rv1126_defconfig: enable ARM_ROCKCHIP_DMC_DEBUG
Change-Id: I141e36ef7596bdfbd2b7f81489a97de11b843156
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:06:05 +08:00
YouMin Chen
86f64099c7 PM / devfreq: rockchip_dmcdbg: add support rockchip dmc debug
Change-Id: I54f5792267fcd346bc781e3c3816b5ae2642f351
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
YouMin Chen
24edb749b7 PM / devfreq: rockchip_dmc: add rockchip_dmc_timing.h
Move the dmc timing from rockchip_dmc.c to rockchip_dmc_timing.h.
In order to be able to reuse them.

Change-Id: I03edf68c68b78c08100ffa1c149d70d4d7d4ee6e
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
YouMin Chen
7bf3b88f36 PM / devfreq: rockchip_dmc: add dynamic switch complt_irq
Change-Id: I7cc8c2f58e9d4e6c8d84cf5c483295ef46c055b0
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2020-09-25 15:01:43 +08:00
Zefa Chen
7ae8eb5163 media: i2c: imx335 support 10bit HDR DOL3 2592X1944@15fps
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: I6ef970fae63fbf2850f0c97ddcd8a05955087694
2020-09-25 14:57:27 +08:00
Jianqun Xu
820c36ffa9 pinctrl: rockchip: remove gpiochip related codes
Remove gpiochip related codes from pinctrl driver, but populate gpio
platform devices from device tree data.

Change-Id: I347acaac2998a972e4c3be5c8827f77f468a7ad2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-25 14:42:12 +08:00
Jianqun Xu
eccd2f7b93 gpio: add gpio-rockchip driver
This gpio driver codes mostly are copied from pinctrl-rockchip.c with
module fixes. Also it supports the old dt nodes.

Change-Id: I7f26b5fe0827c16e2146a40e035a81de74284191
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-09-25 14:42:12 +08:00
Elaine Zhang
b3912fea8a clk: rockchip: rk3568: export PCLK_CORE_PVTM clock id
mark pclk_core_pre as critical.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I7da6a93dc1352acb2b336006bd1e30c49b8d6074
2020-09-25 14:23:48 +08:00
Elaine Zhang
9190b05f4a clk: rockchip: rk3568: export PCLK_EDPPHY_GRF clock id
Change-Id: Ic16fbe5ab6831d7797d417bfce75d9a3c3964fe4
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-09-25 14:12:04 +08:00
Tao Huang
891307ee1d ARM: rockchip_defconfig: merge r/android-4.19 android-recommended-arm.config
https://android.googlesource.com/kernel/configs
commit d298b222cd37 ("Freeze kernel configs for r.")

+CONFIG_CRYPTO_SHA2_ARM_CE=y
+CONFIG_CRYPTO_AES_ARM_CE=y

commit 63f8ad1f4b79 ("Recommend enabling architecture-optimized AES and SHA-256")
It's usually very helpful to enable AES-XTS and SHA-256 optimized with
the ARM crypto extensions (or x86 AES-NI and SHA-NI).  AES-XTS is used
by file-based encryption; SHA-256 is used by dm-verity.  I was a bit
surprised to see that these weren't already in the recommended configs.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Ibc40ed1b493f07eb92328024bff463903f50cb6f
2020-09-25 11:26:45 +08:00
Tao Huang
daeddb16eb ARM: rockchip_defconfig: Enable CONFIG_DM_BOW
https://android.googlesource.com/kernel/configs
commit 8c7922ea12ed ("android-4.14, android-4.19, android-5.4: Disable KPROBES for R")

+CONFIG_DM_BOW=y

commit c85479e4c183 ("Add CONFIG_DM_BOW to recommended")
If you are using Q on ext4 userdata, you need this feature.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2b1f942a775656435104984c2e85095e78c91435
2020-09-25 11:07:19 +08:00
Tao Huang
f2b4beac41 ARM: rockchip_defconfig: merge r/android-4.19 android base config
https://android.googlesource.com/kernel/configs
commit 5f72fe526dfe ("Merge "Require CONFIG_ANDROID_BINDERFS for R launching devices." into rvc-dev")

android-base.config and android-base-conditional.xml:

+CONFIG_IKHEADERS=m
-CONFIG_RT_GROUP_SCHED=y
+CONFIG_NAMESPACES=y
-CONFIG_MODULE_FORCE_UNLOAD=y
+CONFIG_NETFILTER_XT_MATCH_QUOTA2_LOG=y
-CONFIG_IP6_NF_NAT=y
-CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_BPF_JIT=y
+# CONFIG_FW_CACHE is not set
+CONFIG_DM_SNAPSHOT=y
+CONFIG_DUMMY=y
+CONFIG_VETH=y
+# CONFIG_DEVMEM is not set
+CONFIG_EXT4_FS_POSIX_ACL=y
-# CONFIG_F2FS_FS_POSIX_ACL is not set
+CONFIG_FS_VERITY=y
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_STATIC_USERMODEHELPER=y
+CONFIG_STATIC_USERMODEHELPER_PATH=""

Except CONFIG_ANDROID_BINDERFS=y which do not supported by Android before 11.
CONFIG_ANDROID_BINDERFS is set by Android.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I8de7e0392c1fb0fe05f957f1f2710b295cafea07
2020-09-25 10:40:18 +08:00