Commit Graph

839515 Commits

Author SHA1 Message Date
Jerry Xu
4df60ffbd1 clk: rockchip: rk3288: remove ROCKCHIP_PLL_SYNC_RATE flag for CPLL and GPLL
Change-Id: I698437b21c94684af0a7dfbe643794de62edc962
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:54:46 +08:00
WeiYong Bi
8b51cc2a32 clk: rockchip: rk3228: add CLK_IGNORE_UNUSED flag for vio_h2p
Change-Id: Ieca7abf5d01f70db09aa0fcc77b838c106f4fc87
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:40:35 +08:00
Finley Xiao
b90ca51dd8 clk: rockchip: rk3228: fix some PLL_NUX_CLKs' gates
Some PLL_NUX_CLKs' gates is actually behind muxs according to latest TRM,
so move the gates to composite clocks and amend their parent clocks.

Change-Id: Ib6043caa61e9df0473f2d0bdc756850968bb2a55
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:40:26 +08:00
Finley Xiao
59bb611b66 clk: rockchip: rk3228: fix gpu gate-register
Fix a typo making the aclk_gpu and aclk_gpu_noc access a wrong register to
handle its gate.

Change-Id: Ie0bac8014363af7c0409b8a56eacf2e858818843
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:40:12 +08:00
WeiYong Bi
d4831e7a87 clk: rockchip: rk3228: add more flags for dclk_vop
Change-Id: Ie5838b20f419d667831e7d99f4b95856731ef0ef
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:40:02 +08:00
WeiYong Bi
0de87ca269 clk: rockchip: rk3228: export hdmiphy clock
Change-Id: Ib7acd4c2f576ad320e069ab2bd9137156062e2d9
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:39:52 +08:00
Elaine Zhang
0e5ae6bda6 clk: rockchip: rk3328: add flag CLK_IGNORE_UNUSED for hclk_vop_niu
Change-Id: I770a83ad357f18d3258755b6c1d43ef82248951e
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-08 08:39:40 +08:00
Elaine Zhang
6f2092beeb rk808: rtc: set rtc stopped by default
set rtc stopped by default, start rtc in rtc device probe.
add rtc node, whether RTC need to initialize.

Change-Id: Ifab269786f316d33149a50a18e23af1b6206d57d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:41:31 +08:00
Rocky Hao
04f65765c3 thermal: rockchip: add rk3368 support
Change-Id: I970fedca9542c724d777c0bac788300c4fa21303
Signed-off-by: Rocky Hao <rocky.hao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:41:23 +08:00
Elaine Zhang
f77ba1bd46 clk: rockchip: rk3228: Perfect clock description
1 Add some necessary clk ID.
2 some clks add CLK_IGNORE_UNUSED flag
3 add some critical clk

Change-Id: If52699b4d5f430413b06084b7d21fb1afd4539dd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:10:44 +08:00
Finley Xiao
f3ae21e5d9 clk: rockchip: rk3288: add ddrc clock support
Add a ddrc clock into clk branches, so we can do ddr frequency
scaling on rk3288 platform in future.

Change-Id: Ia6c93e5ce82fa30475eddf051bc9ea2512b0cc07
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:10:36 +08:00
Finley Xiao
f976ca76c2 clk: rockchip: Add adaptive frequency scaling for pll_rk3066
Change-Id: I9c3422a45f86e8b95be0ad069ac70d5490eb5161
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:10:26 +08:00
Elaine Zhang
ea0b81279a clk: rockchip: rk3288: fix up the clk register for hclk_vio
Change-Id: If07e27b1f88974fa0dcb2c8f719df6ba3c35dbcd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:10:15 +08:00
Sugar Zhang
fb12dc10dc clk: rockchip: rk3328: add pclk for acodec
Change-Id: Ia07f22997875e874037cb06fea6a3f25e6ab46dc
Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:10:05 +08:00
Elaine Zhang
0f847667c4 clk: rockchip: rk3368: add aclk_cci_pre ID
Change-Id: I855e79023a9e244c2db37af88a075a4ef4c36aec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:09:55 +08:00
Tang Yun ping
1dfb2c15c6 clk: rockchip: optimizing ddrclk_scpi_recalc_rate behavior
Cat ddr frequency from rockchip_ddrclk_scpi_set_rate prior to
rockchip_ddrclk_scpi_recalc_rate, to optimizing running time and reduce
SCPI APIs usage rate.

Change-Id: Iba31d33a5920816b1cc230f639ea3a9503d451c8
Signed-off-by: Tang Yun ping <typ@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:09:45 +08:00
Finley Xiao
9c8373f109 clk: rockchip: rk3368: add ddrc clock support
Add a ddrc clock into clk branches, so we can do ddr frequency
scaling on rk3368 platform in future.

Change-Id: Ie7fd2e8d8bdf8b9ff843ca13e848f772adaa109a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:09:37 +08:00
Finley Xiao
66d5f36439 clk: rockchip: support setting ddr clock via SCPI APIs
On rk3368, let a mcu scaling ddr clock via SCPI (System Control and
Power Interface) APIs.

Change-Id: I95342b876caad991e6d1319c5e4ec793365c7981
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:09:26 +08:00
Frank Wang
22d7b0e780 clk: rockchip: rk3288: add gate id of hclk_usb_peri for usb otg
Change-Id: Ib45f6d97ec81329ec9a4a19e9e836efa0ea61fe2
Signed-off-by: Frank Wang <frank.wang@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 09:09:17 +08:00
Elaine Zhang
821e83c98b clk: rockchip: rk3368: add CLK_SET_RATE_PARENT flag for dclk_vop
dclk_vop only allowed on NPLL.

Change-Id: I5325a530d3052de1e8685c39b90357291f0f4fb3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Mark Yao
57eb2dfc42 clk: rockchip: rk3368: remove the flag ROCKCHIP_PLL_SYNC_RATE
CPLL and NPLL is used for vop dclk, sync rate flag would cause
loader display abnormal.

Change-Id: Ia170a8d0b7d1f39e2c9dcbc10b5d33fd1886d5f7
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Jianqun Xu
79f18c47d5 clk: rockchip: rk3368 add 1296M\216M\126M support to freq table
Change-Id: I6cff0d8820401c36c98f54a9777629dc1d37fba8
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Finley Xiao
0a64261970 clk: rockchip: use rk3368-efuse clock ids
Reference the newly added efuse clock-ids in the clock-tree.

Change-Id: Ibbef52bcc44d006ab48e6f1f874e3bc88c681bd6
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-03-06 08:54:38 +08:00
Elaine Zhang
b7f4ad4320 clk: rockchip: fix up the rockchip_rk3066_pll_clk_set_by_auto func
Change-Id: Id7c561a50a16918c2943f79701ab72c6eaccdc41
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Elaine Zhang
b710757ef0 clk: rockchip: rk3368: add CLK_IGNORE_UNUSED flag for mcu clk
Change-Id: I27856c9523ac3bffd4b509f016a659a1e3094b41
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Elaine Zhang
eebf0ebb51 clk: rockchip: rk3328: fix up the describe error for aclk_usb3otg
Change-Id: Ie323c8934205bf71360d779717bb3e34c36a9dc6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-03-06 08:54:38 +08:00
Will Deacon
16c79bac8e UPSTREAM: arm64: kpti: Whitelist Cortex-A CPUs that don't implement the CSV3 field
While the CSV3 field of the ID_AA64_PFR0 CPU ID register can be checked
to see if a CPU is susceptible to Meltdown and therefore requires kpti
to be enabled, existing CPUs do not implement this field.

We therefore whitelist all unaffected Cortex-A CPUs that do not implement
the CSV3 field.

Change-Id: I1af7495be64d40a1e05a201f19e5f066b0d4bcc7
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
(cherry picked from commit 2a355ec257)
2019-03-04 19:31:26 +08:00
Yifeng Zhao
c299ce6019 soc: rockchip: mmc: add emmc vendor storage
Change-Id: I3996cccaed265af2295dbc1ee77746928e1beec5
Signed-off-by: Yifeng Zhao <zyf@rock-chips.com>
2019-03-01 09:36:30 +08:00
Tao Huang
136fb3d83e soc: rockchip: cpu: rename menu prompt
From "CPU selection" to "Rockchip CPU selection".

Change-Id: I5d9368ca6eb9ba60cd4c33fdd703775a328e9da0
Signed-off-by: Tao Huang <huangtao@rock-chips.com>
2019-03-01 09:27:50 +08:00
Finley Xiao
16e9353f89 arm: dts: rockchip: Change cpu opp-microvolt form one entry to three
Single entry is for target voltage and three entries are for
<target min max> voltages. Change cpu opp-microvolt form one entry to
three entries and set maximum acceptable voltage to a high value so that
regulator device can supply multiple consumers at the same time.

Change-Id: I3a0dc4e161bae33e36b232c36a0a05a3102359ef
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
e46a06270b arm64: dts: rockchip: rk3399: Add specification serial number for cpu
Change-Id: Ie48b09944ae3b294e3c7666bd9aa68706bdd4ba5
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Hu Kejun
e08c5bc9e0 arm64: dts: rockchip: rk3399: add interrupt name for rkisp
Change-Id: If942773bb18b55463cdd2137493f6573ce747893
Signed-off-by: Hu Kejun <william.hu@rock-chips.com>
2019-02-28 20:22:04 +08:00
Weixin Zhou
990796fbed arm64: dts: rockchip: rk3399: add gpio drive strength 10ma
Change-Id: Iff6303af2e87425b0509fd962b9e6b2fca8eb896
Signed-off-by: Weixin Zhou <zwx@rock-chips.com>
2019-02-28 20:22:04 +08:00
Huibin Hong
e759baa233 arm64: dts: rockchip: rk3399 fix uart3 cts and rts pinctl config
Change-Id: I2549e2a2e1913e9d9430087b9fc0009ec28a4c8f
Signed-off-by: Huibin Hong <huibin.hong@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
b4b084f506 arm64: dts: rockchip: rk3399: Add wide-temperature configure
Change-Id: I5e8cca3de8b671f04d9fdf07f6c566ebb8b7988a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
YouMin Chen
3509ed3d18 arm64: dts: rockchip: rk3399: fix VDD_CENTER to 0.9V
Change-Id: I1226b92fd96be7a86208a9363cc38060115043be
Signed-off-by: YouMin Chen <cym@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
a95306e198 arm64: dts: rockchip: rk3399: add pvtm resets
Change-Id: I1250a5193bd44b164d62d918401e60c7c4d31c59
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
e181776b90 arm64: dts: rockchip: rk3399: add nvmem-cells property for gpu
Change-Id: If538d1f8085dc686a25563a9eb891b79565a1c8d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
5f19e6737b arm64: dts: rockchip: rk3399: add gpu pvtm voltage table
stress test:
1. Antutu, use governor simpleondemand
2. Need for Speed, use governor simpleondemand
3. Glmark2, use userspace, scanning frequency

Change-Id: Ibe27380e582b193d900b0d55da3567ce553c32df
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
59d87c96d7 arm64: dts: rockchip: rk3399: add cpu pvtm voltage table
stress test:
1. reboot
2. antutu, use governor performance
3. antutu, use governor interactive
4. Thomas-sRoomIII, use governor interactive
5. Thomas-sRoomIII, use governor userspace and sweep frequency

Change-Id: If12d2bd72ce3bba01021314265eba4f83a0072e1
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
eb2a71ddf7 arm64: dts: rk3399: add leakage nvmem-cells properties for cpu
Change-Id: Id156f2a9a3871747d9379b49d09034238d204670
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
425399a399 arm64: dts: rockchip: Rename OPP nodes as opp-<opp-hz>
Compiling the DT file with W=1, DTC warns like follows:

Warning (unit_address_vs_reg): Node /opp_table0/opp@1000000000 has a
unit name, but no reg property

Fix this by replacing '@' with '-' as the OPP nodes will never have a
"reg" property.

Change-Id: I5748be7888db149633c3980c3f5e9715cd256a52
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
654ad2c999 arm64: dts: rk3399: remove 297MHz and add 300MHz for dmc
Only 200MHz, 300MHz, 400MHz, 528MHz, 600MHz, 666MHz, 732MHz and
800MHz are available at present.

Change-Id: I48ed7e6e6f636389fbc239b1cca201f5c5f19d7a
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Finley Xiao
17004d9ad6 arm64: dts: rockchip: rk3399: Rename OPP nodes as opp@<opp-hz>
It would be better to name OPP nodes as opp@<opp-hz> as that will ensure
that multiple DT nodes don't contain the same frequency. Of course we
expect the writer to name the node with its opp-hz frequency and not any
other frequency.

And that will let the compile error out if multiple nodes are using the
same opp-hz frequency.

Change-Id: I8c77646329e39390fb135d4d75d34893a8168876
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-02-28 20:22:04 +08:00
Jianqun Xu
696d1ad811 ARM64: dts: rk3399: move opp tables to rk3399-opp.dtsi
Add a new dtsi file - rk3399-opp.dtsi, to configure opp-tables
for cpu, gpu and dmc.

Add rk3399-early-opp.dtsi for board with ES1, which need limit
frequency for cpu, gpu and dmc.

Change-Id: Ib57761fd5f405b0e79039d7a01e6e023d6f5dc2c
Reviewed-by: Finley Xiao <finley.xiao@rock-chips.com>
Reviewed-by: Huang, Tao <huangtao@rock-chips.com>
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2019-02-28 20:22:04 +08:00
Elaine Zhang
80f56a2fa8 clk: rockchip: rk3399: remove the flag ROCKCHIP_PLL_SYNC_RATE for VPLL and CPLL
to slove the display shaking, when uboot logo display to kernel show.

Change-Id: I804aa09f24bc4fa7b6314a7a5487f0ee1a321724
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-28 17:49:02 +08:00
Elaine Zhang
168ead39aa clk: rockchip: rk3399: fix up the pr_err for debug
Change-Id: I16eeacaf0307146ebf8db745621ef57e5ab16fec
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-28 17:49:02 +08:00
Elaine Zhang
9a0256dba4 clk: rockchip: rk3399: Mark some grf clock as critical
pclk_perihp_grf and pclk_vio_grf is for some grf regs read and write,
mark it as critical and it never turns off.

Change-Id: If9465334b9168b4376a7ac95d5f08e389048409f
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-28 17:49:02 +08:00
Elaine Zhang
2d399082b2 clk: rockchip: rk3399: make the cpll as parent just for vop
others clk change it's parent from cpll to dummy_cpll.
the vop's parent just vpll and cpll,
make sure each vop have it's own pll as parent.

Change-Id: Ia61e10918e14a69c053455018ddf0183ff15ea19
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-28 17:49:02 +08:00
Finley Xiao
39d35a584c clk: rockchip: rk3399: delete the CLK_IGNORE_UNUSED for pvtm clks
These clks will be enabed and disabled in pvtm driver.

Change-Id: I742a8c4ef5877486fb21c014f1e4ab27f72e468d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-28 17:49:02 +08:00