Commit Graph

859252 Commits

Author SHA1 Message Date
XiaoDong Huang
35ff20973c ARM: dts: rv1126: disable soc-bus11
Change-Id: I4e0fd38ca3b20c48834a9f679a1922054a97fff5
Signed-off-by: XiaoDong Huang <derrick.huang@rock-chips.com>
2020-10-14 15:11:25 +08:00
Yao Xiao
ef0479c9ed net: rockchip_wlan: ap6xxx: support keepalive during host shutdown
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Icf524f45da79a73134dc46e64f08a23fcab908cf
2020-10-14 14:14:41 +08:00
Weiwen Chen
d5467b9bdc ARM: dts: rockchip: rv1126: reboot-mode: add panic and watchdog
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I1068bf4cd7ac33073655cc9dfdd56d88bd5a900a
2020-10-14 14:12:02 +08:00
Wang Jie
5928c52b49 phy: phy-rockchip-usb: support to force otg mode for rk3288 soc
usage:
(1) force host mode
    echo 1 > /sys/devices/platform/ff770000.syscon/ff770000.syscon:usbphy/phy/phy-ff770000.syscon:usbphy.2/otg_mode

(2) force device mode
    echo 2 > /sys/devices/platform/ff770000.syscon/ff770000.syscon:usbphy/phy/phy-ff770000.syscon:usbphy.2/otg_mode

Signed-off-by: Wang Jie <dave.wang@rock-chips.com>
Signed-off-by: William Wu <william.wu@rock-chips.com>
Change-Id: I44fa1461076e6c0cd8aba1e2e444004cfb3f5271
2020-10-14 09:54:14 +08:00
Yiqing Zeng
a9b8a1ef99 media: i2c: imx335 add hdr_mode in enum frame interval
Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I0e5b73a7ad167d270729b484a7203a20ddfe493d
2020-10-14 09:53:05 +08:00
Yiqing Zeng
ecf8977f0b media: i2c: imx334 parse mclk pinctrl or the mclk will be unavailable
and add set flip ctrl

Signed-off-by: Yiqing Zeng <zack.zeng@rock-chips.com>
Change-Id: I2c355c87ab7fe1e7e8f747e58efe499998e89c34
2020-10-14 09:52:16 +08:00
Li Huang
6100664ca6 video: rockchip: rga2: Update device
1. Modify format enum.
2. Add YUYV input feature.
3. Add NN quantize feature.
4. Add Y4 && YUV400 output feature.

Change-Id: I5ae0d09e5fadf9875cae7ed001d12bd2ba17ce23
Signed-off-by: Li Huang <putin.li@rock-chips.com>
2020-10-14 09:19:40 +08:00
Shawn Lin
5549e7e816 mmc: sdhci-of-dwcmshc: add hs400es support
Add dwcmshc specific hs400 enhanced strobe support.

Change-Id: I028b02608a1507b2b5f0444a1ef8342c4d4227f5
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-13 17:55:12 +08:00
Jisheng Zhang
221b4120e3 UPSTREAM: mmc: sdhci-of-dwcmshc: add suspend/resume support
Add dwcmshc specific system-level suspend and resume support.

Change-Id: I5fa4a9d9a5b6ed9752f544361fd18fe23001297f
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/20200515141926.52e088fe@xhacker.debian
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit bccce2ec77)
2020-10-13 17:55:12 +08:00
Jisheng Zhang
08a0674b60 UPSTREAM: mmc: sdhci-of-dwcmshc: implement specific set_uhs_signaling
We need a different set_uhs_signaling implementation for
MMC_TIMING_MMC_HS and MMC_TIMING_MMC_HS400.

Change-Id: I8fd38a73a9fea7fefb12d7e741dc66df09f15b06
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Link: https://lore.kernel.org/r/20200513182602.3636a551@xhacker.debian
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 554232e8d5)
2020-10-13 17:55:12 +08:00
Jisheng Zhang
bba47f4b54 UPSTREAM: mmc: sdhci: introduce adma_write_desc() hook to struct sdhci_ops
Add this hook so that it can be overridden with driver specific
implementations. We also let the original sdhci_adma_write_desc()
accept &desc so that the function can set its new value. Then export
the function so that it could be reused by driver's specific
implementations.

Change-Id: I7facf3341a12e6af96d2436e6e568b76bfa3f8c2
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit 54552e4948)
2020-10-13 17:55:12 +08:00
Jisheng Zhang
8957c12559 UPSTREAM: mmc: sdhci: add adma_table_cnt member to struct sdhci_host
This patch adds adma_table_cnt member to struct sdhci_host to give more
flexibility to drivers to control the ADMA table count.

Default value of adma_table_cnt is set to (SDHCI_MAX_SEGS * 2 + 1).

Change-Id: I595b4c3fa32730cb9fbc386f6730dff7580cd899
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit e93be38af1)
2020-10-13 17:55:12 +08:00
Jisheng Zhang
cf8b582dd9 UPSTREAM: mmc: sdhci-of-dwcmshc: solve 128MB DMA boundary limitation
When using DMA, if the DMA addr spans 128MB boundary, we have to split
the DMA transfer into two so that each one doesn't exceed the boundary.

Change-Id: Ie3a283dd146eb54685325ded8d47cac36cb68507
Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com>
Acked-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
(cherry picked from commit b85c997d2c)
2020-10-13 17:55:12 +08:00
Allon Huang
aea8f3a598 media: i2c: imx415: add quick stream on function
Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: Ia277224a25214263564b9bc21ada83c76f021d8d
2020-10-13 17:34:31 +08:00
Allon Huang
bc1e164017 media: rockchip: cif: add reset watchdog
Add mechanism to resume when frame end is stopped unexpected.
It is cru reset, and set by menuconfig, continue mode is default.

Signed-off-by: Allon Huang <allon.huang@rock-chips.com>
Change-Id: I9273ea655da9f6e2d9318029bfba980838c4f5dd
2020-10-13 17:21:32 +08:00
Shawn Lin
570c27831f PCI: rockchip: dw: disable CPL order ruler for RC
Change-Id: I154b2e4b0327dc7e35f3d497f353bd03cb2b00f3
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2020-10-13 14:40:35 +08:00
Finley Xiao
609e3bf53b ARM: dts: rockchip: rv1126: Enable 934MHz for npu
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I54701611b1f1d3781bcae2eb95a68c82558f7c85
2020-10-13 14:11:27 +08:00
Yifeng Zhao
2de6a66ea8 arm64: dts: rockchip: add nandc node for RK356X
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
Change-Id: I7fb512eb1c1a281c4d891f73380e05ae1ca73b5a
2020-10-13 12:16:30 +08:00
William Wu
83c7532f4f usb: gadget: f_uvc: support uvc and adb use independently
If we use usb gadget as uvc and adb composite function,
the adb will be disconnected if the uvc camera apk is
closed. I can reproduce this issue by the following steps
on rk3399/rk3288 platforms.

1. Set usb gadget as uvc and adb composite function,
   and open uvc camera apk on rk3399/rk3288 platforms.
2. Connect usb to PC, and use adb shell;
3. Close the uvc camera apk;

And then, the adb will also be disconnected. It's because
that when close the uvc camera apk, the userspace calls
v4l2_release -> uvc_v4l2_release -> uvc_function_disconnect
-> usb_gadget_deactivate -> usb_gadget_disconnect ->
pullup(gadget, 0), this cause usb controller disconnect the
usb connection.

This patch adds a uvc_enabled flag to indicate that usb
is connected, don't call pullup(gadget, 0) to disconnet
usb if we only close uvc camera apk but not plug out usb
cable.

Change-Id: I0cc5ce8a24e8e06e0dc9215dfd1b92ef702e4311
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-10-12 15:19:38 +08:00
Elaine Zhang
5522e03af8 clk: rockchip: rv1126: mux clocks to none-cpll/hpll
There is a lower power dissipation requirement for some products, like
battery ipc, bell, etc... We have to gate cpll/hpll to reduce power
dissipation.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I48fae621c980b6f7f7d8e8ca71171febd6c6a9a8
2020-10-12 12:02:26 +08:00
Shunqing Chen
36334401fd drm/bridge: synopsys: dw-hdmi: enable clock termination
Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I4927349acfdd94e0dd7b332bbad73defb9ca4f67
2020-10-12 11:53:59 +08:00
Ziyuan Xu
e59af08e39 ARM: configs: rv1126-battery.config: disable usb_o/ehci for low power
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Id3d4281ec30c9508c82c67dd9e68190a77941bee
2020-10-12 11:33:11 +08:00
Ziyuan Xu
4369eeb724 ARM: configs: rv1126-battery.config: enable ROCKCHIP_LOW_PERFORMANCE
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I991f7564aa3859d0063a3f9d5be46299441d8aef
2020-10-12 11:33:03 +08:00
Ziyuan Xu
584d6819a6 soc: rockchip: Add ROCKCHIP_LOW_PERFORMANCE config
This option make the SoC low power.
Default n.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I89254b09c3e0c1c1a6c7020791a440c554a95ca4
2020-10-12 11:32:52 +08:00
Elaine Zhang
ac723caa42 clk: rockchip: rk3568: Replace RKNN with NPU
Update the TRM.

Change-Id: I0fb48df339d2a2350d0e6e2efc5128be0f90a97a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-10-12 10:35:56 +08:00
Tao Huang
0c17cc5fc3 Merge tag 'ASB-2020-10-05_4.19-stable' of https://android.googlesource.com/kernel/common
https://source.android.com/security/bulletin/2020-10-01
Fix for CVE-2020-0423 not yet public.

* tag 'ASB-2020-10-05_4.19-stable': (518 commits)
  ANDROID: use arm-linux-androidkernel- for CROSS_COMPILE_COMPAT
  ANDROID: build.config.common: enable LLVM=1
  Linux 4.19.149
  KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch
  ata: sata_mv, avoid trigerrable BUG_ON
  ata: make qc_prep return ata_completion_errors
  ata: define AC_ERR_OK
  kprobes: Fix compiler warning for !CONFIG_KPROBES_ON_FTRACE
  s390/zcrypt: Fix ZCRYPT_PERDEV_REQCNT ioctl
  mm, THP, swap: fix allocating cluster for swapfile by mistake
  kprobes: Fix to check probe enabled before disarm_kprobe_ftrace()
  s390/dasd: Fix zero write for FBA devices
  tracing: fix double free
  KVM: SVM: Add a dedicated INVD intercept routine
  KVM: x86: Reset MMU context if guest toggles CR4.SMAP or CR4.PKE
  MIPS: Add the missing 'CPU_1074K' into __get_cpu_type()
  regmap: fix page selection for noinc reads
  ALSA: asihpi: fix iounmap in error handler
  bpf: Fix a rcu warning for bpffs map pretty-print
  batman-adv: mcast: fix duplicate mcast packets from BLA backbone to mesh
  ...

Change-Id: I5af52b9921cfd8b55aba5b7705a8bc1a4f88db74

Conflicts:
	drivers/tty/serial/8250/8250_port.c
	drivers/usb/core/message.c
	drivers/usb/core/quirks.c
2020-10-10 18:38:14 +08:00
Finley Xiao
63204abfce arm64: dts: rockchip: rk3568: Add qos device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I2a5b04f6027e11c1607b94bbe7505aef96b28542
2020-10-10 18:28:23 +08:00
Finley Xiao
eaaea7d366 arm64: dts: rockchip: rk3568: Add pmu device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I719eedaf6fddc32ca14cd59757241271c38d8f58
2020-10-10 18:28:23 +08:00
Shunqing Chen
a7d0b4290f power: rk817-battery: fix dsoc jumps after resume
The units of gap_soc and sleep_soc are different.

Signed-off-by: Shunqing Chen <csq@rock-chips.com>
Change-Id: I42873f1dd4ce0543aa1e89dd91131a5c1fbfa23b
2020-10-10 18:23:04 +08:00
Ding Wei
ab0a33650a ARM: dts: rockchip: rv1126: rkvenc rates match with opp_table
Change-Id: Ic8eaaa017e121536fbdcc302a0a9631e0fca961b
Signed-off-by: Ding Wei <leo.ding@rock-chips.com>
2020-10-10 17:45:51 +08:00
Shunqian Zheng
8e2845b7a9 media: i2c: Add jx_f37 driver
The jx_f37 driver is one lane and supports 2frame HDR,
the gain of short and long frame shall be the same.

Change-Id: Ic92dd76096a4467226522c15dd179c9983fc5c93
Signed-off-by: Shunqian Zheng <zhengsq@rock-chips.com>
2020-10-10 17:07:23 +08:00
Weiwen Chen
bd5f5c8282 ARM: dts: rv1109: add 38x38 v10 emmc support imx307
This board is the same as rv1126-38x38-v10-emmc.dts,
except camera sensor.

Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: Ib5e368b354b1cd04387db51e038cbc4f539ebf3e
2020-10-10 16:53:02 +08:00
Xing Zheng
92e8d9a625 ASoC: rk3308_codec: increase more delay and fix noise once in a while
To reset Codec and DAC Digital need to wait they are stable.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: Iafa48e1d16cd4749749969a07f49250b54dd4fd1
2020-10-10 16:50:16 +08:00
Xing Zheng
9e1de0748b ASoC: rk3308_codec: fix the hidden ADC MIC PGA Gains
When we name 'Volume' for TLV, the 'Volume' will be ignored
and there are some confilcts name 'ADC MIC Group X Left/Right'.
Therefore, using 'Gain' instead of 'Volume'.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I5380cdd376dbd69ae50bee7b164a01f954df53f9
2020-10-10 16:50:10 +08:00
Mark Huang
ba0047478c ARM: dts: rv1126-ai-cam: enable monitor to restart if abnormal for ispp
Change-Id: I3956e1f2988de0f13926650b1bfd299d83483bdb
Signed-off-by: Mark Huang <huangjc@rock-chips.com>
2020-10-10 16:48:48 +08:00
Hu Kejun
119e987764 media: rockchip: isp and ispp version to v0.1.8
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I37df627f420949b7a020fa35795979f098908dd8
2020-10-10 16:48:17 +08:00
Hu Kejun
0611b7575a media: i2c: gt9760s: support set dlc/t_src/mclk by dts
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I2e71d559b9f6796c68ce170848589a1db85bad9d
2020-10-10 16:47:44 +08:00
Steven Liu
045dc61b0d arm64: dts: rockchip: modify uart and pwm dtsi for RK3568.
Modify uart and pwm dtsi for RK3568 according to RK3568 TRM.

Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: Ia29916d2c63e1f92c9a6f4e30e0f8d3124895a81
2020-10-10 16:15:04 +08:00
Liang Chen
fd8173d58e arm64: dts: rockchip: add RK3568 evaluation board devicetree
Add some board files for RK3568 SoCs, rk3568-evb1-ddr4-v10-linux is
for Linux Platform, others for Android Platform.

Change-Id: I632a8504e13c4069b17c2282af702ab44dec72db
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-10-10 14:23:07 +08:00
Hu Kejun
c3b44b185e media: i2c: gt9760s: add ioctl to set vcm config
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I8c4c8746ff5ddd69c4953d41f24498fec90125ad
2020-10-10 14:19:12 +08:00
Hu Kejun
3adf8acd1f media: i2c: vcm: add ioctl for iris/zoom
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Ib00e28f01aa68f4463cc15c7268393f515e37efb
2020-10-10 14:19:12 +08:00
Ziyuan Xu
5b586c6dcc ARM: configs: rv1126-battery.config: enable leds_pwm and heartbeat trigger
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I672c2b8b9955f0d2afe8bea44b65a54a7bba1aae
2020-10-10 14:11:05 +08:00
Ziyuan Xu
b0c94bdffb ARM: dts: rv1126-bat-ipc-v10: enable pwm-leds for state-aware
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ibcbeeba727085c91f85b189bfb8cbdbe15982e8a
2020-10-10 14:10:41 +08:00
Ziyuan Xu
919304ff8e ARM: configs: rv1126-battery.config: use sc210iot only
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I5f3ebb0ba87fcfa2ea922ae0222986ba2ebaa50a
2020-10-10 14:10:06 +08:00
Ziyuan Xu
79efb02c7d ARM: dts: rv1126-bat-ipc-v10: prefer use sc210iot for low power
Test scenario:
1080p rtsp (only video) preview
ov2718: 999.7mw
sc210iot: 793.5mw

The sc210iot is lower power dissipation about 206mw than ov2718.

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ib743f9ca85ea911385f90620431e8592b0c70444
2020-10-10 14:09:24 +08:00
Jon Lin
2542a9a36c drivers: rkflash: Fix last data block vpn has been modify issue
Change-Id: Ief1b572d6f1321b9dcdd6d8eae31ff21e2e2f57f
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2020-10-10 09:30:50 +08:00
Xing Zheng
1e5032696c ARM: dts: rv1126-bat-ipc-v10: add some optional properties
Keep 0dB for adc/dac volume, 6(18dB) for adc-pga-gain,
and using hardware loopback which is dac_l+adc_r.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I713e25984cfe20f3e50d14d381a6825e48d5296b
2020-10-10 09:12:47 +08:00
Xing Zheng
7a2a6a332d ASoC: es8311: add handling the optional property 'adc-pga-gain'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I2da3f8f0bc310fc2c25517633f1803e9f9482a16
2020-10-10 09:12:20 +08:00
Xing Zheng
e14240a31a dt-bindings: sound: es8311: add the optional property 'adc-pga-gain'
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Change-Id: I59c283d5d3ddb359fa4828a53caf7e21670f19db
2020-10-10 09:12:03 +08:00
Ziyuan Xu
f8d1a6ca51 ARM: configs: rv1126-battery.config: enable sound feature
They have a minuscule impact on boot time, codec and simple-card spend a
lot of time as far as we know.

Tested on rv1126-battery-v10 board:
[   17.492609 ] probe of 4-0018 returned 1 after 2116 usecs
[   17.492915 ] initcall es8311_i2c_driver_init+0x0/0x1000 [snd_soc_es8311] returned 0 after 2405 usecs
[   17.510095 ] asoc-simple-card i2s0-sound: ES8311 HiFi <-> ff800000.i2s mapping ok
[   17.512578 ] probe of i2s0-sound returned 1 after 20870 usecs

Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: Ie25e9dde2cd87616cb4777b4ceeebc1083678d42
2020-10-10 09:11:48 +08:00