Commit Graph

860151 Commits

Author SHA1 Message Date
Shawn Lin
1603e4ecf6 arm64: dts: rockchip: rk3568: Fix PCIe30x2 DBI and remove useless clks
Change-Id: Icae9ef5661b62abc588b3b86ddbd671772d5d5d5
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-11-11 19:22:05 +08:00
Finley Xiao
8a65d18577 arm64: dts: rockchip: rk3568: Add pvtm device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Idef95dc6d0da0cc5cbf97d1c4572d8107ee131c9
2020-11-11 15:21:19 +08:00
Finley Xiao
aec8ff24ff soc: rockchip: pvtm: Add support for RK3568 SoCs
This adds the necessary data for handling pvtm on the RK3568 SoCs.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ie4499f613d7d3ef2edb11fd6a81d70d699317caf
2020-11-11 15:21:19 +08:00
Finley Xiao
94ccb804c3 dt-bindings: rockchip-pvtm: Support the RK3568 SoC compatible
Add a new compatible for thermal founding on RK3568 SoC.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4a6db880cde95be2d18074efbdef68cb187e50a7
2020-11-11 15:21:19 +08:00
Algea Cao
cdbb863092 drm: rockchip: dw-hdmi: Enable 3568 hdmi ddc
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I9dd63de7a98cb70f9e40c7ee82bcfca5884b9232
2020-11-11 15:21:19 +08:00
Alex Zhao
87649a9e7d arm64: dts: rockchip: rk3566-evb2-lp4x-v10: fix for wifi/bt
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I2d8df2776af0c18eff33fbcf8908f89ff2a0a6a9
2020-11-11 15:21:19 +08:00
Elaine Zhang
f807c08d2b arm64: dts: rockchip: rk3568: setting npll to 1.2G when clk init
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: If088d432552d186866dd53211c5a2126870f62a4
2020-11-11 15:21:19 +08:00
Elaine Zhang
75f941d347 clk: rockchip: rk3568: mark npll as critical clock
npll is for dsu high freq.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I4fd3141e577ee0933d8eac07bd154c1d1b341edd
2020-11-11 15:21:19 +08:00
Bin Yang
5f0c2578ed usb: dwc3: core: do not use 3.0 clock when operating in 2.0 mode
In the 3.0 device core, if the core is programmed to operate in
2.0 only, then setting the GUCTL1.DEV_FORCE_20_CLK_FOR_30_CLK makes
the internal 2.0(utmi/ulpi) clock to be routed as the 3.0 (pipe)
clock. Enabling this feature allows the pipe3 clock to be not-running
when forcibly operating in 2.0 device mode.

Signed-off-by: Bin Yang <yangbin@rock-chips.com>
Change-Id: I217a380815c21903c1090bd003c1d8ba2fadbe7c
2020-11-11 12:02:01 +08:00
Shunqing Chen
7ec24c91e0 arm64: dts: rockchip: rk3568: add phy reference clk for hdmi
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: Ie581092df86da7b11c7b7e3651a812a3c8721ac1
2020-11-11 12:01:03 +08:00
Algea Cao
aa2d780888 drm: rockchip: dw-hdmi: Add encoder mode set
Update hdmi phy ref clock in encoder mode set.

Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: I8e1df8e3d9e4109e9beae5bdaaf82ea8cc070407
2020-11-11 11:34:58 +08:00
Algea Cao
64d5fa4ad1 drm: rockchip: dw-hdmi: Set hdmi output interface to HDMI0
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ia9c694f73c1fe9ae3bdb4d8774658dca566ef6c2
2020-11-11 11:34:44 +08:00
Shunqing Chen
f8d70ba267 drm: rockchip: dw-hdmi: rename vpll_clk to accommodate more platforms
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I6d5aaacc241add2bbd20f2e16f2b4ae798e1db6a
2020-11-11 11:34:19 +08:00
Alex Zhao
209bad83d1 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: fix for wifi/bt
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I5beeb417f237e9cf306aa75743e02dc529690aa5
2020-11-11 11:28:04 +08:00
Guochun Huang
14586d46dd arm64: dts: rockchip: rk3568-evb: add dsi1
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I83b937aab46a9e4f28fb3540506dfb2305572e85
2020-11-11 11:21:57 +08:00
William Wu
62f5258931 phy: rockchip: naneng-combphy: fix mode set for usb3
This patch select pipe_txcompliance and pipe_l0_txelecidle
from usb3 controller for usb3 mode.

Change-Id: I6d354a974e431079e0f11fe84b75df583125818b
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-11 10:51:31 +08:00
William Wu
c90049e2ed arm64: dts: rockchip: rk3566-evb1-ddr4-v10: enable combphy1 for usb3 host
Change-Id: I6d76fe988714803fbab91d9a6ae4236b617dadae
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-11 10:51:31 +08:00
William Wu
762245fafd arm64: dts: rockchip: rk3568: set 24M ref clk for naneng combphy
Change-Id: Ie17a4bf16bd47e1e9fd6529873492ebcd11b5fae
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-11 10:51:30 +08:00
Zhenke Fan
847bb599e2 ARM: dts: rv1126-ai-cam.dtsi: modify link to cif by default
imx378 need to change the data lanes from <1 2> to <1 2 3 4>

Signed-off-by: Zhenke Fan <fanzy.fan@rock-chips.com>
Change-Id: Ifeb88250c7e01a4da84b67a0e77adcf0124201a9
2020-11-11 10:44:59 +08:00
Wyon Bi
09113e4c0a drm/rockchip: analogix_dp: Add member 'ssc' described in rockchip_dp_chip_data
Fixes: d7ad116fb3 ("drm/rockchip: analogix_dp: Add support for rk3568")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I42c4099e266ca8c97380c7c7021a967d7418dc88
2020-11-11 10:12:20 +08:00
Tao Huang
04f2db5f84 arm64: dts: rockchip: rk3568: Add reboot_mode label for Android
Support dtbo overlay reboot-mode for Android 10.

Fixes: f21a35d354 ("arm64: dts: rockchip: rk3568: add reboot-mode node")
Change-Id: If34ed638495374afd853ef46bbbc39b340e3de26
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2020-11-11 10:08:45 +08:00
Jon Lin
5252a54c3f arm64: dts: rockchip: rk3568-evb: Enable sfc node
Change-Id: I9551d00b000ddd20bf8c0814c2d19b045c0224b9
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-11-11 10:08:07 +08:00
David Wu
20357c5158 arm64: dts: rockchip: rk356x: Change the rgmii delayline for rk3566-evb1
Change-Id: I95ce22b63785b5caf2abad5a4fd944b79ca51e33
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:36:47 +08:00
David Wu
8da4ac44d5 arm64: dts: rockchip: rk356x: Change the rgmii delayline for rk3566-evb2
Change-Id: I712621264fcbb4118429f509cd122912a2e82f7f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:36:47 +08:00
David Wu
73552764da pinctrl: rockchip: use gmac1_rxd0 to select M0 and M1
It is better to select M0 and M1 iomux by gmac_rxd0, the
gmac_rxd0 would be used at RGMII and RMII.

Change-Id: I850dafcc8a9a826c25b9af7da3cf5b97208ea67f
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:30:39 +08:00
David Wu
8f4cd5a667 arm64: dts: rockchip: rk3568-pinctrl: Change the gmac tx pins drive strength to 15
Change-Id: Ie1eec34d7babf8aa9c8102167c4dcd43aa7d2b4e
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:28:58 +08:00
David Wu
73dc593e3d net: ethernet: stmmac: dwmac-rk: Add bus id to verify gmac0 and gmac1 for rk3568
Because there are two gmac controllers at rk3568, use
bus id to set the corresponding registers respectively.

Change-Id: Ie422e91075093bdcd2ed5ca11a7e3995aa75021a
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-11 09:28:05 +08:00
Andy Yan
0cab907042 drm/rockchip: vop2: Fix the setting of afbc stride
Change-Id: I0be42c042c5ce985fbd7d0d6216a5feb9794d7dd
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-11 09:04:08 +08:00
Jianqun Xu
361820eab0 arm64: dts: rockchip: rk3568: fix io-domain node
Change-Id: I4d7d7aff6423ac31faf5d404e77a0f034d3b9bd1
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-10 21:17:41 +08:00
Finley Xiao
1dafbf797b arm64: dts: rockchip: rk3568: Add clocks for pmu
Enable niu clocks before read qos.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ib3b39311cf105ca05f9a47a8739e591a4f311952
2020-11-10 20:42:17 +08:00
Finley Xiao
1ef89c8952 clk: rockchip: rk3568: Remove unused clk gate for gpu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I219acca63d583bf6e4245709ef9d2fac858d6f2c
2020-11-10 20:40:32 +08:00
William Wu
a7f0b9fde1 phy: rockchip: inno-usb2: fix some issues for rk3568 usb2 phy
This patch fixes the following issues for rk3568 usb2 phy.

1. Only enable the id irq and bvalid irq for the port of combphy
   which used shared interrupt and work as otg/peripheral mode.

2. Enable the DP/DM pulldown resistors for the port of combphy
   if the port is used for usb host controller.

3. Set utmi opmode to no-driving for rk3568 usb phy when usb
   phy enter suspend mode via usb phy grf. It can help to
   avoid triggering the linestate irq constantly.

Change-Id: I3efe964c79865bef8ba70047f2ee20c59901ca6c
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-10 19:47:00 +08:00
William Wu
ce960453e1 arm64: dts: rockchip: rk3568: add usb2 phy nodes for usb host controllers
Change-Id: Id62fd95c0e016ab265ee248cb9a282241ab2d271
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-10 19:47:00 +08:00
Vitaly Chikunov
72b9859e0b UPSTREAM: perf arm64: Fix mksyscalltbl when system kernel headers are ahead of the kernel
When a host system has kernel headers that are newer than a compiling
kernel, mksyscalltbl fails with errors such as:

  <stdin>: In function 'main':
  <stdin>:271:44: error: '__NR_kexec_file_load' undeclared (first use in this function)
  <stdin>:271:44: note: each undeclared identifier is reported only once for each function it appears in
  <stdin>:272:46: error: '__NR_pidfd_send_signal' undeclared (first use in this function)
  <stdin>:273:43: error: '__NR_io_uring_setup' undeclared (first use in this function)
  <stdin>:274:43: error: '__NR_io_uring_enter' undeclared (first use in this function)
  <stdin>:275:46: error: '__NR_io_uring_register' undeclared (first use in this function)
  tools/perf/arch/arm64/entry/syscalls//mksyscalltbl: line 48: /tmp/create-table-xvUQdD: Permission denied

mksyscalltbl is compiled with default host includes, but run with
compiling kernel tree includes, causing some syscall numbers to being
undeclared.

Committer testing:

Before this patch, in my cross build environment, no build problems, but
these new syscalls were not in the syscalls.c generated from the
unistd.h file, which is a bug, this patch fixes it:

perfbuilder@6e20056ed532:/git/perf$ tail /tmp/build/perf/arch/arm64/include/generated/asm/syscalls.c
	[292] = "io_pgetevents",
	[293] = "rseq",
	[294] = "kexec_file_load",
	[424] = "pidfd_send_signal",
	[425] = "io_uring_setup",
	[426] = "io_uring_enter",
	[427] = "io_uring_register",
	[428] = "syscalls",
};
perfbuilder@6e20056ed532:/git/perf$ strings /tmp/build/perf/perf | egrep '^(io_uring_|pidfd_|kexec_file)'
kexec_file_load
pidfd_send_signal
io_uring_setup
io_uring_enter
io_uring_register
perfbuilder@6e20056ed532:/git/perf$
$

Well, there is that last "syscalls" thing, but that looks like some
other bug.

Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Tested-by: Michael Petlan <mpetlan@redhat.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Hendrik Brueckner <brueckner@linux.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Kim Phillips <kim.phillips@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20190521030203.1447-1-vt@altlinux.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
(cherry picked from commit f95d050cdc)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ie5381538e0bdf1dbb1bdff04b931487f6585328b
2020-11-10 19:33:08 +08:00
Xu Hongfei
489cae173f media: rockchip: vicap: support measuring luma in normal mode
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I5e36c03f46bd3362e288e3a3332caf412afe4a7b
2020-11-10 18:49:40 +08:00
Xu Hongfei
ce801a9bb6 media: rockchip: isp: set lgmean related regs for tmo in hdr isr
Signed-off-by: Xu Hongfei <xuhf@rock-chips.com>
Change-Id: I82cb63cff85e8b137a7b765601e57a8da0f99705
2020-11-10 18:49:40 +08:00
Sugar Zhang
358f15f02d pinctrl: rockchip: rk3568: Fix iomux for pdm
Change-Id: I44789839270af762ff8ea8b408740675f873f27d
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 18:46:27 +08:00
Sugar Zhang
137ae27cb6 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Add pdm mic array
Change-Id: Ie89eca219d5b9d6cdb79588991122e86638ddcac
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 18:15:17 +08:00
Sugar Zhang
3117c0149f arm64: dts: rockchip: rk3568-evb: Add pdm mic array
Change-Id: Id80dc7aa66690b0a41a49becc449057d95e8fd98
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 18:14:59 +08:00
Andy Yan
e22963f11a arm64: dts: rockchip: rk3568-evb: Disable hdmi temporarily
Disable hdmi before it can work stable.

Change-Id: I788ed4355ef7c470e75e3243ce9edb76b459f3b7
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-10 18:03:46 +08:00
Andy Yan
a74f94e41b drm/rockchip: vop2: make clk enable/disable balance
Change-Id: I410c268bd1015d776c7a594a221944b99c312614
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-10 17:18:51 +08:00
Andy Yan
3a1af40f37 drm/rockchip: vop2: Add support for rb_swap
Swap R and B channel for format XBGR and ABGR.

Change-Id: If7787cec41abf31a9d5c1bbe6988afc8096935ad
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-10 17:18:51 +08:00
Andy Yan
973563e159 drm/rockchip: vop2: Support framebuffer dump
Enabled by config CONFIG_ROCKCHIP_DRM_DEBUG=y

Debugfs node:
sys/kernel/debug/dri/0/video_port0/vop_dump/dump
sys/kernel/debug/dri/0/video_port1/vop_dump/dump
sys/kernel/debug/dri/0/video_port2/vop_dump/dump

Change-Id: I14b466b01c136e67e8ab5ccd18270134f43938ca
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-10 17:18:51 +08:00
Caesar Wang
12098b2540 arm64/configs: rockchip_linux_defconfig: enable CONFIG_DRM_IGNORE_IOTCL_PERMIT
Allow the DRM ignore some permission issues.

Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: Ia4c80fec7fa0757f5797ee111f96c9f1d41c9277
2020-11-10 17:13:51 +08:00
Shawn Lin
f4d345feff arm64: dts: rockchip: rk3568: Improve drive strength for sdmmc IO
It comes from the result for SD3.0 test that level 5 is
suitable for this platform.

Change-Id: I95da7be6f514367799ea5e8e7c4b338fd1b1435e
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-11-10 16:44:31 +08:00
Jianqun Xu
2c286f1e6f pinctrl: rockchip: rk3568 fix drive set
Change-Id: Ie98192db0f9d1335b812de36d15d12b6e99d6961
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-10 16:43:35 +08:00
Jianqun Xu
ab165dcc26 power: rockchip-io-domain: rk3568 fix supply name
Change-Id: I67d9488cbf34727ddabdf5997d7ef038c9423a60
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-10 15:44:06 +08:00
Hans Yang
cae33dbf28 arm64: dts: rockchip: init board for rk3566-evb1-ddr4-v10-linux
Change-Id: Ie36e62c72c50b798bfdb266018df7da6b215155d
Signed-off-by: Hans Yang <yhx@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
2020-11-10 15:43:46 +08:00
Jianqun Xu
c97b33bbbd pinctrl: rockchip: rk3568 drive strength fix
Change-Id: Ifeee29a71aa1ae09e3b2ff59d7c0c05cc05b45f2
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-10 15:43:20 +08:00
Sugar Zhang
b605ea01ab arm64: dts: rockchip: rk3568-evb: Make vccio_acodec always on
Change-Id: If94ccc4ef178a8dd31a2244315caa4d67099858b
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-10 14:44:39 +08:00