Commit Graph

861485 Commits

Author SHA1 Message Date
Liang Chen
7b82ea84b3 cpufreq: dt-platdev: Add rk3566 project into blacklist
Change-Id: I110e1b06a7913747fc74497241d03d632727265c
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-29 17:36:20 +08:00
Liang Chen
cc9529c8ba arm64: dts: rockchip: add cpuinfo node for rk3568
Change-Id: Ia98489355ca992d19f8c215978dd25699603c6ce
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-12-29 16:37:42 +08:00
Saravana Kannan
dcddb5cea9 UPSTREAM: driver core: Avoid deferred probe due to fw_devlink_pause/resume()
With the earlier patch in this series, all devices that deferred probe
due to fw_devlink_pause() will have their probes delayed till the
deferred probe thread is kicked off during late_initcall. This will also
affect all their consumers.

This delayed probing in unnecessary. So this patch just keeps track of
the devices that had their probe deferred due to fw_devlink_pause() and
attempts to probe them once during fw_devlink_resume().

Change-Id: Id92b3a5d867b5fa8c07c4c40e810928a9631bf9e
Fixes: 716a7a2596 ("driver core: fw_devlink: Add support for batching fwnode parsing")
Signed-off-by: Saravana Kannan <saravanak@google.com>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200701194259.3337652-4-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 2451e74647)
2020-12-29 16:11:37 +08:00
Saravana Kannan
99c458503e BACKPORT: driver core: Rename dev_links_info.defer_sync to defer_hook
The defer_sync field is used as a hook to add the device to the
deferred_sync list. Rename it so that it's more meaningful for the next
patch that'll also use this field as a hook to a deferred_fw_devlink
list.

Signed-off-by: Saravana Kannan <saravanak@google.com>
Reviewed-by: Rafael J. Wysocki <rafael@kernel.org>
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200701194259.3337652-3-saravanak@google.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit ec7bd78498)
Change-Id: I380aaba3930772d99afb62eea194594435160c62
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-12-29 16:11:27 +08:00
Tao Huang
5647c1d492 Merge tag 'ASB-2020-12-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2020-12-01
CVE-2020-0444
CVE-2020-0465
CVE-2020-0466

* tag 'ASB-2020-12-05_4.19-stable': (636 commits)
  ANDROID: kbuild: use grep -F instead of fgrep
  ANDROID: GKI: usb: gadget: support claiming indexed endpoints by name
  UPSTREAM: arm64: sysreg: Clean up instructions for modifying PSTATE fields
  Revert "Revert "ANDROID: clang: update to 11.0.5""
  ANDROID: kbuild: speed up ksym_dep_filter
  Revert "drm/atomic_helper: Stop modesets on unregistered connectors harder"
  Linux 4.19.161
  USB: core: Fix regression in Hercules audio card
  x86/resctrl: Add necessary kernfs_put() calls to prevent refcount leak
  x86/resctrl: Remove superfluous kernfs_get() calls to prevent refcount leak
  x86/speculation: Fix prctl() when spectre_v2_user={seccomp,prctl},ibpb
  usb: gadget: Fix memleak in gadgetfs_fill_super
  USB: quirks: Add USB_QUIRK_DISCONNECT_SUSPEND quirk for Lenovo A630Z TIO built-in usb-audio card
  usb: gadget: f_midi: Fix memleak in f_midi_alloc
  USB: core: Change %pK for __user pointers to %px
  perf probe: Fix to die_entrypc() returns error correctly
  can: m_can: fix nominal bitiming tseg2 min for version >= 3.1
  platform/x86: toshiba_acpi: Fix the wrong variable assignment
  platform/x86: thinkpad_acpi: Send tablet mode switch at wakeup time
  can: gs_usb: fix endianess problem with candleLight firmware
  ...

Change-Id: I82ccfc3d6561d3ef3b1b06ac98d48fac997c8fb6

Conflicts:
	drivers/pinctrl/pinctrl-rockchip.c
	drivers/usb/dwc3/gadget.c
	drivers/usb/host/xhci.c
	drivers/usb/host/xhci.h
2020-12-29 16:10:48 +08:00
Tao Huang
79bdd6a061 Revert "ARM: hw_breakpoint: Workaround for Cortex-A12/A17"
This reverts commit 15d6bca6c4.

Replaced by commit 2bb93af182 ("ARM: 8997/2: hw_breakpoint: Handle inexact watchpoint addresses")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-12-29 16:09:30 +08:00
Tao Huang
e1db199ebd Revert "Revert "Revert "ANDROID: vfs: add d_canonical_path for stacked filesystem support"""
This reverts commit f9cb1a06e3.

Replaced by commit 54b41388f5 ("ANDROID: vfs: add d_canonical_path for stacked filesystem support")

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-12-29 16:09:21 +08:00
Wu Liangqing
5dba7c1f52 arm64: dts: rockchip: rk3566-rk817-tablet: set lcd_stanby_gpio pull down
Change-Id: If2f247daccca6adcf5fd1f9c77f89dd24128ac38
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-29 15:34:14 +08:00
Wu Liangqing
b81652bce8 arm64: dts: rockchip: rk356x ddr3 set dmc max-freq 1056Mhz
Change-Id: I33191a9b62a5b6fec8d88de79119898033b63616
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-12-29 10:22:58 +08:00
Tao Huang
7914a8fb2b arm64: dts: rockchip: Add arm,no-tick-in-suspend in timer for rk3568
Arch timer stops during system suspend. Add arm,no-tick-in-suspend
property in timer.

Signed-off-by: Tao Huang <huangtao@rock-chips.com>
Change-Id: I24ebe7e027593cfbdbfc5476f196425df640e8d7
2020-12-28 18:01:44 +08:00
Nickey Yang
881ef729dd drm/bridge: synopsys: dw-hdmi: check hdmi status in resume
HDMI status maybe incorrect in the following condition:
HDMI plug in -> system sleep ->  HDMI plug out -> system wake up.
At this time, cat /sys/class/drm/card 0-HDMI-A-1/status is connected.
There is no hpd interrupt, because HDMI is powerdown during suspend.
So we need check the current HDMI status in this case.
Test on rk3288 & rk3399.

Change-Id: I2fbafd1d80b59628bca65e9e45760a24d1668241
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2020-12-28 09:28:33 +00:00
William Wu
b8c2578c5a phy: rockchip: naneng-combphy: check status after deassert phy rst
Check the phy status after deassert phy reset for USB 3.0
mode, and wait at most 1ms for phy ready. If wait for phy
status ready timeout, just print warning log and continue
phy init for the time being.

Change-Id: I2677679a99153cf9ee0a043ab6cfb56d9e8dfdf2
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-28 16:55:31 +08:00
Frank Liu
adadbbcb52 media: i2c: fix sc500ai exposure time error
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I678a14e30548d6f797fa86043a0592b961f045fe
2020-12-28 16:38:53 +08:00
Andy Yan
0bc7b9d548 drm/rockchip: vop2: Enable dclk_div2 for YUV420 output mode
dclk_div2 and dclk_div2_phase are undocumented in TRM, but
these two bit should be set at YUV420 output mode.

Change-Id: I711336798a7d352c8f7a85f1fedfa5933d8261ec
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-28 16:37:12 +08:00
Jon Lin
508d2dcbfe soc: rockchip: mtd_vendor_storage: Erase block in initial progress
Change-Id: Ibbff54cd7a14d5f37ec23a4d52ab557c820caec3
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-28 14:33:47 +08:00
Jon Lin
6d85832a79 drivers: rkflash: Remove RK vendor support for spinor mtd case
1.Change to use RK MTD vendor operation
2.RK MTD vendor is incompatible with RK vendor

Change-Id: I7c233b0b0a98c5e93d0722956809a9d6c01663a1
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-28 14:33:47 +08:00
Frank Liu
a30d204193 media: i2c: sc500ai output 2880*1616 resolution image
Signed-off-by: Frank Liu <frank.liu@rock-chips.com>
Change-Id: I2b61eb0f16e0a3f177c256c1453ef0cc3cf2b7f0
2020-12-28 14:32:21 +08:00
Hu Kejun
8461719770 media: rockchip: isp: add ioctl to get share buffer fd
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I3b33429007539ccb75859373f6598b5a2c2f7203
2020-12-28 09:55:57 +08:00
David Wu
a4f923c7b5 arm64: dts: rockchip: rk3566: Fix the rgmii delayline for evb3 and evb5
After changing the drive strength, fix the current
delayline.

Change-Id: I2aca4ddef692214a9c2e2cf7bae261cea04027b1
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-12-28 09:52:25 +08:00
David Wu
2524d8dfa7 arm64: dts: rockchip: Change the driver strength for rk356x gmac tx pins
Change-Id: Iebe1e0dce56cd3a115f9bc16dd3238d8c955bbe3
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-12-28 09:52:17 +08:00
Wang Panzhenzhuan
984eef7727 media: i2c: add gc02m2 sensor driver
Signed-off-by: Wang Panzhenzhuan <randy.wang@rock-chips.com>
Change-Id: I9103cf16c09c4c74243ce2a2084b60f6c87016e6
2020-12-28 09:52:00 +08:00
Ren Jianing
9ae3574797 arm64: dts: rockchip: rk3568-nvr: fix usb host support
We let phy-supply regulator always on to support all usb host port.

For dwc3 host port, which only works at high speed, combphy1_usq
should be deleted at dwc3 node and add 'rockchip,dis-u3otg1-port'
attribute.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: I3623de2f76ee27ea34fe2a94481319a3ccb7b23b
2020-12-28 09:49:10 +08:00
Jon Lin
1d93776778 spi: rockchip: Support SPI_CS_HIGH
Change-Id: I899bce8d9418ee99c784726bb56534aaed27c00b
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-12-28 09:48:04 +08:00
Zefa Chen
63c0270850 media: i2c: jx_f37 support mirror/flip
Signed-off-by: Zefa Chen <zefa.chen@rock-chips.com>
Change-Id: Ibc876b49b76055396d4ee64a583b13965d76f344
2020-12-28 09:37:31 +08:00
Shawn Lin
b3f78165e5 phy: rockchip: naneng-combphy: Reset phy if not being used
Change-Id: Ia62481ebf5aa5684c359fd00a3933bb02e2caaff
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-28 09:36:01 +08:00
Shawn Lin
1a3cf4f5c2 PCI: rockchip: dw: Don't de-init driver in signal test mode
Change-Id: I0e98b334cd488cc44ece9719ca8f6bab2a06ea99
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-28 09:32:15 +08:00
Shawn Lin
4da47ef026 PCI: rockchip: dw: Add compliance test mode support
Change-Id: I93d2f84d6376221a296c747954acae2593c41d50
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-28 09:32:15 +08:00
Shawn Lin
62d3dd22e5 arm64: dts: rockchip: Correct PCIe node for rk3568-evb2-lp4x-v10
Change-Id: I5da9046a833c9dede1b7359761aecf6ff731b215
Fixes: 99e10612ff ("arm64: dts: rockchip: add rk3568-evb2-lp4x-v10 for rk3568 evb2")
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-12-28 09:28:44 +08:00
Wu Liangqing
1a514e6425 arm64: dts: rockchip: rk3368-evb1: i2c2 pinctrl set to i2c2m1_xfer
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: If5cb0f90a0a47b94f67f3f9f39a41ffd0a5633ce
2020-12-25 17:26:57 +08:00
Andy Yan
f6ae3448e0 Revert "arm64: dts: rockchip: set ACLK_VOP to 500M for rk3568"
ACLK_VOP is assigned by cru now.

This reverts commit de0105f86b.

Change-Id: I9b9390c444d215eaf940053d8617f28b3632e6a9
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-12-25 17:23:01 +08:00
Hu Kejun
61b8e8b0d8 arm64: dts: rockchip: rk3566/rk3568: add iq feature property in rkisp
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I147672d5a788b54f08060b5071bb2d505ab646d4
2020-12-25 15:10:32 +08:00
Hu Kejun
cd941afca7 media: rockchip: isp: support iq feature setting
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I870a6f5a54495eb537f32515aec28dfd8ec52f3d
2020-12-25 15:10:20 +08:00
Alex Zhao
39c34fb4bc arm64: dts: rockchip: rk3568-evb: remove unused code
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I50bc54580292478713f7979889e63b82e89861bf
2020-12-24 17:50:36 +08:00
William Wu
138fd489e3 usb: dwc3: core: add async probe for rockchip dwc3
The default autosuspend delay of PM runtime is 5000ms,
it's too long. For Rockchip DWC3 controller, if it supports
PM runtime management, e.g. RK3568 OTG port, then we expect
to put the DWC3 controller in runtime suspend at the end of
probe as soon as possible. This can fix the issue that race
condition between power down the DWC3 in runtime suspend and
access the DWC3 in dwc3_gadget_pullup() by userspace.

This patch uses pm_runtime_put_sync_suspend() instead of
pm_runtime_put if enable PM runtime. And according to the
commit f2a2b34e45 ("usb: dwc3: rockchip: use async_schedule
for initial dwc3"), we do pm_runtime_put_sync_suspend() in
async schedule to avoid increasing the boot time.

Change-Id: I378e57d272382d444f1ac52ea2961736e472e713
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-12-24 17:31:35 +08:00
Allon Huang
e8fba342ae arm64: dts: rockchip: rk3566-evb1-ddr4-v10: links ov02k10 with vicap by mipi split mode
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I8547af9aa5d956b2105390bb5cbb962fa9552f7a
2020-12-24 17:17:25 +08:00
Allon Huang
8378430a70 arm64: dts: rockchip: rk3568-pinctrl: separate cam pins as two groups for using independently
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ib4bc4ebcfc9aa42aad96aae6229b0a761e3efd90
2020-12-24 17:13:59 +08:00
Allon Huang
61428a76bf arm64: dts: rockchip: rk3568: Temporarily add csi_dphy1
To support split mode.

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I15f986c680901d7519ebdbeca1aab7fe552f5e96
2020-12-24 17:11:01 +08:00
Allon Huang
2f31e5fcc3 media: i2c: ov02k10: support rk3566 evb1
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I46bbef1506bc8ecb8eb288582d88093b5b6f9589
2020-12-24 16:27:59 +08:00
Allon Huang
15594c3311 media: i2c: gc5025: support rk3566 evb1
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ib1e89ae63756660651803180b53c6fb2827857d4
2020-12-24 16:27:37 +08:00
Allon Huang
9cb5128ee0 phy: rockchip: mipi-rx: support rk3568 mipi dphy rx
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I47dd414b518f8b79f60c36fe47223cc636ed774d
2020-12-24 16:15:39 +08:00
Jason Song
1a4a5312b2 arm64: dts: rockchip: rk3566-rk817-tablet-rkg11: update dts file.
fix hp speaker camera sleep lcd config.

Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: I2cbf73f3d39b3416989bd68ccec8d35fbb4fe188
2020-12-24 16:10:52 +08:00
Jason Song
0c18a2d9d1 input: touchscreen: focaltech: fix bootup and suspend i2c transfer error
Lcd and touch use same power, so we must open uboot logo, turn on power
before touch init. When device enter suspend, power will be hold until
touch suspend.

Signed-off-by: Jason Song <sxj@rock-chips.com>
Change-Id: Ifae24073e982bec9d8cd1f1150c2e18c395930e4
2020-12-24 16:10:37 +08:00
Wu Liangqing
f33ac42bfe arm64: dts: rockchip: enable dsi uboot logo display for rk356x evb
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
Change-Id: Iac2bc0eef65262798dd3c6b61ffc9711bee58597
2020-12-24 14:59:26 +08:00
Sandy Huang
187e0965d1 arm64: dts: rockchip: rk356x: move uboot logo config position
Change-Id: Icf43c0bbb8da3c8e20406557ef9d2d5f5025af47
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-12-24 14:57:12 +08:00
Cai YiWei
8d5c287ddb media: rockchip: isp/ispp to version v1.3.0
Change-Id: I27d24dcdea7eeefba4287ffa71c7ca509fd2e194
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-24 11:48:51 +08:00
Ding Wei
909b0f0559 video: rockchip: mpp: rkvdec2: add perf sel val
Tips: The sel val read via VAL0_BASE VAL1_BASE VAL2_BASE.

Change-Id: Ida4eee44f4e4cd6a51ca81eeb28e39091433edf2
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-12-24 11:43:16 +08:00
Cai YiWei
0be314b390 media: rockchip: isp: config dmatx to valid buf addr
Change-Id: I6e74e3a8e7d298c5620f6e4fab47c615f0b6b30c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-12-24 10:10:08 +08:00
Yiqing Zeng
1290aeebda media: i2c: sc200ai: fix set hflip/vflip failed bug
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I07f140b403076063f91b3b8fb976363ab689aa0b
2020-12-24 09:26:51 +08:00
Finley Xiao
279021a5f1 arm64: configs: rockchip_linux_defconfig: enable CONFIG_COMMON_CLK_SCMI
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4d142133125a1ebafe4f946afc5b3f239d97ab70
2020-12-23 20:36:29 +08:00
Finley Xiao
059ef88dd2 arm64: configs: rockchip_linux_defconfig: enable CONFIG_ARM_SCMI_PROTOCOL
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I89f736d105ac4119d26e243f66e31711de5b6adf
2020-12-23 20:36:23 +08:00