Commit Graph

862822 Commits

Author SHA1 Message Date
Jon Lin
f3dc096419 drivers: rkflash: Support F59L2G81KA and F59L4G81KA
Change-Id: I99cbb82fbad9a678ecd66fc3965e6164ddbd9e7d
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2021-03-05 19:18:25 +08:00
William Wu
51216a597d usb: dwc3: core: init current_dr_role in async probe
During dwc3 probe, it init the current_dr_role in drd_work,
and it must make sure that the current_dr_role is initialized
to DWC3_GCTL_PRTCAP_DEVICE or DWC3_GCTL_PRTCAP_HOST if it
support dule role mode before do async probe.

However, the drd_work and dwc3_rockchip_async_probe are handled
asynchronously, if the drd_work is handled prior to async probe,
it may fail to call dwc3_core_exit from dwc3_runtime_suspend in
async probe because of uninitialized current_dr_role. If this case
happens, the USB 2.0/3.0 PHY power on/off operations are unbalanced.

This patch get the extcon state before do runtime suspend in async
probe, and init the current_dr_role according to the extcon state.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I4d1f7683d3ef3c5580f35be52d28821c47f6457f
2021-03-05 19:15:17 +08:00
Joseph Chen
75304a4856 arm64: dts: rockchip: rk3566-eink: add unified suspend configuration
- It is for lite and mem mode, the ultra mode is not configurable.
- Disable sleep debug msg;

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I628aa1da19e2704b382a4a7307566a094daaa63a
2021-03-05 19:14:58 +08:00
Longjian Lin
92c5712760 net/rfkill: bt: donot enable bt irq when bt is off and enable bt sleep
Signed-off-by: Longjian Lin <llj@rock-chips.com>
Change-Id: If6199b0cdf56b24d84e4edca41b561d1740a5f35
2021-03-05 19:14:32 +08:00
Shunqing Chen
c7b608a931 arm64: dts: rockchip: rk356x board: enable route_hdmi
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I9616a6332cb20c3047bf525a436569f881f71a1c
2021-03-05 14:55:46 +08:00
Tao Huang
8bb5326f25 PM: EM: Call em_debug_init() later when CONFIG_ROCKCHIP_THUNDER_BOOT=y
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I893ea1089cf807d51983d70e9323f4a3b4f2b000
2021-03-05 14:32:22 +08:00
Sandy Huang
a611762d20 drm/rockchp: drv: Added support for more than 4G memory
fix log:

rockchip-drm display-subsystem: swiotlb buffer is full (sz: 262144 bytes)

Change-Id: I05fd8a2674e1e73fb1d35c75c009eacc7ba8a236
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-03-05 14:29:33 +08:00
Zou Dengming
d6e990a143 arm64: dts: rockchip: rk3566-box-demo-v10: correct wake btchip and wake host pins
Signed-off-by: Zou Dengming <marsow.zou@rock-chips.com>
Change-Id: I257e853269fd429d34a5dc6d712183dd6d8517a3
2021-03-05 11:14:46 +08:00
Elaine Zhang
394d2ee04d net: can: rockchip: fix up the receiving filter ID
ID MASK bit is bit[28:0].

Change-Id: Id8202e777c2b9daabe2b06335bfb20bb14cc7469
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2021-03-05 09:28:52 +08:00
Huang zhibao
1ae52baba3 arm64: dts: rockchip: rk3566-box: adjust suspend mode define for box
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I2cf3b85f0bfc7ed9b369bbedaa19f1776c814598
2021-03-05 09:26:56 +08:00
Huang zhibao
feac441a49 arm64: dts: rockchip: rk3566-box-demo-v10: wlan add reset-gpio
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I1ca6bc9fbc2de4912715ae79aa9cb4473fd8dac7
2021-03-05 09:26:22 +08:00
Jianqun Xu
94daf32a11 dma-buf: show attached devices name to bufprocs node
console:/ # cat /sys/kernel/debug/dma_buf/bufprocs
surfaceflinger (PID 187) size: 66596
DMA Buffers:
Name            Exp_name                                                        Size (KB)       Alive (sec)     Attached Devices
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   12480           9               display-subsystem       ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   4               9               ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   12480           9               display-subsystem       ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   2288            1               ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   2288            1               ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   12288           8               display-subsystem       ff9a0000.gpu    ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   12480           9               display-subsystem       ff9a0000.gpu
(null)          ion_alloc-ion_system_heap-218-allocator@4.0-s                   12288           8               display-subsystem       ff9a0000.gpu    ff9a0000.gpu

Change-Id: I95b1feaf933cc46c8936db129f9152ead71ed664
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-03-04 15:33:04 +08:00
Ziyuan Xu
3f1e1d3358 media: rockchip: isp: import dma API for memory synchronisation for thunderboot
Change-Id: I29b4b4fb381ff6ba4cc7ef203c431ec0b1b6055b
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2021-03-04 15:29:09 +08:00
Ziyuan Xu
41d2151d7a ARM: dts: rv1126-bat-ipc-v10: tune suitable memory for rkisp_thunderboot
The MCU reserves 10 frames raw data for 1080P sensor and about 1MB
header, it's about 32MB memory usage for 1080P on MCU.

Change-Id: I3bed8df0816af789ab4f143725c50e8e43ba12bb
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
2021-03-04 10:49:34 +08:00
Sun ChuanHu
3fef22cd18 ARM: dts: rv1126-bat-ipc-v10: make the powers for camera boot-on
Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I20f559edf05715ad89455e9bc579e9008e9c3059
2021-03-04 10:49:34 +08:00
Sun ChuanHu
f5bb84148b ARM: dts: rockchip: remove isp/csi clocks assign for rv1126 thunder_boot_rkisp
The assigned clks take effect off-line capture on MCU, and make MCU
abnormal.

Signed-off-by: Sun ChuanHu <aaron.sun@rock-chips.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ib41b397afc7dd31a898cef9ccdef7b7c9b162f17
2021-03-04 10:48:31 +08:00
Jianqun Xu
f78fc341ef pinctrl: rockchip: fix error mux route for rk3568 pwm
Change-Id: I40ec6b0de54a6d2a01b0fe2c9dfb679088ce9821
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-03-04 10:38:03 +08:00
Jianqun Xu
b3bc336903 staging: android: ion: add 'heaps' debug node
console:/ # cat /sys/kernel/debug/ion/heaps
id      type    name
2       0       ion_system_heap
1       1       ion_system_contig_heap
0       0       ion_secure_heap

Change-Id: I0d798205573eb5a2b3177d51f784bf8c89ab7313
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-03-03 19:14:18 +08:00
Sugar Zhang
e603d7d441 ASoC: rockchip: pdm: Fix ret value
Fixes: 93773ea1ee ("ASoC: rockchip: pdm: Add support for path map")
Change-Id: If7bb2c7e08f0e65a010866b2594e360fd4be482a
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2021-03-03 19:13:54 +08:00
Cai YiWei
7e2b98f59d media: rockchip: ispp: image input from user
1.link enable ispp input video
2.set ispp input format
3.ispp output video config and stream on
4.ispp input video config and stream on

Change-Id: I742ebb71ceb87059e269628e8092177178b0ac45
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-03-03 19:12:23 +08:00
Cai YiWei
589cabfc98 media: rockchip: ispp: optimize the frame rate of fec en
Change-Id: I801e50b7947e55dabadc075b584d7080fc273bdf
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-03-03 19:12:23 +08:00
Wyon Bi
238c3fcc1a ARM: dts: rockchip: rk3288: Fix edp node
Change-Id: I01855dd3ef2ea3be1db063e35f9aebd815fd66ba
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-03-03 17:48:29 +08:00
Wyon Bi
af6376febb ARM: dts: rockchip: Drop legacy edp phy from rk3288 board
Change-Id: I2d62d2ad7a0d05d25b8399127a874681bcd0876a
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2021-03-03 17:48:29 +08:00
Jianqun Xu
d37c482e0e staging: android: ion: use dma_sync_sg_for_device to do flush
Fake platform devices for ion page pools, which are required by dma api.

Change-Id: Id4b5844f20f993ea1b93704286610555386aeda8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-03-03 17:41:21 +08:00
Jianqun Xu
80e32bed61 Revert "staging: android: ion: do cache flush for system heap pages"
This reverts commit bec15067c2.

Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: Iae860c1009c443886ef5568b43e0af708ec88f59
2021-03-03 17:40:54 +08:00
Jianqun Xu
dd09037474 staging: android: ion: print heap info for debug
Change-Id: If406cb1a739bfc76986a23ea06f041459d0dd0f9
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-03-03 17:22:06 +08:00
Sandy Huang
fea7db2e12 drm/rockchip: vop2: add vp loader_protect for crtc is more correct
Change-Id: I5e0501c06047be026aa64211191d1ad59501c956
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-03-03 10:59:41 +08:00
Andy Yan
e0282362e6 drm/rockchip: vop2: Attach unused win to the last activated port at initial
Change-Id: I7980fcd8547c0d0c80c416a762d9501e32f40674
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2021-03-03 10:59:41 +08:00
David Wu
ab1d0ca056 arm64: dts: rockchip: rk356x: Add parent of gmac sclk for the compatible
Signed-off-by: David Wu <david.wu@rock-chips.com>
Change-Id: Ia1600504594968df427fb3908697aaaeefb75822
2021-03-03 09:57:15 +08:00
Shawn Lin
21cd7a67bb arm64: dts: rockchip: rk3568: Add mmc aliases for rk3568
Change-Id: Ie02652b808c626ef1b2ef73d507efbc5e72ba780
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-03-03 09:31:13 +08:00
Tao Huang
c060abdb52 arm64: dts: rockchip: Remove swiotlb=1
Which is no longer needed after commit
b67a8b29df ("arm64: mm: only initialize swiotlb when necessary").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: If1afd62f81b37f81cfdfc9bb4ef95e753b2006c4
2021-03-02 17:33:40 +08:00
Tao Huang
1eb4d925e2 ARM: dts: rockchip: Remove swiotlb=1
Which is no longger needed after commit
b67a8b29df ("arm64: mm: only initialize swiotlb when necessary").

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4a387406cee1308406bf3630f69c67f6dd4cd30f
2021-03-02 17:33:25 +08:00
Zorro Liu
e2e308a79f arm64: dts: rockchip: rk3566-rk817-eink-w103: disable touch q
1.disable touch q function
2.pull down touch q gpio default to avoid electric leakage when sleep

Change-Id: Iedc1aa31f26d701153138c689bff943dc88ffe89
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2021-03-02 10:44:31 +08:00
Huang zhibao
1232b84288 arm64: dts: rockchip: add rk3566 box dts
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: I55375e5b3b2144820d389aef9f225a0dcf3a5019
2021-03-01 18:04:41 +08:00
Ding Wei
4d626acbf5 video: rockchip: mpp: add flag to mark that reg not contain offset info
old mode:
    | 31-10  | 9-0 |
    | offset | fd  |
new mode:
    | 31-0 |
    |  fd  |
offset in REG_ADDR_OFFSET task_msg alone.

Change-Id: Ia850ac5a9d57a2dfeda66e55c584275cfb008cad
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-03-01 17:22:30 +08:00
Wang Panzhenzhuan
a7d4e72f11 media: i2c: jaguar1: fixed 1080p 25fps ahd config issue
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I48913ecd49678e3e2429cd3b97c6b894baf5d136
2021-03-01 17:21:11 +08:00
Allon Huang
ff095bee45 media: platform: rockchip: cif: fix dvp sof event miss match
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ie96851327335ca27cd978269df97d7c0e4aacb97
2021-03-01 15:12:01 +08:00
Finley Xiao
8f4038c7e1 ARM: dts: rv1126: Fix voltage for NPU 200MHz~500MHz
For some chips, the Vmin of NPU 200MHz is the same as NPU 600MHz.

Change-Id: I74bb792473c38d5a16d7f79d8eb8f7ef4feff3b8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-03-01 14:58:14 +08:00
Finley Xiao
f4027fb3af ARM: dts: rv1126: Change aclk venc to 297MHz for readability
Change-Id: I8d9248ea9e99a0b443b56f93bf4b72f61eb637f0
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-03-01 14:57:49 +08:00
Finley Xiao
5d0abc6b4d ARM: dts: rv1126: Assign clk venc core to 396MHz
As the maximum frequency of some chips is 500MHz, set the initial value
to the normal rate 396MHz.

Change-Id: I2ee84ac1672b390d9d5ec221d1d7fd0db6fd0566
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2021-03-01 14:57:00 +08:00
Vicent Chi
bbf4a44c7b media: i2c: sc210iot: support thunderboot mode
Change-Id: Iebc228b723269f2f0ab4fa9deb302e30277a1b50
Signed-off-by: Vicent Chi <vicent.chi@rock-chips.com>
2021-03-01 10:38:22 +08:00
Weiguo Hu
d43184d461 net: rockchip_wlan: bcmdhd_wifi6: modify module mame to bcmdhd
Signed-off-by: Weiguo Hu <hwg@rock-chips.com>
Change-Id: Ibbe444c76b647543afd9b4d74914a79789015dd6
2021-02-26 16:39:11 +08:00
Tao Huang
bd95fea1ea scripts/gcc-wrapper.py: ignore vfs.c:1259
fs/incfs/vfs.c: In function 'ioctl_create_file':
fs/incfs/vfs.c:1259:10: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast]

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I4a9e167927d32180871776767fe3e4ff0c8342a9
2021-02-26 16:18:21 +08:00
Tao Huang
b50aca0c9a Merge tag 'ASB-2021-02-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2021-02-01
CVE-2017-18509
CVE-2020-10767

* tag 'ASB-2021-02-05_4.19-stable': (809 commits)
  ANDROID: GKI: fix up abi issues with 4.19.172
  Linux 4.19.172
  fs: fix lazytime expiration handling in __writeback_single_inode()
  writeback: Drop I_DIRTY_TIME_EXPIRE
  dm integrity: conditionally disable "recalculate" feature
  tools: Factor HOSTCC, HOSTLD, HOSTAR definitions
  tracing: Fix race in trace_open and buffer resize call
  HID: wacom: Correct NULL dereference on AES pen proximity
  futex: Handle faults correctly for PI futexes
  futex: Simplify fixup_pi_state_owner()
  futex: Use pi_state_update_owner() in put_pi_state()
  rtmutex: Remove unused argument from rt_mutex_proxy_unlock()
  futex: Provide and use pi_state_update_owner()
  futex: Replace pointless printk in fixup_owner()
  futex: Ensure the correct return value from futex_lock_pi()
  futex: Prevent exit livelock
  futex: Provide distinct return value when owner is exiting
  futex: Add mutex around futex exit
  futex: Provide state handling for exec() as well
  futex: Sanitize exit state handling
  ...

Change-Id: Ieba6ee3a91a05d504e1f829a84e7d364e7d983f2

Conflicts:
	arch/arm64/boot/dts/rockchip/rk3328.dtsi
	drivers/md/Kconfig
	drivers/usb/gadget/function/f_uac2.c
2021-02-26 15:30:04 +08:00
Tao Huang
ab9fb85b0b Revert "usb: gadget: composite: fix dead lock when uvc disconnect"
This reverts commit b43b8174c1.

Relpaced by commit fc9f57f643 ("usb: gadget: Fix spinlock lockup on usb_function_deactivate")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-02-26 15:12:48 +08:00
Tao Huang
9360dab604 Revert "irqchip/gic-v3-its: set flag "ITS_FLAGS_SAVE_SUSPEND_STATE" if rk3568 or rk3566"
This reverts commit 330a359767.

Relpaced by commit 0c486401a3 ("irqchip/gic-v3-its: Unconditionally save/restore the ITS state on suspend")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-02-26 15:12:42 +08:00
Sandy Huang
d57d8b4d14 drm/rockchip: vop: update BCSH process precision
Change-Id: Ib3d6e51b17def968656bbd625afd5e55f355011f
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-02-26 14:34:01 +08:00
Longjian Lin
2068f8fa2d ARM: dts: rk3288-evb-android-rk808-edp: enable route_hdmi
Signed-off-by: Longjian Lin <llj@rock-chips.com>
Change-Id: I0230c21775bcca79f7a94dcba1cc1e6de50c0a27
2021-02-26 14:30:58 +08:00
Zhenke Fan
2443b518f1 media: i2c: sc500ai: fix set vflip/hflip failed bug
Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Iaa36ece66310489a8576c5eeb4137779af412a48
2021-02-26 14:23:28 +08:00
Caesar Wang
a4500ae7f2 arm64/configs: merge bifrost configs into rockchip_linux_defconfig
The GPU driver and dts had uploaded some CLs to support it, as below:

driver:
a519839892 ("MALI: midgard: change kbase_platform_driver.driver.name to "midgard"")
a9f72d8212 ("MALI: bifrost: remove 'of_device_id' instances related to midgard")
5a1b8a4b4b ("MALI: midgard: add and include rename.h")

dts:
a400cac168 ("arm64: dts: rockchip: rk3568: gpu: only use "arm,mali-bifrost"...")

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I2dfdf09e7251e4efa8c80fb152cd189a147f917e
2021-02-26 10:47:52 +08:00