Skip to content

Commit 0fc42d2

Browse files
committed
Merge tag 'v7.1-rockchip-clk1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip
Pull Rockchip clk driver updates from Heiko Stuebner: - Clock driver for the Rockchip RV1103B SoC For whatever reason that SoC only got a B addition to the name, but major changes internally - likely it is pin compatible with the non-b-variant. Other change is actually exporting PCIe pipe-clocks that were already in the binding. * tag 'v7.1-rockchip-clk1' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: clk: rockchip: rk3568: Add PCIe pipe clock gates clk: rockchip: Add clock controller for the RV1103B dt-bindings: clock: rockchip: Add RV1103B CRU support
2 parents c369299 + 41b1a67 commit 0fc42d2

7 files changed

Lines changed: 942 additions & 0 deletions

File tree

Documentation/devicetree/bindings/clock/rockchip,rv1126b-cru.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ description:
1717
properties:
1818
compatible:
1919
enum:
20+
- rockchip,rv1103b-cru
2021
- rockchip,rv1126b-cru
2122

2223
reg:

drivers/clk/rockchip/Kconfig

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@ config CLK_PX30
1616
help
1717
Build the driver for PX30 Clock Driver.
1818

19+
config CLK_RV1103B
20+
bool "Rockchip RV1103B clock controller support"
21+
depends on ARM || COMPILE_TEST
22+
default y
23+
help
24+
Build the driver for RV1103B Clock Driver.
25+
1926
config CLK_RV110X
2027
bool "Rockchip RV110x clock controller support"
2128
depends on ARM || COMPILE_TEST

drivers/clk/rockchip/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ clk-rockchip-y += gate-link.o
1818
clk-rockchip-$(CONFIG_RESET_CONTROLLER) += softrst.o
1919

2020
obj-$(CONFIG_CLK_PX30) += clk-px30.o
21+
obj-$(CONFIG_CLK_RV1103B) += clk-rv1103b.o
2122
obj-$(CONFIG_CLK_RV110X) += clk-rv1108.o
2223
obj-$(CONFIG_CLK_RV1126) += clk-rv1126.o
2324
obj-$(CONFIG_CLK_RV1126B) += clk-rv1126b.o rst-rv1126b.o

drivers/clk/rockchip/clk-rk3568.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {
827827
RK3568_CLKGATE_CON(12), 3, GFLAGS),
828828
GATE(CLK_PCIE20_AUX_NDFT, "clk_pcie20_aux_ndft", "xin24m", 0,
829829
RK3568_CLKGATE_CON(12), 4, GFLAGS),
830+
GATE(CLK_PCIE20_PIPE_DFT, "clk_pcie20_pipe_dft", "aclk_pipe", CLK_IGNORE_UNUSED,
831+
RK3568_CLKGATE_CON(12), 5, GFLAGS),
830832
GATE(ACLK_PCIE30X1_MST, "aclk_pcie30x1_mst", "aclk_pipe", 0,
831833
RK3568_CLKGATE_CON(12), 8, GFLAGS),
832834
GATE(ACLK_PCIE30X1_SLV, "aclk_pcie30x1_slv", "aclk_pipe", 0,
@@ -837,6 +839,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {
837839
RK3568_CLKGATE_CON(12), 11, GFLAGS),
838840
GATE(CLK_PCIE30X1_AUX_NDFT, "clk_pcie30x1_aux_ndft", "xin24m", 0,
839841
RK3568_CLKGATE_CON(12), 12, GFLAGS),
842+
GATE(CLK_PCIE30X1_PIPE_DFT, "clk_pcie30x1_pipe_dft", "aclk_pipe", CLK_IGNORE_UNUSED,
843+
RK3568_CLKGATE_CON(12), 13, GFLAGS),
840844
GATE(ACLK_PCIE30X2_MST, "aclk_pcie30x2_mst", "aclk_pipe", 0,
841845
RK3568_CLKGATE_CON(13), 0, GFLAGS),
842846
GATE(ACLK_PCIE30X2_SLV, "aclk_pcie30x2_slv", "aclk_pipe", 0,
@@ -847,6 +851,8 @@ static struct rockchip_clk_branch rk3568_clk_branches[] __initdata = {
847851
RK3568_CLKGATE_CON(13), 3, GFLAGS),
848852
GATE(CLK_PCIE30X2_AUX_NDFT, "clk_pcie30x2_aux_ndft", "xin24m", 0,
849853
RK3568_CLKGATE_CON(13), 4, GFLAGS),
854+
GATE(CLK_PCIE30X2_PIPE_DFT, "clk_pcie30x2_pipe_dft", "aclk_pipe", CLK_IGNORE_UNUSED,
855+
RK3568_CLKGATE_CON(13), 5, GFLAGS),
850856
GATE(ACLK_SATA0, "aclk_sata0", "aclk_pipe", 0,
851857
RK3568_CLKGATE_CON(11), 0, GFLAGS),
852858
GATE(CLK_SATA0_PMALIVE, "clk_sata0_pmalive", "gpll_20m", 0,

0 commit comments

Comments
 (0)