Commit graph

860,406 commits

Author SHA1 Message Date
Jianqun Xu
ffbfbb30d8 pinctrl: rockchip: rk3568 GPIO0_D3/4/5/6 pull up value 2b'11
For GPIO0_D3/4/5/6 in RK3568 SoCs, the pull setting special:
2'b00: Z(Normal operation);
2'b01: Z(Normal operation);
2'b10: Weak 0(pull-down);
2'b11: Weak 1(pull-up);

Change-Id: I7216063aa393104495d39436a84b9ccd1eedf466
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-21 11:31:08 +08:00
Elaine Zhang
79fb532528 clk: rockchip: rk3568: support clk core select pvtpll
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Iab0e6a22cc0255675d5f3fcaf0c3887e75764679
2020-11-21 11:29:56 +08:00
Sandy Huang
a772a3b7c3 drm/rockchip: rgb: add more bus format support
Change-Id: I38a110796bf13c42da9c212e9cdcb933ca0e4238
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-20 19:57:06 +08:00
Sandy Huang
305262a848 drm/rockchip: vop: add more bus format support
Change-Id: Ia31b795742582e861d73eda1bcf9bac064cc74a1
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-20 19:56:52 +08:00
Sandy Huang
ee243fd36e drm/rockchip: vop2: Fix some bt656 bt1120 config error
Change-Id: I89d18e31b2932eb78d4c4314414b9adf4a6dd4a6
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
2020-11-20 19:56:37 +08:00
Weixin Zhou
f34b86e924 arm64: dts: rockchip: add RK3566 tablet k108 board
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I4c51186c1cd03967e6d856c6733e4cc85010c47a
2020-11-20 19:07:21 +08:00
Simon Xue
be2e272c83 PCI: rockchip: fix crash due to CONFIG_ROCKCHIP_PCIE_DMA_OBJ disabled
Change-Id: I0d3cd35150276e353fd06e4fa481b71a125f533c
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-11-20 18:10:10 +08:00
Weixin Zhou
5bd3725c9a arm64: dts: rockchip: rk3568-evb6-ddr3-v10: add mxc6655xa
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
Change-Id: I9d0039fe8b9b0648d346e5fa0edf904257248722
2020-11-20 18:06:09 +08:00
Wyon Bi
962c917b1d drm/rockchip: analogix_dp: Add audio support
Change-Id: Ib611037f497a0758bd2b6a312155562a719fe15f
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
2020-11-20 18:06:09 +08:00
Zorro Liu
17e3503627 include: rk_vendor_storage: add EINK_VCOM_ID
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
Change-Id: Iead6e262505c2eb261ca950b3990c3a8f72017af
2020-11-20 14:34:04 +08:00
David Wu
fe5bc84edd include: linux: soc: rockchip: Add rgmii delayline id
Add rgmii delayline id, which we can store and read delayline
of rgmii at vendor storage.

Change-Id: If97a76d706136bb43432688237980e9760b1b5f0
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-20 14:12:55 +08:00
Cai YiWei
b983df193e media: rockchip: isp: fix frame id error for isp21
Change-Id: I072e94b868c77e966dca0f31ce2653b672d63053
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
2020-11-20 11:24:12 +08:00
Yao Xiao
41c28fac5b net: rockchip_wlan: update bcmdhd_indep_power to "1.579.77.41.26(r-20200429-2.3)(20201113-3)"
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Icd686dae1fc089838dd03d721ad7b4fca41aa429
2020-11-20 11:22:51 +08:00
Elaine Zhang
4dc2fc0ea9 clk: rockchip: rk3568: remove CLK_SET_RATE_PARENT for mac rgmii and rmii clk
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Idaab69bc7c536be77ec6a3963268ae56b70c3d8d
2020-11-20 10:47:11 +08:00
Sugar Zhang
192c2fd5c5 arm64: dts: rockchip: rk3566-evb1-ddr4-v10: Remove unused property for i2s3
Change-Id: Ic4482f337e22b7ee633212c3008cac3373fb5423
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-20 10:06:01 +08:00
Sugar Zhang
69fd5f5410 ASoC: codecs: rk_codec_digital: Fix digital gain for ADC/DAC
Change-Id: Id39ab0485c33aead08c8f143fd092902d2c46886
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-20 10:06:01 +08:00
Sugar Zhang
3def46f561 ASoC: codecs: rk_codec_digital: Add support for clk sync mode
Change-Id: I24e50934aaf5492e7a63d30154fb258eb91cd2c3
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-20 10:06:01 +08:00
Sugar Zhang
825b8145ab dt-bindings: sound: rockchip: codec-digital: Add property for clk sync mode
Change-Id: I1e92d6066858ced9f57c96537a541a4852fa01d5
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
2020-11-20 10:06:01 +08:00
Yao Xiao
e518cf292b net: rockchip_wlan: rtl8188eu: update to v5.7.6.1_36803.20200602
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I518890ee72c5c9827947c5ed6b20f56de298ed18
2020-11-20 10:04:00 +08:00
Elaine Zhang
ff85829e05 arm64: dts: rockchip: rk3568: add mpll node
MPLL is the clock on the security cru, configured with 800M in security,
which can be used by GPU.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: Ie20ebda1b9976c7da60f278c3d744937a8451747
2020-11-20 09:26:07 +08:00
Liang Chen
64b3c2cf3c arm64: dts: rockchip: rk3568: adjust opp-table for cpu/gpu
Change-Id: Ie54aa9eff85219d3edc785e0d7269e4f933f2333
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-11-19 20:56:02 +08:00
William Wu
2495fa0c05 arm64: dts: rockchip: fix usb nodes for rk356x boards
This patch adds phy property for usb on various rk356x boards.
3566 EVB1 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB2 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST + 2 x USB2.0 HOST
3566 EVB3 1 x USB2.0 OTG(Micro USB2.0) + 1 x USB3.0 HOST(mux with SATA, default for SATA) + 2 x USB2.0 HOST
3568 EVB1 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 1 x USB3.0 HOST + 2 x USB2.0 HOST
3568 EVB6 1 x USB3.0 OTG(Type-A USB3.0 + Micro USB2.0)+ 3 x USB2.0 HOST

Change-Id: If1e2cdb03e50e770337648f59f0375034b7062cd
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 20:50:25 +08:00
Andy Yan
87e3158384 drm/rockchip: vop2: put pm_runtime in vop2_disable
Only put pm_runtime when all crtc(video_port) disabled.

Change-Id: I38a41d8fda454081a5104ed5baea520a8498554a
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-19 20:50:02 +08:00
Heiko Stuebner
679e5ec1ca UPSTREAM: iio: adc: rockchip_saradc: move all of probe to devm-functions
Parts of the saradc probe rely on devm functions and later parts do not.
This makes it more difficult to for example enable triggers via their
devm-functions and would need more undo-work in remove.

So to make life easier for the driver, move the rest of probe calls
also to their devm-equivalents.

This includes moving the clk- and regulator-disabling to a devm_action
so that they gets disabled both during remove and in the error case
in probe, after the action is registered.

Change-Id: Icfab5091b6a988ed5a684fe800ff1cf8fa179a89
Signed-off-by: Heiko Stuebner <heiko.stuebner@theobroma-systems.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit d0389d4ed3)
2020-11-19 20:49:11 +08:00
Elaine Zhang
ec6c715c55 clk: rockchip: rk3568: add pre_muxs and post_muxs config parameters
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I961a0763795dad5a1c29d711e83ae5ae6963947a
2020-11-19 20:47:58 +08:00
Elaine Zhang
655309b7b3 clk: rockchip: clk-cpu: add mux setting for cpu change frequency
In order to improve the main frequency of CPU, the clock path of CPU is
simplified as follows:
                         |--\
                         |   \            |--\
 --apll--|\              |    \           |   \
         | |--apll_core--|     \          |    \
 --24M---|/              |mux1 |--[gate]--|mux2|---clk_core
                         |     /          |    /
 --gpll--|\              |    /    |------|   /
         | |--gpll_core--|   /     |      |--/
 --24M---|/              |--/      |
                                   |
 -------apll_directly--------------|

When the CPU requests high frequency, we want to use MUX2 select the
"apll_directly".
At low frequencies use MUX1 to select “apll_core" and then MUX2 to
select "apll_core_gate".

However, in this way, the CPU frequency conversion needs to be
in the following order:
1. MUX2 select to "apll_core_gate", MUX1 select "gpll_core"
2. Apll sets slow_mode, sets APLL parameters, locks APLL, and then APLL
sets normal_mode
3. MUX1 select "apll_core", MUX2 select "apll_directly"

So add pre_muxs and post_muxs to cover this special requirements.

Change-Id: I944c22f774f5f9c4edaf28099b6c2926076d4749
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-19 20:47:58 +08:00
Guochun Huang
11846b45bd regulator: DIO5632: add regulator driver for DIO5632
The DIO5632 is designed to support general positive/negative driven
applications. The DIO5632 is primarily intended to supplying TFT LCD
displays, can be used for any application that requires positive and
negative supplies, ranging from ±4V to ±6V and current up to 80mA.

DIO5632 regulator driver supports to enable/disable and set voltage
on its output.

Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
Change-Id: I0746197fff9368e6c42cb6777a658ea0900e25bd
2020-11-19 18:59:38 +08:00
Steven Liu
5b7e5c66f7 arm64: dts: rockchip: rk3568-evb1-ddr4-v10: add pwm7 ir mode
Signed-off-by: Steven Liu <steven.liu@rock-chips.com>
Change-Id: I8f7cb733688feb54b63b33c36ba27c10a2ff1f01
2020-11-19 18:23:23 +08:00
Wu Liangqing
79b1a06904 arm64: dts: rockchip: rk3566-tablet: set i2c5 clock_frequency=400k
Change-Id: I3f6b60eb909e8f4a4a0e9aae2ef98a7b0fa87c18
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-19 18:11:30 +08:00
Huang zhibao
95229b1bba arm64: dts: rockchip: rk3568-nvr enable edp
Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Ibfc9b5f39aa2478742617009771fb4b4b57276ef
2020-11-19 18:03:20 +08:00
Felix Zeng
8fc4d4d9b6 arm64: dts: rockchip: rk3568-evb: Add reserved memory for rknpu
Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I65b6c68cb4d6010795f3c7c56e1fc99f9e6fdda7
2020-11-19 17:29:41 +08:00
Finley Xiao
92b14c36c7 nvmem: rockchip-otp: Add support for rk3568-otp
This adds the necessary data for handling efuse on the rk3568.

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ia74d77b68a6303223eaccdc08e882851a917f50f
2020-11-19 17:27:42 +08:00
William Wu
08ef2dd998 arm64: dts: rockchip: remove unused vcc5v0_usb node for rk3568 evbs
Change-Id: Ia12fb290e50f30738400fb55fe7731bfc4679386
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 17:22:41 +08:00
Jianqun Xu
5882cfb4ba arm64: dts: rockchip: make rk3568-iotest-ddr3-v10-linux simple
remove rk809, gpu, tsadc, io-domain

Change-Id: I48fdcb637fd27a541173d4cf8150f0bcf708902c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-11-19 17:21:53 +08:00
Yao Xiao
874f95760c ARM: dts: rockchip: rv1109-38-v10-spi-nand: support rtl8188fu
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: I033f05d115b298895e31a9ade2b17fab6f5960d0
2020-11-19 14:39:11 +08:00
Yao Xiao
e9d6367f7d net: rockchip_wlan: rtl8188fu: fix count to 1024 for v5.7.4.2_36687.20200814
Fixes: ac460ece42 ("net: rockchip_wlan: rtl8188fu: update to v5.7.4.2_36687.20200814")
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Ibc6d34e82e46212554a96355bfc0503a7788795a
2020-11-19 14:38:20 +08:00
Felix Zeng
04c859872b arm64: dts: rockchip: rk3568: Add rknpu relative node
nodes: rknpu, rknpu_mmu

Signed-off-by: Felix Zeng <felix.zeng@rock-chips.com>
Change-Id: I67546225cb55b6248ed314911ecb6015f8c84d22
2020-11-19 14:32:36 +08:00
Finley Xiao
b76b1e139b soc: rockchip: opp_select: Fix getting leakage twice for V1
Fixes: 3aa3abee3e ("soc: rockchip: opp_select: Add support to get leakage for rv1126")

Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: Ic0eaafeeea982d023aa20ae118144d32ac517e59
2020-11-19 14:30:52 +08:00
Finley Xiao
e8c0448b69 arm64: dts: rockchip: rk3568: Add otp device node
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Change-Id: I4ec51ba8d4e1381f787c0137cb475a21e546789d
2020-11-19 14:29:22 +08:00
William Wu
da93f3c37a phy: rockchip: naneng-combphy: enable adaptive CTLE for RK3568 USB3.0
This patch enable the adaptive Continuous Time Linear Equalizer (CTLE)
for RK3568 USB3.0 to improve compatibility.

Change-Id: I04d3077e37f15a8d41df875b8d84dc7e6c8aeda9
Signed-off-by: William Wu <william.wu@rock-chips.com>
2020-11-19 14:20:53 +08:00
Hu Kejun
cf3e8dd205 media: rockchip: isp: add get awb data from ddr function
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I0b71055c68dae5719582e9c0778a49400ca40e75
2020-11-19 11:02:59 +08:00
Hu Kejun
a76b1cedd0 media: rockchip: isp: fix can not get correct awb rawdata
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I8384434342fae9be4bf1d716ea212311ba4831d7
2020-11-19 11:02:59 +08:00
Hu Kejun
492a0bda8d media: rockchip: isp: fix enable function of ynr/cnr/bay3d/dhaz/adrc is not correct
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: I53669722bf274a8188635b0642ee47c46766dd60
2020-11-19 11:02:59 +08:00
Hu Kejun
28df73073b media: rockchip: isp: remove hdrtmo to fix crash when connect to yuv sensor
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
Change-Id: Idbe68174db701c76f5094b17ed312add92593cd6
2020-11-19 11:02:59 +08:00
Alex Zhao
21f1cad159 arm64: dts: rockchip: rk3568-evb6-ddr3-v10: update wifi/bt configs
Signed-off-by: Alex Zhao <zzc@rock-chips.com>
Change-Id: I6af7a3a551c9a9ca4e43c1563efd24591b26d650
2020-11-19 10:54:54 +08:00
Weiwen Chen
882f5bc13d ARM: configs: rv1126-spi-nor.config: enable isp/mpp/sound built-in
Signed-off-by: Weiwen Chen <cww@rock-chips.com>
Change-Id: I0cc9b8af989bde9a3f776c204eb96f58b3514d5a
2020-11-19 10:43:10 +08:00
Simon Xue
7190632274 PCI: rockchip: fix warning: no previous prototype for ‘rk_pcie_start_dma_rk3399’
Fixes: 0cd2eda71e ("PCI: rockchip: update udma trx logic")
Change-Id: Ib2176304657a11405bd587dc93324f5ea7a27028
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-11-19 10:17:14 +08:00
Herman Chen
6776ca9f87 video: rockchip: mpp: common: Add hardware register dump
1. Add hardware register dump function.
2. Dump irq_status on error when debug flag is set.

Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
Change-Id: Iad4f4af98756e02438d82b231b53b4eefb0bd632
2020-11-19 10:16:42 +08:00
Ren Jianing
90e983fe31 phy: rockchip: inno-usb2: add tuning function for rk3568
We turn off the differential reciver in suspend mode, which can
save about 300uA at AVCC_1V8 in suspend mode.

Signed-off-by: Ren Jianing <jianing.ren@rock-chips.com>
Change-Id: Ic9f2b931d7ee3fc687d8bb3f3e9dfe2d966c6542
2020-11-19 10:15:07 +08:00
Andy Yan
5df67251b8 drm/rockchip: vop2: Rewrite vsc_gt2/gt4 check logic
Use multiplication instead of division.
when gt4 enabled: src_h >>= 2;
when gt2 enable: src_h >>=1;

Change-Id: If47f873668f61b9a0690c665079bddfacc8429b5
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-18 21:32:31 +08:00