Commit Graph

166 Commits

Author SHA1 Message Date
zhangqing da3c693fb0 rockchip: dts: rk3568: Resync from kernel-4.19
Resync from kernel-4.19:
(I5f310f9b857 clk: rockchip: rk3568: export cpll_xxx clk id for more
function)

Change-Id: I4f5ea86ed73272dc3381ba27d1c56284fa17d546
Signed-off-by: zhangqing <zhangqing@rock-chips.com>
2020-12-07 09:22:55 +08:00
Joseph Chen 2d25c32e07 rockchip: dts: rk3568: Resync from kernel-4.19
Resync from kernel-4.19:
(2f153f1fa73c arm64: dts: rockchip: rk3568: add thermal-zone for pvtm)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I36fdfc366f4d44f3226b6f8b35ee496701fe021e
2020-11-19 15:34:01 +08:00
Elaine Zhang fdd74c3220 clk: rockchip: rk3568: support ebc clk setting/getting rate
Change-Id: Iecac8e56b2b5615b54c8969767053b6282fe6fb8
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-11-19 14:48:18 +08:00
Joseph Chen be7064f8f7 rockchip: dts: rk3568: add basic dtsi/dts
Sync from kernel-4.19:
(85abcd6 phy: phy-rockchip-snps-pcie3: Initial support)

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I474a6f5bfdaf5f78655a121ac9dc08e3708de226
2020-10-22 19:39:19 +08:00
Elaine Zhang 6b7c0aa59e rockchip: dts: rk3568: sync from kernel
sync from: ac723c clk: rockchip: rk3568: Replace RKNN with NPU

Change-Id: I24084626ef787f6fb7cbb8875365eb31fbea3541
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-10-22 19:39:19 +08:00
Elaine Zhang 9848d60c83 dt-bindings: clock: rk3568: Add binding header for rk3568
files origin from kernel.

Change-Id: Iab1de697da1db28ef0d4d10c96c437373363c1bd
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2020-09-14 17:14:15 +08:00
Joseph Chen d1ffb5dd43 rockchip: dts: rv1126: sync from kernel-4.19
from kernel-4.19:
(3bd4dd9 ARM: dts: rv1126: Add CPU idle states node.)

otp and secure-otp nodes are only defined in U-Boot.

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I2fcdf677bd86a477dc087d3e4986ee6cd2dfe4de
2020-05-28 19:12:02 +08:00
Finley Xiao 2830381ba6 dt-bindings: clock: rv1126-cru: Delete PCLK_CAPTURE_PWM2
Change-Id: I33a4c2cc12d275fbc50bfb652bedb9fe83ad266d
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-04-17 16:49:13 +08:00
Finley Xiao b77d2f1647 dt-bindings: clock: rv1126-cru: Rename some srst according to TRM V1.0
Change-Id: I329952664ef731bec67a57fa8c4c43dd65a38235
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-04-14 19:52:46 +08:00
Joseph Chen c8fa018b04 Merge branch 'next-dev' into thunder-boot 2020-03-30 19:32:22 +08:00
Jianqun Xu d23b7df185 dt-bindings: pinctrl: rockchip support RK_FUNC_{5,15}
Change-Id: I3fc8f58e033520f5211814bec84bd3142fd41760
Signed-off-by: Jianqun Xu <jay.xu@rock-chips.com>
2020-03-30 18:20:04 +08:00
Finley Xiao 6ea30212cc clk: rockchip: rv1126: Rename I2S clocks
Change-Id: Idc6659013dde74f09e86a7120fc42348b87d63f8
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-28 16:41:12 +08:00
Finley Xiao 979aa338cb clk: rockchip: rv1126: Change SRST_MAC_PTPREF to SRST_GMAC_A
Change-Id: Ic19b2f7602be02b11f3631ee29baf0fa8cbca074
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-03-06 18:34:46 +08:00
Joseph Chen 593e1e6d64 rockchip: dts: rv1126/1109: sync from kernel
sync from: a96b35a clk: rockchip: rv1126: Add support for otp

Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: I12db524cf784479de567515f47da99df611a48ad
2020-03-04 18:41:10 +08:00
Joseph Chen 1a4f6af8bf Merge branch 'next-dev' into thunder-boot 2020-03-02 09:43:23 +08:00
Finley Xiao ba2ff15a2a clk: rockchip: rv1126: Fix usb clock name
Change-Id: I1a26d7093a0c3dfb32c90d0dabfdce7d0ea77dc7
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2020-02-26 17:02:53 +08:00
Joseph Chen f95775d6f3 clk: rockchip: rename rv1109 to rv1126
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
Change-Id: If2c870831fd1e3332c09f00aaa9e91a1f1523279
2020-02-21 10:34:48 +08:00
Jon Lin fd25a27f53 clk: rockchip: rk3036: add HCLK_sfc
Change-Id: I18ce656c79e2a62190f356d889f39bb561659023
Signed-off-by: Jon Lin <jon.lin@rock-chips.com>
2019-12-20 10:03:21 +08:00
Finley Xiao 1f1e1246f6 clk: rockchip: rv1109: Add clock driver
Add basic clock for rv1109 which including cpu, bus, emmc clock init.

Change-Id: I093f9e75bf296b3cc7f0ee8f88496e42857a2d96
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2019-12-11 15:07:24 +08:00
Joseph Chen 0dc037782d arm: rockchip: add RV1109 SOC support
RV1109 is a SoC from Rockchip, which embedded with a
dual-core ARM Cortex-A7 and a risc-v core.

Change-Id: I0e82c6f1487bd7f2948df81055b78553c139e144
Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2019-11-19 16:18:27 +08:00
Yu YongZhen f992fe3334 clk: rockchip: rk3308: Make DCLK_VOP clock id consistent with kernel
Change-Id: I3e5b042a5e7b4bd4a7724451b30cfa9601955541
Signed-off-by: Yu YongZhen <yuyz@rock-chips.com>
2019-04-16 09:06:52 +08:00
Elaine Zhang 6b5ade5a57 clk: rockchip: rk1808: fix up the clk_set_default failed
Change-Id: If49d6def0e16b93238311885217f30a4b7a2e7c3
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-04-10 12:04:10 +08:00
Elaine Zhang 5561190119 clk: rockchip: rk3288: add clk_set_default
support aclk_vio\hclk_vio clk setting.

Change-Id: Ie826c770670598161f22208f504d8762b8597811
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-02-01 16:17:34 +08:00
Elaine Zhang 2e8ea5b0f6 clk: rockchip: rk3288: support crypto clk setting
Change-Id: I066ec163d959b95d0928e07716e3370715aa9898
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2019-01-21 09:11:01 +08:00
Nickey Yang 0fd7e0574c rockchip: dt-bindings: clk: rk3288: add SCLK_MIPIDSI_24M
Change-Id: I268aadd6065f93f17e5a48e9b5acf63d2e5132a1
Signed-off-by: Nickey Yang <nickey.yang@rock-chips.com>
2018-12-17 14:20:08 +08:00
Elaine Zhang 1631bee789 rockchip: dtsi: rk3128: sync from kernel
base on commit 4d46be090:
	(clk: rockchip: rk3128: add hclk_sfc)

Change-Id: Ied6584460fa5243abd26efa5602b2312222898a1
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-11-06 14:28:51 +08:00
Elaine Zhang 8fd483da84 rockchip: dtsi: rk1808: sync from kernel
base on commit 54e75c20:
    (clk: rockchip: rk1808: add clk ID for clk_rtc32k_frac)

Change-Id: Iac1db11af0e6c9d54e66a1d634d890ef6999c7d9
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-10-16 09:16:31 +08:00
Joseph Chen 16e939f905 rockchip: dtsi: rk1808: sync from kernel
base on commit dabd2ea:
(arm64: dts: rockchip: fix mapping address for rk1808 pmugrf)

Change-Id: I6536c03fc2c90ddf1dd8eeb626b7d03f33fdbcc9
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-29 10:33:04 +08:00
Joseph Chen 8870d6b7ed rockchip: rk1808: add evb board support
Change-Id: Id2beac9acc5b4b96fe480b3b2bea88e2f3c158aa
Signed-off-by: Joseph Chen <chenjh@rock-chips.com>
2018-09-04 10:36:14 +08:00
Elaine Zhang 3204d7c4a3 rockchip: clk: rk1808: Add binding header for rk1808
files origin from kernel.

Change-Id: Ie19bf329f00bf1c502db5d91978f89de3771eff2
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-29 11:17:54 +08:00
Elaine Zhang 7150785e44 rockchip: clk: rk3368: support more clks to set and get rate
Make clock ids consistent with kernel.
Support more clks to set and get rate.
Add clk dump.

Change-Id: I348c98ce81ce76af9c492a30480fcb495da7ed79
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-06 11:20:24 +08:00
Elaine Zhang efb944b698 rockchip: clk: rk3128: support more clks to set and get rate
Make clock ids consistent with kernel.
support more clks to set and get rate.
add clk init.

Change-Id: I1e6b5734887e0bd5d845f1286f10eb0e3e42bc08
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-02 17:03:55 +08:00
Elaine Zhang 809e91fd38 rockchip: clk: rk322x: support more clks to set and get rate
Change-Id: Ibed40f1826469263a8015d8af2dea4d3567a08e6
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-02 17:03:55 +08:00
Elaine Zhang 0b7db90f19 rockchip: clk: rk3328: support more clks to set and get rate
Change-Id: Ic231b7701c6eb23b0e9db21c1d28fb4d08c4debf
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-08-02 17:03:55 +08:00
Elaine Zhang 6bfdfc4f06 clk: rockchip: rk3399: support dual pll for vop
set the vop's parent just vpll and cpll,
set vop parent in dts node,the same as kernel setting.
i.e:
&vopb {
	status = "okay";
	assigned-clocks = <&cru DCLK_VOP0_DIV>;
	assigned-clock-parents = <&cru PLL_VPLL>;
};
&vopl {
	status = "okay";
	assigned-clocks = <&cru DCLK_VOP1_DIV>;
	assigned-clock-parents = <&cru PLL_CPLL>;
};

Change-Id: I07ab4e2837cf7fc0860e8b4d14adb8936f5cb27a
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-28 16:35:33 +08:00
Elaine Zhang 1636e7c2d4 clk: rockchip: rv1108: Make clock ids consistent with kernel
Change-Id: Idd295c633dffbe2ed6c3f5b6e115b0fd5b040251
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-06 17:56:31 +08:00
Finley Xiao 4af5b92cfb clk: rockchip: rk3308: Make clock ids consistent with kernel
Change-Id: I79db3bd2faa4f296efab68d15cae5548314b446f
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-06-05 08:56:08 +08:00
Elaine Zhang 5cb579f13b rockchip: clk: rv1108: Add some frequency setting interfaces
support PLL freq setting,
support bus and peri clk freq setting,
support aclk vio and dclk vop freq setting.

Change-Id: I894552c1e1bb1bd13a143e200edf289234a53c1d
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2018-06-01 11:55:11 +08:00
Andy Yan 54d254fe97 clk: rockchip: add clk driver for rk3308
Add basic clock for px30 which including cpu, bus, emmc, i2c,
spi, pwm, saradc clock init.

Change-Id: Idd8542d7833e4997378bce99e0a464d5d16890fd
Signed-off-by: Andy Yan <andy.yan@rock-chips.com>
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
2018-03-21 16:49:40 +08:00
David Wu b0b6870835 clk: rockchip: clk_rk3288: Implement "assign-clock-parent" and "assign-clock-rate"
The RK3288 CRU-node assigns rates to a number of clocks that are not
implemented in the RK3288 clock-driver (but which have been
sufficiently initialised from rkclk_init()): for these clocks, we
implement the gmac clock set parent, but simply ignore the
others' set_rate() operation and return 0 to signal success.

Change-Id: Ic1a41634aba674001beb0e7e5ca3f7f2fa008e51
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2018-02-24 19:02:43 +08:00
David Wu 07a48b3e0c clk: rockchip: Add rk3328 gamc clock support
The rk3328 soc has two gmac controllers, one is gmac2io,
the other is gmac2phy. We use the gmac2io rgmii interface
for 1000M phy here.

Change-Id: I4963f03f6aea2c7196f33dae0bca38a432c80690
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
2018-02-24 19:02:43 +08:00
Kever Yang 744ba6c65f rockchip: dts: px30: add px30-evb dts
Add the dts and header file from kernel.

Change-Id: Iafd91528deffd14f5b59cc3d7cabe9d0dbb576d5
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2018-02-05 20:55:54 +08:00
Jerry Xu 7d46341ee4 rockchip: include: rk3128-cru: add same clk define for mipi dsi
Change-Id: I045ad0101c152648de2a0c53d160b2398367a6e4
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-11-29 16:20:19 +08:00
Jerry Xu de2eadf240 rockchip: include: add some define for mipi dsi
Change-Id: Ia125dff2293d4b41a26265ad46236f0429633753
Signed-off-by: Jerry Xu <xbl@rock-chips.com>
2017-11-29 16:19:00 +08:00
Francis Fan cd99aa8213 rockchip: rk322x: add PCLK_EFUSE_256 for dts file
Change-Id: I46c4f0f80b54a72acdba107ea290a45c231c3dda
Signed-off-by: Francis Fan <francis.fan@rock-chips.com>
Signed-off-by: Cody Xie <cody.xie@rock-chips.com>
2017-11-20 10:29:56 +08:00
Elaine Zhang 3e3a3170d1 clk: rockchip: rk3128: support dclk_lcdc and aclk_vio setting
support vop clk setting freq, for uboot logo display.

Change-Id: I766bdc2c3a13d0ee92f81fbd7a30b7cc87c2dceb
Signed-off-by: Elaine Zhang <zhangqing@rock-chips.com>
2017-10-23 15:38:07 +08:00
David Wu c95ecb1990 rockchip: dts: rk3128: Add SARADC at dtsi level
Change-Id: Ifcbda377d5b0eff50bd41cfc6141eb1f76211dc2
Signed-off-by: David Wu <david.wu@rock-chips.com>
2017-10-17 17:27:34 +08:00
Mark Yao 186f85721a drm/rockhcip: add drm rockchip display support
Change-Id: I5ef0e29d1e0855a7aa47bd0737835b79c53bf25a
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
2017-10-17 15:04:16 +08:00
David Wu befbd723c2 rockchip: clk: Add rv1108 SARADC clock support
The clk_saradc is dividing from the 24M, clk_saradc=24MHz/(saradc_div_con+1).
SARADC integer divider control register is 10-bits width.

Change-Id: I1ff152b72a75680601f22c5b621de8b2198a6778
Signed-off-by: David Wu <david.wu@rock-chips.com>
Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
(cherry picked from commit 2e4ce50d1aca35d13944f48a7e15d0b63e86eb38)
2017-10-12 11:44:56 +08:00
Kever Yang 40d96d0bb5 rockchip: rk3128: add device tree file
Add dts binding header for rk3128, files origin from kernel.

Change-Id: I56042f44f131aecee9d91bf381c74be0da6d5064
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
2017-09-29 09:36:13 +08:00