Commit Graph

36 Commits

Author SHA1 Message Date
baiywt 38b0a66a10 Merge linux-5.10-gen-rkr6 2024-01-19 18:35:00 +08:00
Tao Huang 77bcbf172b arm64: dts: rockchip: bulk convert gpios to their constant counterparts (v2)
According to upstream commit d64420e816 ("arm64: dts: rockchip:
bulk convert gpios to their constant counterparts") replace
RK_FUNC_x -> x and RK_GPIOx -> x.

sed -i -e "
/rockchip,pins *=/bcheck
b # to end of script
:append-next-line
N
:check
/^[^;]*$/bappend-next-line
s/<RK_GPIO\([0-9]\) /<\1 /g
s/<\([^ ][^ ]*  *\)0 /<\1RK_PA0 /g
s/<\([^ ][^ ]*  *\)1 /<\1RK_PA1 /g
s/<\([^ ][^ ]*  *\)2 /<\1RK_PA2 /g
s/<\([^ ][^ ]*  *\)3 /<\1RK_PA3 /g
s/<\([^ ][^ ]*  *\)4 /<\1RK_PA4 /g
s/<\([^ ][^ ]*  *\)5 /<\1RK_PA5 /g
s/<\([^ ][^ ]*  *\)6 /<\1RK_PA6 /g
s/<\([^ ][^ ]*  *\)7 /<\1RK_PA7 /g
s/<\([^ ][^ ]*  *\)8 /<\1RK_PB0 /g
s/<\([^ ][^ ]*  *\)9 /<\1RK_PB1 /g
s/<\([^ ][^ ]*  *\)10 /<\1RK_PB2 /g
s/<\([^ ][^ ]*  *\)11 /<\1RK_PB3 /g
s/<\([^ ][^ ]*  *\)12 /<\1RK_PB4 /g
s/<\([^ ][^ ]*  *\)13 /<\1RK_PB5 /g
s/<\([^ ][^ ]*  *\)14 /<\1RK_PB6 /g
s/<\([^ ][^ ]*  *\)15 /<\1RK_PB7 /g
s/<\([^ ][^ ]*  *\)16 /<\1RK_PC0 /g
s/<\([^ ][^ ]*  *\)17 /<\1RK_PC1 /g
s/<\([^ ][^ ]*  *\)18 /<\1RK_PC2 /g
s/<\([^ ][^ ]*  *\)19 /<\1RK_PC3 /g
s/<\([^ ][^ ]*  *\)20 /<\1RK_PC4 /g
s/<\([^ ][^ ]*  *\)21 /<\1RK_PC5 /g
s/<\([^ ][^ ]*  *\)22 /<\1RK_PC6 /g
s/<\([^ ][^ ]*  *\)23 /<\1RK_PC7 /g
s/<\([^ ][^ ]*  *\)24 /<\1RK_PD0 /g
s/<\([^ ][^ ]*  *\)25 /<\1RK_PD1 /g
s/<\([^ ][^ ]*  *\)26 /<\1RK_PD2 /g
s/<\([^ ][^ ]*  *\)27 /<\1RK_PD3 /g
s/<\([^ ][^ ]*  *\)28 /<\1RK_PD4 /g
s/<\([^ ][^ ]*  *\)29 /<\1RK_PD5 /g
s/<\([^ ][^ ]*  *\)30 /<\1RK_PD6 /g
s/<\([^ ][^ ]*  *\)31 /<\1RK_PD7 /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)0 /<\1RK_FUNC_GPIO /g
s/<\([^ ][^ ]*  *[^ ][^ ]*  *\)RK_FUNC_\([1-9]\) /<\1\2 /g
" *.dts *.dtsi

Change-Id: I789e702620a4d0331d54474d48aaf68133795859
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2021-03-25 20:30:22 +08:00
Sugar Zhang 34d2e5f52c arm64: dts: rockchip: Add 'arm,pl330-periph-burst' for dmac
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Change-Id: Ied0b51a3cf02dc22803c1c49448baffbdce6e1aa
2020-06-05 18:47:23 +08:00
Liang Chen f35d6ee76c arm64: dts: rockchip: rk3399pro-npu: adjust npu opp-table
NPU will hang up sometimes with default opp-table:
[ 7710.595423] [galcore]: GPU[0] hang, automatic recovery.
[ 7710.600735] [galcore]: recovery done
[ 7790.723475] [galcore]: GPU[0] hang, automatic recovery.
[ 7790.728833] [galcore]: recovery done

Change-Id: I4524c2294f1c9d876d54e6cda0a1a49185dbacd8
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-02-19 10:33:52 +08:00
Liang Chen abf2fb34a5 arm64: dts: rockchip: limit vdd_npu to 0.88V for rk3399pro-npu
The recommended max voltage of vdd_npu is 0.88V in the datasheet.

Change-Id: I9713810692c5d32b8c41b0b0e0d02405c01dd0b7
Signed-off-by: Liang Chen <cl@rock-chips.com>
2020-02-19 10:33:52 +08:00
Finley Xiao b3038b79f1 soc: rockchip: ipa: Divide ts by 10
Sometimes ts3 is a floating point value, so convert it to an integer
by multipliying by 10 in devicetree.

Change-Id: I3ac6f879e75927e1e551acbfba18148c993b5d26
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-01-15 19:09:47 +08:00
Finley Xiao d27dca34b7 arm64: dts: rockchip: rk3399pro-npu: Change the parameter of power model
Change-Id: I1ea782fc399261c355f5d2e46c15c3758300c431
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-01-15 19:09:07 +08:00
Finley Xiao 7c00597a4a arm64: dts: rockchip: rk3399pro-npu: Add pvtm table for npu
Change-Id: If02d1c82fe9126ba9ff3e24f5fb2cfd35e9c7249
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-10-25 09:58:29 +08:00
Finley Xiao 1b435a5b77 arm64: dts: rockchip: rk3399pro-npu: Add pvtm node
Change-Id: Ic3044fa2491a38ae8fcb6059b3796186eb15dfe5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-10-25 09:58:19 +08:00
William Wu fdc8aea2c0 arm64: dts: rockchip: add xhci trb ent quirk for rockchip SoCs
This patch adds "snps,xhci-trb-ent-quirk" for DWC3 controllers
in RK1808/RK3328/RK3399/RK3399pro-npu.

Change-Id: I708f62747150316d66459f02b399d7c9b2667636
Signed-off-by: William Wu <william.wu@rock-chips.com>
2019-01-04 20:57:03 +08:00
David.Wu 98b799609e arm64: dts: rockchip: Add usbdrd3's compatible "rockchip,rk3399-dwc3" for rk3399pro-npu
We will use the dwc3-rockchip driver for rk3399pro-npu, this patch
is prepared for it.

Change-Id: I9c97002adbe9bd2fea01d8e209183f5211b3796c
Signed-off-by: David.Wu <david.wu@rock-chips.com>
2018-12-10 20:07:57 +08:00
Finley Xiao e6161ee602 arm64: dts: rockchip: rk3399pro-npu: Add thermal zone node
Change-Id: I211edf33d2bcd7540473c8a39d56a5a1ff844a37
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 17:10:40 +08:00
Finley Xiao baf4236132 arm64: dts: rockchip: rk3399pro-npu: Add #cooling-cells to npu node
Change-Id: Ie6fbc463db8b4fe8165af33e1540683c8424167d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 17:10:35 +08:00
Finley Xiao 11a3c81c58 arm64: dts: rockchip: rk3399pro-npu: Add power-model for npu
Change-Id: I194c0cbfafe496668775196e67d1949cb6e2fd5b
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 17:10:29 +08:00
Finley Xiao 3b05cc60d6 arm64: dts: rockchip: rk3399pro-npu: Add #cooling-cells to cpu node
Change-Id: Ib9809da5a9ea4c2af614ff42188ab0617c1a4ee8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 17:09:17 +08:00
Finley Xiao 58f6fccc04 arm64: dts: rockchip: rk3399pro-npu: Add dynamic-power-coefficient for cpu
The average value of dynamic-power-coefficient is about 74.

Change-Id: Id80521440e0cbdb677344bf5becf092e4311c499
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-29 16:58:40 +08:00
Elaine Zhang 7e53b6bd19 arm64: dts: rockchip: rk3399pro-npu: fix up the pd_pcie qos node
add usb2 and usb3 qos node,
set qos_pcie\qos_usb2\qos_usb3 status = "disabled" by default.

Change-Id: I20653cc485c4c923b3b89af8e801634f4d7447a3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-11-14 10:11:08 +08:00
Finley Xiao fddf48f50a arm64: dts: rockchip: rk3399pro-npu: Add opp table for cpu
Change-Id: Ic74db2d368b0b84ce8a2c8ed79d3084d89dc74da
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-13 14:07:15 +08:00
Finley Xiao e74aaf0711 arm64: dts: rockchip: rk3399pro-npu: Add opp table for npu
Change-Id: I5c301c2323c245300d97868b3ddfdeb27d0220cb
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-13 14:06:52 +08:00
Shawn Lin 7a68e504c1 arm64: dts: rockchip: rk3399pro-npu: Add usb_pcie_grf node for combphy driver
Change-Id: I7ebbea8cb74205fb1fda7c37fc123f2d1e10b903
Signed-off-by: Shawn Lin <shawn.lin@rock-chips.com>
2018-11-05 10:35:26 +08:00
Finley Xiao 9e447af931 arm64: dts: rockchip: rk3399pro-npu: Change tsadc clock rate to 650KHz
The clock frequency should be between 500KHz and 800KHz, 650KHz is
a typical value.

Change-Id: I8ee3d1e0204c6580d508029e6212e232527c644a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-11-02 10:53:17 +08:00
Jianqun Xu bddcbb0c46 arm64: dts: rockchip: set npu frequency to 800MHz for RK3399Pro-npu
Change-Id: I11930bb31c358ea272911e9d3d02edb08d7837f9
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-10-30 15:55:46 +08:00
Jianqun Xu 099fbe8812 arm64: dts: rockchip: rk3399pro-npu set armclk to 1200MHz
Set cpu clock to 1.2GHz and  vdd_cpu fixed to 0.85v by hardware.

Change-Id: Ib3d537a4ec4e419b36140d556771b3ba041dc24e
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-10-29 20:05:01 +08:00
Zorro Liu 7822063a0a arm64: dts: rockchip: Change the drive strength of i2c pins to 2ma for rk3399pro-npu
Change-Id: I8be4134da1e6dab1f664d9f7c4e8f79f2a80b4e0
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-29 15:48:58 +08:00
Zorro Liu f15d061eba arm64: dts: rockchip: rk3399pro-npu: modify ppll init freq to 100M
Change-Id: I43b3c95be00fe4a8fc2f1803570c75efbefb411b
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-29 15:41:53 +08:00
William Wu c04c4fe0c5 arm64: dts: rockchip: add dis-u1u2-quirk for rk3399pro-npu dwc3
Change-Id: I03bab17ad638286980d7c31311ed0399becec8bc
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 20:45:12 +08:00
William Wu 15ba079fa3 arm64: dts: rockchip: fix power domain for rk3399pro-npu dwc3
Change-Id: I699ec2589ef73b3d3afbd8c39a79e937b8bdd865
Signed-off-by: William Wu <william.wu@rock-chips.com>
2018-10-23 16:49:33 +08:00
Zorro Liu 37184f54fe arm64: dts: rockchip: add i2c0 and xin32k for rk3399pro-npu
Change-Id: I5d057e4ce7fed18dde46c0c8bd580623e1803e71
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:02:12 +08:00
Zorro Liu 9839b238e8 arm64: dts: rockchip: rk3399pro-npu: Add clocks for npu
Change-Id: If84a3592c4def1418b3a972bc5d56c33918c35d6
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:02:06 +08:00
Zorro Liu 8a25b28224 arm64: dts: rockchip: update usb3 configs for rk3399pro-npu
Change-Id: I1700402cb53c77cba9b05c2e541091be96ef146e
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-23 10:01:46 +08:00
Zorro Liu 926e96cc56 arm64: dts: rockchip: update some configs for rk3399pro-npu
- psci
- usbdrd3
- qos
- cru
- pd
...

Change-Id: I9a5292d0082b165960a97bdaa19bf947cc330e25
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-10-16 15:44:33 +08:00
Elaine Zhang 1c450a8082 clk: rockchip: rk1808: rename SCLK_GPIO to DBCLK_GPIO
Change-Id: I1ed6fe175fb2e640a7a61e1a2e799e94e76b435f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-09 14:59:04 +08:00
Zorro Liu 33f6d1bdc9 arm64: dts: rockchip: add rk3399pro npu evb board file
Change-Id: I3db38258c857c8a263bc89bea0d5cbb871227d96
Signed-off-by: Zorro Liu <lyx@rock-chips.com>
2018-09-30 14:51:21 +08:00
Jianqun Xu 0f542e8694 arm64: dts: rockchip: fix mapping address for rk3399pro-npu pmugrf
Change-Id: Ie0e11f6f2941d4730633b668c1be40b22850c359
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-28 17:04:55 +08:00
Jianqun Xu ea63667dfb ARM64: dts: rockchip: fix pmda to dmac for rk3399pro-npu
Change-Id: Icf7c9f16155d573663c643b05d013ec90563a425
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-17 19:21:23 +08:00
Jianqun Xu b2da189521 arm64: dts: rockchip: add core dts file for rk3399pro npu
Add rk3399pro_npu.dtsi for RK3399Pro-npu.
- A35 *2/ arm-pmu/ timer/ pdma/ xin24m
- grf/ pmugrf/ cru/ rktimer
- qos/ pmu
- usb3
- tsadc
- i2c0
- uart2
- pinctrl

Change-Id: I2a692826274d6c66c728716865ceb0c27e35719c
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2018-09-14 18:44:36 +08:00