Commit Graph

860393 Commits

Author SHA1 Message Date
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
Ziyuan Xu
4f43c95883 soc: rockchip: sdmmc_vendor_storage: reduce wait as far as possible
Signed-off-by: Ziyuan Xu <xzy.xu@rock-chips.com>
Change-Id: I69d409e132b1bf11377e38b0e093389a7059cd6f
2020-11-18 20:10:12 +08:00
Andy Yan
1221fbb694 drm/rockchip: vop2: Add vsd_yrgb_gt2/gt4 register definition for cluster
Change-Id: I80b928191754cdb2c7d4ad2157b77bdbdcb955ad
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-18 19:54:14 +08:00
Andy Yan
18b66b881f drm/rockchip: vop2: Add color components swap
Change-Id: I124f92fadc2494311b950657bbb0176d65aff08b
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
2020-11-18 19:54:14 +08:00
Huang zhibao
abc2dfbb6e arm64: rockchip_linux_defconfig: enable CONFIG_PHY_ROCKCHIP_NANENG_EDP
Enable the eDP PHY driver used on Rockchip RK3568 SoC.

Signed-off-by: Huang zhibao <hzb@rock-chips.com>
Change-Id: Id6480ae7eb9fd82ec35fbde60b59e6a1e1483d5e
2020-11-18 19:46:14 +08:00
Yu Qiaowei
d1ce375ca1 video/rockchip: rga2: Fix errors in Y4/Y400 format.
1. Modify the calculation of Y400/Y4 buffer size.
2. Add print of result and pageCount.
3. Add Y4/Y400 string name.

Signed-off-by: Yu Qiaowei <cerf.yu@rock-chips.com>
Change-Id: Ibe26b7b900c317d28e0c4326f0c89a244a0017b0
2020-11-18 19:45:21 +08:00
Wyon Bi
cbee98b758 drm/bridge: analogix_dp: Add NULL pointer check for dp->phy
Fixes: d7ad116fb3 ("drm/rockchip: analogix_dp: Add support for rk3568")
Signed-off-by: Wyon Bi <bivvy.bi@rock-chips.com>
Change-Id: I8cef87e13dd7c03baac730523c8f4b98d1a043f2
2020-11-18 19:43:52 +08:00
David Wu
66d48911ac arm64: dts: rockchip: Change the gmac1m0 rgmii delayline for rk3568-evb6
Change-Id: I65d6122bd0a3cc5976333c844ed6fad61e0e6627
Signed-off-by: David Wu <david.wu@rock-chips.com>
2020-11-18 17:57:56 +08:00
Yao Xiao
ac460ece42 net: rockchip_wlan: rtl8188fu: update to v5.7.4.2_36687.20200814
Signed-off-by: Yao Xiao <xiaoyao@rock-chips.com>
Change-Id: Ief53844ec96dd572d5822c028cf472a12b35f173
2020-11-18 17:52:06 +08:00
Simon Xue
ce845b03c2 iio: adc: rockchip_saradc: add support for RK3568
Change-Id: I9d83351b1117eba67277cdd0a32e5d0c59ad1c7f
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-11-18 17:43:32 +08:00
Guochun Huang
09f5dd4822 drm/rockchip: dsi: make timing and lane rate more accurate
use actual pixel or dot clock in the hardware to calc the
timings and lane rate if dclk can not be applied accurately.

Change-Id: I6c0bcaca35cb945a58cc50005b23c6c772c9a082
Signed-off-by: Guochun Huang <hero.huang@rock-chips.com>
2020-11-18 17:09:05 +08:00
Elaine Zhang
afba90dde0 arm64: dts: rockchip: rk3568: support clk_32k_ioe output 32k
add xin32k dts node.
assigned-clock-parents for clk_32k_ioe.

Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
Change-Id: I63500026e32b4dfe5debe3a2aa79f111e42a5fbc
2020-11-18 16:56:47 +08:00
Simon Xue
0cd2eda71e PCI: rockchip: update udma trx logic
Move udma related config and start operation to master place and expose
as a hook, udma trx obj just call the hook.

Change-Id: If410280629eafa9d8829ac89a8cef6e931b37c3c
Signed-off-by: Simon Xue <xxm@rock-chips.com>
2020-11-18 16:49:50 +08:00
Wu Liangqing
fd5622d13c arm64: dts: rockchip: rk3566-evb3: bringup
Change-Id: I3717b8efd22e70f4d661f2c0828320760876beb0
Signed-off-by: Wu Liangqing <wlq@rock-chips.com>
2020-11-18 16:17:36 +08:00