shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-10 04:48:04 +09:00
Code Issues Packages Projects Releases Wiki Activity
863,053 Commits 55 Branches 2,486 Tags
6db6abb2039e5e80b4295df35286ff52dd6ef69f
Commit Graph

863053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wang Panzhenzhuan
bf7588322c dt-bindings: media: i2c: Document add nvp6158 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: If23bc9bf8610b1c726eb24aa2dd856b2d1449c66
 2021-04-06 15:40:31 +08:00
Wang Panzhenzhuan
dbac31a536 media: i2c: nvp6158: add v4l2 interface 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I7932353657f5a75f2787647c7b4f31c6c9dbde44
 2021-04-06 14:16:31 +08:00
Wang Panzhenzhuan
5aff91f510 media: i2c: add nvp6158 sensor driver from NEXTCHIP Inc 
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I9f58e128889db55333e90e75144687ce9cc6d40f
 2021-04-06 14:16:31 +08:00
Cai YiWei
e1756b078d media: rockchip: isp/ispp to version v1.6.0 
Change-Id: I21b36b5f4738e912ee6409b045c00198ef016c42
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-04-06 12:11:24 +08:00
Cai YiWei
ac4efe6eb1 media: rockchip: isp: capture buf queue add to list tail 
Change-Id: I21e030408ca936bd6f567536a6c12c9be3caebf5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
 2021-04-06 12:11:24 +08:00
Guochun Huang
701d4bb8ff drm/rockchip: dsi: set vop2 standby before command mode in rk356x 
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I59c84b3eaeb5eb7be30878bbca196e3774f1e54b
 2021-04-02 19:22:44 +08:00
Andy Yan
319ce39de8 drm/rockchip: vop2: Add vop2_standby 
This is for mipi dsi on rk356x: there
is a hold signal from mipi dsi to
vop.

Mipi dsi may trigger the hold signal
when send dsi command or switch between
video mode and command mode.

vop may run into an unexpected situation if this hold
signal is rise when vop is running.

So when mipi dsi switch between video mode
or command mode, or send a dsi command, it
should set vop in stanby state.

Change-Id: I80e456d3416518436045ae8e0eec215c22b111a3
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2021-04-02 19:21:16 +08:00
William Wu
622a886296 usb: gadget: f_uac1: fix ep address for set sample rate 
The f_uac1 use ep address 0x81 and 0x01 for set sample rate,
so it can only support uac1 ep1-in and ep1-out to set playback
and capture sample rate, it has limitation for USB composite
device (e.g. RNDIS & UAC1). This patch use in_ep->address and
out_ep->address instead of the fixed addresses.

Change-Id: Ie2c70e2c2ec89fb66b00cd2a64928b50ee0541cc
Signed-off-by: William Wu <william.wu@rock-chips.com>
 2021-04-02 19:20:43 +08:00
Sandy Huang
87093d4d48 drm/rockchip: vop2: alpha value need transfer to next mix 
Change-Id: I2f00b8f834cd93a206643c0faaf557d38c238a13
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2021-04-02 18:34:45 +08:00
Sandy Huang
c55b62f477 drm/rockchip: vop2: fix start mixer id error 
Change-Id: I6e6287d43d375f8a8be47fe00cbe39764ffe6ee3
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
 2021-04-02 18:34:45 +08:00
Wenping Zhang
4325c08d06 arm64: dts: rockchip: change mmc aliases for rk356x in android platform. 
Rechange the emmc aliase to mmc2 to be same as other rockchip's chips,
so the android application can process the emmc property of all chips
in a uniform manner.

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Ia092ec08552e360e7fc5dc271dbb69edc08bd486
 2021-04-02 14:08:25 +08:00
Wenping Zhang
002dfbe8bb ARM: dts: rockchip: change mmc aliases for rk3288 in android platform. 
Rechange the emmc aliases to mmc2 to be same as other rockchip's chips,
so the android application can process the emmc property of all chips
in a uniform manner.

Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
Change-Id: Id1bbd8c63f919eb13cd7b511e9afe885753d99f5
 2021-04-02 11:07:43 +08:00
Zorro Liu
68e27c3ec3 arm64: dts: rockchip: rk3566-rk817-eink-w103.dts: remove npu 
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I23495b013e6687d5a64f77d95433e6152cd98be7
 2021-04-02 11:05:27 +08:00
Wu Liangqing
a8acb53e60 arm64: dts: rockhip: rk3566-tablet: set dcdc_boost min 5v 
Solve the problem of insufficient power supply voltage of
USB peripheral

Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: I7e06b463a2da567fcf8fa2fc641379d9274ed549
 2021-04-02 09:18:56 +08:00
Ziyuan Xu
93d0ff21b4 clk: rockchip: rv1126: ungate pdvdec/pdjpeg's for VEPU2 
Fixes: 5522e03af8 ("clk: rockchip: rv1126: mux clocks to none-cpll/hpll")
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I8a361a11dea9d3546efd883e7c1394e9d2834223
 2021-04-01 20:51:44 +08:00
Ren Jianing
1c86926435 usb: gadget: uvc: support h265 format 
Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Ifbe15ef632a5b58e45a04228537e7f653761e233
 2021-04-01 20:51:01 +08:00
Johan Jonker
fd37ea326e UPSTREAM: arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards 
Recently introduced async probe on mmc devices can shuffle block IDs.
Pin them to fixed values to ease booting in environments where UUIDs are
not practical. Use newly introduced aliases for mmcblk devices from [1].
The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

Change-Id: I9ae6f07f295553990118596f379275876d852497
Signed-off-by: Johan Jonker <jbx6244@gmail.com>
Link: https://lore.kernel.org/r/20210118155242.7172-5-jbx6244@gmail.com
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Wenping Zhang <wenping.zhang@rock-chips.com>
(cherry picked from commit 0523b124aa)
 2021-04-01 20:27:42 +08:00
Andy Yan
a7ffaf261c drm: Not mark crtc state as connectors_changed when a writeback connector attatch to a crtc 
The drm core will disable than enable a crtc when is marked as
connectors_changed.

But when we attach a writeback connector to a running
crtc, we really don't need this disable/enable, which
will black a running screen.

Change-Id: I636615f27424bc60496ffc487c218f60fb95d719
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
 2021-04-01 14:56:41 +08:00