Commit Graph

862807 Commits

Author SHA1 Message Date
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
Cai YiWei
157c77620d media: rockchip: isp and ispp add shutdown
Change-Id: Iec748f28a6662c104b66a2ab44e0946515061320
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2021-02-26 10:46:15 +08:00
Chen Jinsen
6cc79bc4ef ARM: dts: rk3288-evb-android-rk808-edp-avb: adjust advanced-rates of hevc
Signed-off-by: Chen Jinsen <kevin.chen@rock-chips.com>
Change-Id: I9d14612e7e3725bfff00248ee15cc4ace63c2b62
2021-02-26 10:43:56 +08:00
Jianqun Xu
b29ef8b22b staging: android: ion: skip sync for uncached buffer
Fixes: fb4e66e115 ("android: ion: pass in DMA_ATTR_SKIP_CPU_SYNC when
calling dma_(un)map_sg_attrs()")
Change-Id: Ia2235a53d5c023a3fdd9de22686be39bbaa5093d
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-02-26 10:41:15 +08:00
Jianqun Xu
bec15067c2 staging: android: ion: do cache flush for system heap pages
Change-Id: I57505aaee2c2f9af796313bfc729cef0ce9cfece
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2021-02-26 10:41:15 +08:00
Zorro Liu
c51d10ea44 drm/rockchip: ebc_dev: release version v1.04
pvi_waveform: update
1.support version 0x09, 0x16, 0x43 wbf file
2.fix lut table some err
3.remove no use code

Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: I045dbc72064a00e15ac4eaff4b385ad853353b99
2021-02-26 10:31:13 +08:00
Ding Wei
ff8eab35e1 ARM: dts: rockchip: rk3288: hevc_service: add default val setting
Change-Id: I3f71fe50e8b51e21728afae850f0aca21b8b160c
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-02-25 18:08:27 +08:00
Ding Wei
b1b96334c4 video: rockchip: mpp: rkvdec: add clock strategy according to resolution
if pixels large than default which set in dtsi, use advanced-rates.
otherwise, use normal-rages.

Change-Id: I488c2815dbe1e3decd1d305a78bf523d944d1e96
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2021-02-25 18:08:06 +08:00
Sandy Huang
f6d1c63b4d drm/rockchip: vop2: add support cubic lut
Change-Id: Iebf89a10b4bdfe630212b393019e926b6dde0e22
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-02-25 16:47:23 +08:00
Sandy Huang
9906f3cefd drm/rockchip: vop2: update for gamma lut config
1. move some gamma parameter from vop to vp;
2. add support atomic api for gamma lut;

Change-Id: Id54316fbbba4d07375fa51ca47790a01ea9c29f5
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-02-25 16:47:23 +08:00
Sandy Huang
650f40f040 drm/rockchip: vop: add support atomic api for gamma lut
Change-Id: Idc1d635693e14e1fe35d8f03e3707c58dd21c468
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2021-02-25 16:47:23 +08:00
Sandy Huang
34622060bf FROMLIST: drm: Extend color correction to support 3D-CLU
Extend the existing color management properties to support provision
of a 3D cubic look up table, allowing for color specific adjustments.

Signed-off-by: Kieran Bingham<kieran.bingham+renesas@ideasonboard.com>
Co-developed-by: Laurent Pinchart<laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart<laurent.pinchart+renesas@ideasonboard.com>
Reviewed-by: Kieran Bingham<kieran.bingham+renesas@ideasonboard.com>
Link: https://lore.kernel.org/dri-devel/20201221015730.28333-4-laurent.pinchart+renesas@ideasonboard.com/
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
Change-Id: Ifa62b1fbf4195fffaf2f06c9990ca4f48b71dca7
2021-02-25 16:47:06 +08:00
shengfei Xu
97f2daa2e2 arm64: dts: rockchip: rk3568: adjust suspend mode define
Signed-off-by: shengfei Xu <xsf@rock-chips.com>
Change-Id: I19744999dcc2f9a1ee2bd332661acc5bf8c83837
2021-02-25 16:26:01 +08:00
William Wu
a73f42850a usb: dwc3: core: fix NULL pointer dereference when plug out otg host
When do hot plug test on RK3566 Tablet with Type-C to Type-A receptacle.
The dwc3 driver may receive the EXTCON_USB_HOST notifier with disconnect
state twice occasionally, then it do dwc3_host_exit() repeatedly and cause
panic issue with the following log:

[  260.793245] xhci-hcd xhci-hcd.4.auto: remove, state 4
[  260.796706] xhci-hcd xhci-hcd.4.auto: USB bus 2 deregistered
[  260.797889] xhci-hcd xhci-hcd.4.auto: remove, state 1
[  261.286875] xhci-hcd xhci-hcd.4.auto: USB bus 1 deregistered
[  261.289416] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000070
[  261.290353] Mem abort info:
[  261.290624]   ESR = 0x96000005
[  261.290911]   Exception class = DABT (current EL), IL = 32 bits
[  261.291501]   SET = 0, FnV = 0
[  261.291785]   EA = 0, S1PTW = 0
[  261.292065] Data abort info:
[  261.292323]   ISV = 0, ISS = 0x00000005
[  261.292660]   CM = 0, WnR = 0
[  261.293009] user pgtable: 4k pages, 39-bit VAs, pgdp = 000000005d271f4e
[  261.293610] [0000000000000070] pgd=0000000000000000, pud=0000000000000000
[  261.294221] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[  261.294726] Modules linked in: rknpu
[  261.295059] Process kworker/0:3 (pid: 1785, stack limit = 0x000000006a077ac4)
[  261.295693] CPU: 0 PID: 1785 Comm: kworker/0:3 Not tainted 4.19.161 #52
[  261.296276] Hardware name: Rockchip RK3566 RK817 TABLET LP4X Board (DT)
[  261.296892] Workqueue: events_freezable __dwc3_set_mode
[  261.297371] pstate: 60c00009 (nZCv daif +PAN +UAO)
[  261.297817] pc : kernfs_find_ns+0x24/0x118
[  261.298186] lr : kernfs_find_and_get_ns+0x3c/0x60
[  261.298607] sp : ffffff800f90bbd0
...
[  261.411635]
[  261.411780] Call trace:
[  261.412026]  kernfs_find_ns+0x24/0x118
[  261.412366]  kernfs_find_and_get_ns+0x3c/0x60
[  261.412757]  sysfs_unmerge_group+0x20/0x60
[  261.413125]  dpm_sysfs_remove+0x3c/0x78
[  261.413471]  device_del+0x98/0x3f8
[  261.413778]  platform_device_del+0x2c/0xa8
[  261.414139]  platform_device_unregister+0x14/0x30
[  261.414561]  dwc3_host_exit+0x78/0x90
[  261.414893]  __dwc3_set_mode+0x39c/0x3a0
[  261.415250]  process_one_work+0x1a0/0x418
[  261.415611]  worker_thread+0x32c/0x3e0
[  261.415950]  kthread+0x12c/0x158
[  261.416247]  ret_from_fork+0x10/0x18

This patch checks the drd_connected status before handle
disconnect process for host to avoid duplicating unregister
platform device.

Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I815d800febea89dbf1f5f84eba8efd9e910e3e9a
2021-02-25 15:43:09 +08:00
Shawn Lin
42cdb424bb arm64: dts: rockchip: rk3568: Add Legacy INT support for PCIe
Change-Id: I9afd5332467d35e3450a228a8cb4d7f94426881a
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-02-25 14:28:32 +08:00
Shawn Lin
4788e0cb75 PCI: rockchip: dw: Concretely support Legacy INT for ancient devices
All modern devices support MSI or even MSI-X, but some very ancient devices
such as PCI devices may also like to only support PCI legacy INT. Although
it's very unlikely to happened but we at least need a method to make PCIe
work if anything wrong with GIC its support.

Change-Id: I917af7c8986977e3ae5944e9cc89a8e3409a8cd9
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2021-02-25 14:28:25 +08:00