Commit Graph

863071 Commits

Author SHA1 Message Date
Cai YiWei
4e6e6bb26a media: rockchip: isp: dma buf alloc limit to DMA32
Change-Id: Ibc1f4afc45a031714ee4cabfc70b38f930706d46
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-15 09:12:53 +08:00
Cai YiWei
03b6c6cac7 media: rockchip: isp: resolution limit for isp21
Change-Id: I046ac456fad9d4617c8fcc4f228409f59d23281a
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-14 20:19:38 +08:00
Fenrir Lin
274e3cb9e1 media: rockchip: ispp: add vidioc_enum_input
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Id2b2c34b80245a2fa8dec97c5ca9ca64dd2c7363
2021-04-14 17:08:47 +08:00
Sandy Huang
e8190ffbbb drm/rockchip: vop2: add support yvyu and vyuy format
Change-Id: I0ed523a57b562a6d2aabcebf6d68a0e77cd31eeb
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-14 14:27:33 +08:00
Zorro Liu
4adeed80a6 drm/rockchip: ebc_dev: release version v1.08
use read write seam to protect auto buf

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Iafb71500511fc0cf4a6eb9a0b8bce8c3883e8ef1
2021-04-14 14:26:26 +08:00
Tao Huang
0d68523e09 gpu: remove unused rogue_m driver
Change-Id: I2d38df29926bc7c2e7e618b777cd36768cab0d0e
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-13 18:40:34 +08:00
Tao Huang
bf63b8bc5e gpu: remove unused rogue driver
Change-Id: I067a96e88b4a389470b12446dea573134b835018
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-13 18:36:53 +08:00
Yiqing Zeng
0807317e51 media: i2c: add soi jx_k04 sensor driver
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I967e30304d6bae7c27f4536d48bb36a5bacc974c
2021-04-13 18:04:59 +08:00
Zorro Liu
ff1dff0cae soc: rockchip: system_monitor: add ebc blank/unblank notifier
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I317a8b545d53fd1af960cdbd84d271eaa9451d12
2021-04-13 17:11:56 +08:00
Zorro Liu
2cf597db72 arm64: dts: rockchip: rk3566-eink.dtsi: adjust dmc freqs and voltage
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I72cea2c6040b48729a7ff24effe47b0cd1b71736
2021-04-13 17:11:24 +08:00
Wyon Bi
a49fe9b297 drm/bridge: analogix_dp: Compliant with eDP receiver enhanced frame capability
On an eDP connection, the eDP sink must operate only in Enhanced Framing
Mode. The Source must send only Enhanced Framing on the main link, and
must only write a '0' to DPCD 00101h: LANE_COUNT_SET Bit 7:
ENHANCED_FRAME_EN bit.

Independent of method used, DP1.2-compliant eDP Receivers shall indicate
any eDP protocol differentiation method they support through the
Receiver Capability Field of DPCD (DPCD:0000Dh).

Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I38e30426924bed531047a2d41b812d697d9f9838
2021-04-13 14:14:22 +08:00
Tao Huang
e53e7c1fd8 rk: get rid of legacy 'get_ds()' function
According to commit 736706bee3 ("get rid of legacy 'get_ds()' function")

Every in-kernel use of this function defined it to KERNEL_DS (either as
an actual define, or as an inline function).  It's an entirely
historical artifact, and long long long ago used to actually read the
segment selector valueof '%ds' on x86.

Which in the kernel is always KERNEL_DS.

Inspired by a patch from Jann Horn that just did this for a very small
subset of users (the ones in fs/), along with Al who suggested a script.
I then just took it to the logical extreme and removed all the remaining
gunk.

Roughly scripted with

   git grep -l '(get_ds())' -- :^tools/ | xargs sed -i 's/(get_ds())/(KERNEL_DS)/'
   git grep -lw 'get_ds' -- :^tools/ | xargs sed -i '/^#define get_ds()/d'

plus manual fixups to remove a few unusual usage patterns, the couple of
inline function cases and to fix up a comment that had become stale.

The 'get_ds()' function remains in an x86 kvm selftest, since in user
space it actually does something relevant.

Change-Id: I4b8e3436c958b7745059ea7ef4367f3fd4a0ebbe
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-12 20:01:09 +08:00
Tao Huang
19d30cb3c7 rk: Replace deprecated PTR_RET
According to commit fad7c90209 ("err.h: remove deprecated PTR_RET for good").

Initially, commit fa9ee9c4b9 ("include/linux/err.h: add a function to
cast error-pointers to a return value") from Uwe Kleine-König introduced
PTR_RET in 03/2011. Then, in 07/2013, commit 6e8b8726ad ("PTR_RET is
now PTR_ERR_OR_ZERO") from Rusty Russell renamed PTR_RET to
PTR_ERR_OR_ZERO, and left PTR_RET as deprecated-marked alias.

After six years since the renaming and various repeated cleanups in the
meantime, it is time to finally remove the deprecated PTR_RET for good.

Change-Id: I2b5d464dc1c6bc0409e41dd9da503f14bef17dc7
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-12 19:45:06 +08:00
Tao Huang
d20cd8e14c rk: remove ioremap_nocache and devm_ioremap_nocache
According to commit 4bdc0d676a ("remove ioremap_nocache and devm_ioremap_nocache").

ioremap has provided non-cached semantics by default since the Linux 2.6
days, so remove the additional ioremap_nocache interface.

Change-Id: Id62917547d7d0d838ac3785f8c2bfd2d645af034
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-12 19:35:40 +08:00
Cai YiWei
2d7eaeb4ee media: rockchip: isp/ispp add check for params subscribe event
Change-Id: If8b79286de5d9921abd69c96cb0b17ef297d75ef
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-12 17:52:06 +08:00
Ren Jianing
c6f93b066e usb: gadget: u_audio: fix dev_dbg information
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I74dde0b3f08567e91312aaf5c4611ddfd5a2cd5f
2021-04-12 16:02:42 +08:00
Wang Panzhenzhuan
34aafd0764 media: i2c: ov2718: fix ov2718 pixel_rate null pointer issue
fix the following crash issue:
[   37.800747] pc : __v4l2_ctrl_s_ctrl_int64+0x14/0x60
[   37.805631] lr : ov2718_set_fmt+0x180/0x1b0
[   37.809824] sp : ffffff8010393b10
[   37.813141] x29: ffffff8010393b10 x28: ffffff80089a9f98
[   37.818453] x27: 00000000c0585605 x26: ffffffc072431d40
[   37.823764] x25: ffffffc072431c80 x24: ffffff80093bf3c0
[   37.829075] x23: ffffff80093bf3c0 x22: ffffff8010393ce8
[   37.834386] x21: 0000000000000000 x20: 0000000009896800
[   37.839697] x19: 0000000000000000 x18: 0000000000000000
[   37.845007] x17: 0000000000000000 x16: 0000000000000000
[   37.850319] x15: 0000000000000000 x14: 0000000000000000
[   37.855629] x13: 0000000000000000 x12: 0000000000000000
[   37.860940] x11: 0000000000000000 x10: 0000000000000000
[   37.866252] x9 : 0000000000000004 x8 : 0000000000000001
[   37.871563] x7 : 000000000000fbc7 x6 : 000000000000fbc7
[   37.876889] x5 : ffffffc072bf3cb8 x4 : 000000000000002e
[   37.882206] x3 : 0000000000000001 x2 : ffffffc072bf3cb8
[   37.887509] x1 : 0000000009896800 x0 : 0000000000000000

Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I276b8e55631648748cd3cb968c44b64260677c56
2021-04-12 16:01:30 +08:00
Wu Liangqing
4f28fb51fb arm64: dts: rockchip: rk3568-evb: enabled rknpu_mmu
This reverts commit 8fc4d4d9b6 ("arm64: dts: rockchip: rk3568-evb:
Add reserved memory for rknpu").

Change-Id: I3d4c24266f7c52c311956adec9b1b1f42b7370a6
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2021-04-12 16:00:21 +08:00
Wang Panzhenzhuan
6db6abb203 media: i2c: add camera driver os08a10
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ib7bff92f112b32e7976562d412700a9ffe9960cf
2021-04-12 15:55:07 +08:00
Wang Panzhenzhuan
0c9764f5c4 dt-bindings: media: i2c: Document add os08a10
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I5913ad5afead7082d499b4beb26be3265757c031
2021-04-12 15:54:08 +08:00
Wang Panzhenzhuan
95975772aa media: i2c: add camera driver sp250a
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Iab7d4759ede2c18031a5c703c5cffb5668b7851f
2021-04-12 15:53:30 +08:00
Wang Panzhenzhuan
6ccee89854 dt-bindings: media: i2c: Document add sp250a
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ia40942d69ada24084eff53977771497effe3f315
2021-04-12 15:53:16 +08:00
Cai YiWei
8831b4756c media: rockchip: isp: update procfs info
Change-Id: I48d64f9e579ca6eee1af5b707420a055e5b1b17f
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-09 19:48:39 +08:00
Cai YiWei
2f970e0f1f media: rockchip: isp: fix multi dev refcnt
Change-Id: Id6c742f1ce90bdf327b382864a26739bdf80661e
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-09 19:48:39 +08:00
Cai YiWei
a566b16975 media: rockchip: ispp: config default params
Change-Id: I8ef48c03123149564835143d4bda5dc011e7e9d3
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-09 19:32:49 +08:00
Cai YiWei
97745b823d media: rockchip: ispp: optimize first frame memory copy
Change-Id: I38803f1b8cb5bbe6fe53856037eb9214c0e85cbe
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-04-09 19:32:49 +08:00
Zorro Liu
c2ef67519c drm/rockchip: ebc_dev: release version v1.07
1.resize auto framecount, one byte per 16 pixels
2.do not change framecount value in refresh new function
3.remove ebc_refresh_task thread
4.add mutex to protect empty buf get
5.improve temperture get

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I80c245594cc87cc6717bafadc27562d66368eb04
2021-04-09 17:45:16 +08:00
Tao Huang
766a7c894a rk: Replace <asm/uaccess.h> with <linux/uaccess.h> globally
According to commit 7c0f6ba682 ("Replace <asm/uaccess.h> with
<linux/uaccess.h> globally").

sed -i "s!#include <asm/uaccess.h>  !#include <linux/uaccess.h>!" \
$(git grep -l "#include <asm/uaccess.h>  " | grep -v ^include/linux/uaccess.h)

PATT='^[[:blank:]]*#[[:blank:]]*include[[:blank:]]*<asm/uaccess.h>'
sed -i -e "s!$PATT!#include <linux/uaccess.h>!" \
      $(git grep -l "$PATT"|grep -v ^include/linux/uaccess.h)

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I2110dffd32d855ecc9c403fc75cee950f7abb024
2021-04-09 16:33:43 +08:00
Weixin Zhou
3823cfad52 backlight: pwm_bl: do not suspend in lite sleep mode
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: Ia522f69c3edc939d00ea4aec87568d8df8af4a58
2021-04-09 16:10:22 +08:00
Tao Huang
7bd2e46287 Revert "staging: iio: new invensence mpu6050/6500 driver"
This reverts commit a3c1d3323d.

Change-Id: I79bbd4a094c4cc636f58cf75fa886b582b065136
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-09 15:00:31 +08:00
Tao Huang
d42e09f1b3 staging: remove unused rk29 ipp driver
Change-Id: If2199ef59419e5e963f89b6461b706c9d0d8abd8
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-09 14:44:30 +08:00
Tao Huang
86b67a3051 drivers: remove unused rk29 smc driver
Change-Id: I925aaa94936e09e8eea09f1ae05f1565c4eaab4f
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-09 14:37:46 +08:00
Shunqing Chen
299b117d6f power: rk817-battery: check if battery is exist
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ieaad343bac258c097b860251e80506bdf98eab1b
2021-04-09 14:08:50 +08:00
Tao Huang
f9dc86fdf1 treewide: replace '---help---' in Kconfig files with 'help' (rk)
Since commit 84af7a6194 ("checkpatch: kconfig: prefer 'help' over
'---help---'"), the number of '---help---' has been gradually
decreasing, but there are still more than 2400 instances.

This commit finishes the conversion. While I touched the lines,
I also fixed the indentation.

There are a variety of indentation styles found.

  a) 4 spaces + '---help---'
  b) 7 spaces + '---help---'
  c) 8 spaces + '---help---'
  d) 1 space + 1 tab + '---help---'
  e) 1 tab + '---help---'    (correct indentation)
  f) 1 tab + 1 space + '---help---'
  g) 1 tab + 2 spaces + '---help---'

In order to convert all of them to 1 tab + 'help', I ran the
following commend:

  $ find . -name 'Kconfig*' | xargs sed -i 's/^[[:space:]]*---help---/\thelp/'

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I6c1a95c0cb15b1a5a4215acba748e7023dfd4338
2021-04-08 18:58:43 +08:00
Tao Huang
5c45ae5261 ASoC: rockchip: vad: Fix clang assembly error
sound/soc/rockchip/vad_preprocess_arm64.S:53:18: error: expected 'sxtx' 'uxtx' or 'lsl' with optional integer in range [0, 4]
 add x2, x2, x5, sxtw
                 ^

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I5e9a2442d3d9bb0223290e0dac3f54a580b3f949
2021-04-08 16:06:46 +08:00
Zhen Chen
55cfc8ea78 MALI: midgard: rk: do not use deferrable work for poweroff
In the same way of
commit 697aafe93f ("MALI: bifrost: rk: do not use deferrable work for poweroff")

Signed-off-by: Zhen Chen <chenzhen@rock-chips.com>
Change-Id: I061ca478f4e8f8a836ce3996a138b1d0382cfd2b
2021-04-08 14:07:29 +08:00
Allon Huang
0d41682dc8 media: platform: rockchip: cif: fix panic when frm0/frm1 end occurr at the same time
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I0f77fbd0c8e847f88df921fa70f817fa79672634
2021-04-08 11:18:04 +08:00
Yifeng Zhao
1ce0110473 drivers: rk_nand: fix the problem of clang compilate error
compilate error info:
drivers/rk_nand/rk_zftl_arm64.S:29609:19: error: expected 'sxtx' 'uxtx' or 'lsl' with optional integer in range [0, 4]
 add x0, x5, x21, uxth
                  ^
drivers/rk_nand/rk_zftl_arm64.S:29635:19: error: expected 'sxtx' 'uxtx' or 'lsl' with optional integer in range [0, 4]
 add x3, x19, x3, uxth 3
                  ^
make[1]: *** [scripts/Makefile.build:433:drivers/rk_nand/rk_zftl_arm64.o] error 1

Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I59578a4ff3434911c135778f83afc6ec0af5bffc
2021-04-08 09:27:02 +08:00
Sandy Huang
d2439e1a53 drm/rockchip: vop2: disable layer mix when it's unused
If the layer pass through layer mix is unused, we need to disable alpha,
at this time, the layer mix only used to transfer alpha to next mix.

Change-Id: Ibd469b4fb61b41480297bc20c346e9ceefa61fc7
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-04-08 09:25:12 +08:00
Tao Huang
c871641576 arm64: rockchip_defconfig: Disable CONFIG_HW_RANDOM_CAVIUM
Which is default y.

Change-Id: Ia8c443016bc42394d98c1561ff4efdddf7161124
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-04-07 20:09:50 +08:00
Shunqing Chen
94a40e549f drm: rockchip: rk628: post_process: recalculate dst clock
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I93388ba499f0d74c5f5c549decc83f3225ae1b82
2021-04-07 15:28:46 +08:00
Zefa Chen
8050c27003 media: i2c: add camera driver sc401ai
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ic8cdd26d811af32eb0ada5ac88630a6a03720bd2
2021-04-07 15:00:46 +08:00
Wang Panzhenzhuan
0770f9faee media: i2c: nvp6324: update driver to match newest rkcif code
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: Ieed09f47bddcbd55b8d6bab98a002a1997bf6353
2021-04-07 14:40:10 +08:00
Fenrir Lin
2839a6df71 ARM: configs: rv1126-battery.config: enable MPP_VEPU2
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: I7d8d1889d2c55c79fe474e4137b657bfc286625e
2021-04-07 10:52:47 +08:00
Fenrir Lin
1ebf485017 ARM: dts: rockchip: rv1126 battery-ipc add rkisp vir1 and vepu
Signed-off-by: Fenrir Lin <fenrir.lin@rock-chips.com>
Change-Id: Ie0cf09917059bd523350f1e2362f5f37c3c78738
2021-04-07 10:52:21 +08:00
XiaoDong Huang
018db46d70 arm64: dts: rockchip: rk3568: tsadc: config "rockchip,hw-tshut-mode = <0>"
To use tsadc_shut_m0 function, tsadc must switch to cru_shut_mode,
because tsadc_shut signal have to go through the cru to get to tsadc_shut_m0 signal.
Refer to "10.10.10.81\技术文档\thermal\rk3568_tsadc_shut.png" for details.

Change-Id: I0528917efe2f5ea6f002ebf1608815eb01f552c0
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-04-07 09:24:01 +08:00
XiaoDong Huang
6e1c5a1b8e Revert "arm64: dts: rockchip: rk3568: tsadc: use tsadcm0_shut function"
This reverts commit 0a01772bd5.

Change-Id: I12c9b8e28a54c2087929680c84a65d8c5b95bcae
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2021-04-07 09:24:01 +08:00
Bian Jin chen
2a9bdbbdd7 ARM: rockchip_defconfig: Enable metadata FBE.
Android 11 requires metadata File Base Encryption to protect userdata.

+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+CONFIG_DM_DEFAULT_KEY=y
+CONFIG_MMC_CRYPTO=y
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I479f43d9188f2619e0ac03e2e10006015a50599c
2021-04-07 09:19:39 +08:00
Bian Jin chen
ee70434a0e arm64: rockchip_defconfig: Enable metadata FBE.
Android 11 requires metadata File Base Encryption to protect userdata.

+CONFIG_BLK_INLINE_ENCRYPTION=y
+CONFIG_BLK_INLINE_ENCRYPTION_FALLBACK=y
+CONFIG_DM_DEFAULT_KEY=y
+CONFIG_MMC_CRYPTO=y
+CONFIG_FS_ENCRYPTION_INLINE_CRYPT=y

Signed-off-by: Bian Jin chen <kenjc.bian@rock-chips.com>
Change-Id: I2a741aa3d46f64375400c6fe8d7fac66b48eecad
2021-04-07 09:17:50 +08:00
Wang Panzhenzhuan
9b4e23e511 dt-bindings: media: i2c: Document add nvp6324
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I1a1e69b82e9ecd864d543eff96ca959ce75ab185
2021-04-06 15:40:31 +08:00