Skip to content

Commit 16c3c4e

Browse files
bebarinobebarino
committed
Merge branches 'clk-renesas', 'clk-cleanup', 'clk-spacemit' and 'clk-tegra' into clk-next
* clk-renesas: (25 commits) dt-bindings: clk: rs9: Fix DIF pattern match clk: rs9: Convert to DEFINE_SIMPLE_DEV_PM_OPS() clk: rs9: Reserve 8 struct clk_hw slots for for 9FGV0841 clk: renesas: Add missing log message terminators clk: renesas: rzg2l: Remove DSI clock rate restrictions clk: renesas: rzv2h: Deassert reset on assert timeout clk: renesas: rzg2l: Deassert reset on assert timeout clk: renesas: cpg-mssr: Unlock before reset verification clk: renesas: r9a09g056: Add entries for CANFD clk: renesas: r9a09g057: Add entries for CANFD clk: renesas: r9a09g077: Add CANFD clocks clk: renesas: cpg-mssr: Handle RZ/T2H register layout in PM callbacks dt-bindings: clock: renesas,r9a09g077/87: Add PCLKCAN ID clk: renesas: cpg-mssr: Simplify pointer math in cpg_rzt2h_mstp_read() clk: renesas: r9a09g056: Add clock and reset entries for TSU clk: renesas: r9a09g057: Add entries for RSCIs clk: renesas: r9a09g056: Add entries for RSCIs clk: renesas: r9a09g056: Add entries for the RSPIs clk: renesas: r9a09g056: Add entries for ICU clk: renesas: r9a09g056: Add entries for the DMACs ... * clk-cleanup: clk: Disable KUNIT_UML_PCI clk: zynqmp: pll: Fix zynqmp_clk_divider_determine_rate kerneldoc clk: zynqmp: divider: Fix zynqmp_clk_divider_determine_rate kerneldoc clk: tegra: tegra124-emc: fix device leak on set_rate() clk: Annotate #else and #endif clk: Merge prepare and unprepare sections clk: Move clk_{save,restore}_context() to COMMON_CLK section clk: clk-apple-nco: Add "apple,t8103-nco" compatible clk: versatile: impd1: Simplify with scoped for each OF child loop clk: scpi: Simplify with scoped for each OF child loop clk: lmk04832: Simplify with scoped for each OF child loop * clk-spacemit: clk: spacemit: k3: add the clock tree clk: spacemit: k3: extract common header clk: spacemit: ccu_pll: add plla type clock clk: spacemit: ccu_mix: add inverted enable gate clock dt-bindings: soc: spacemit: k3: add clock support clk: spacemit: add platform SoC prefix to reset name clk: spacemit: extract common ccu functions reset: spacemit: fix auxiliary device id clk: spacemit: prepare common ccu header clk: spacemit: Hide common clock driver from user controller clk: spacemit: Respect Kconfig setting when building modules * clk-tegra: clk: tegra30: Add CSI pad clock gates clk: tegra: Set CSUS as vi_sensor's gate for Tegra20, Tegra30 and Tegra114 clk: tegra20: Reparent dsi clock to pll_d_out0 clk: tegra: tegra124-emc: Simplify with scoped for each OF child loop clk: tegra: Adjust callbacks in tegra_clock_pm clk: tegra: tegra124-emc: Fix potential memory leak in tegra124_clk_register_emc()
4 parents 341d72e + b079e4e + 6294bb8 + 2d4235b commit 16c3c4e

31 files changed

Lines changed: 2729 additions & 310 deletions

‎Documentation/devicetree/bindings/clock/spacemit,k1-pll.yaml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@
44
$id: http://devicetree.org/schemas/clock/spacemit,k1-pll.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: SpacemiT K1 PLL
7+
title: SpacemiT K1/K3 PLL
88

99
maintainers:
1010
- Haylen Chu <heylenay@4d2.org>
1111

1212
properties:
1313
compatible:
14-
const: spacemit,k1-pll
14+
enum:
15+
- spacemit,k1-pll
16+
- spacemit,k3-pll
1517

1618
reg:
1719
maxItems: 1
@@ -28,7 +30,8 @@ properties:
2830
"#clock-cells":
2931
const: 1
3032
description:
31-
See <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.
33+
For K1 SoC, check <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.
34+
For K3 SoC, check <dt-bindings/clock/spacemit,k3-clocks.h> for valid indices.
3235

3336
required:
3437
- compatible

‎Documentation/devicetree/bindings/soc/spacemit/spacemit,k1-syscon.yaml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$id: http://devicetree.org/schemas/soc/spacemit/spacemit,k1-syscon.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: SpacemiT K1 SoC System Controller
7+
title: SpacemiT K1/K3 SoC System Controller
88

99
maintainers:
1010
- Haylen Chu <heylenay@4d2.org>
@@ -22,6 +22,10 @@ properties:
2222
- spacemit,k1-syscon-rcpu
2323
- spacemit,k1-syscon-rcpu2
2424
- spacemit,k1-syscon-apbc2
25+
- spacemit,k3-syscon-apbc
26+
- spacemit,k3-syscon-apmu
27+
- spacemit,k3-syscon-dciu
28+
- spacemit,k3-syscon-mpmu
2529

2630
reg:
2731
maxItems: 1
@@ -39,7 +43,8 @@ properties:
3943
"#clock-cells":
4044
const: 1
4145
description:
42-
See <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.
46+
For K1 SoC, check <dt-bindings/clock/spacemit,k1-syscon.h> for valid indices.
47+
For K3 SoC, check <dt-bindings/clock/spacemit,k3-clocks.h> for valid indices.
4348

4449
"#power-domain-cells":
4550
const: 1
@@ -60,6 +65,8 @@ allOf:
6065
enum:
6166
- spacemit,k1-syscon-apmu
6267
- spacemit,k1-syscon-mpmu
68+
- spacemit,k3-syscon-apmu
69+
- spacemit,k3-syscon-mpmu
6370
then:
6471
required:
6572
- "#power-domain-cells"
@@ -74,6 +81,9 @@ allOf:
7481
- spacemit,k1-syscon-apbc
7582
- spacemit,k1-syscon-apmu
7683
- spacemit,k1-syscon-mpmu
84+
- spacemit,k3-syscon-apbc
85+
- spacemit,k3-syscon-apmu
86+
- spacemit,k3-syscon-mpmu
7787
then:
7888
required:
7989
- clocks

‎drivers/clk/.kunitconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
CONFIG_KUNIT=y
2+
CONFIG_KUNIT_UML_PCI=n
23
CONFIG_OF=y
34
CONFIG_OF_OVERLAY=y
45
CONFIG_COMMON_CLK=y
56
CONFIG_CLK_KUNIT_TEST=y
67
CONFIG_CLK_FIXED_RATE_KUNIT_TEST=y
78
CONFIG_CLK_GATE_KUNIT_TEST=y
89
CONFIG_CLK_FD_KUNIT_TEST=y
9-
CONFIG_UML_PCI_OVER_VIRTIO=n

‎drivers/clk/clk-apple-nco.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,7 @@ static int applnco_probe(struct platform_device *pdev)
320320
}
321321

322322
static const struct of_device_id applnco_ids[] = {
323+
{ .compatible = "apple,t8103-nco" },
323324
{ .compatible = "apple,nco" },
324325
{ }
325326
};

‎drivers/clk/clk-lmk04832.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,6 @@ static int lmk04832_probe(struct spi_device *spi)
14001400
{
14011401
const struct lmk04832_device_info *info;
14021402
int rdbk_pin = RDBK_CLKIN_SEL1;
1403-
struct device_node *child;
14041403
struct lmk04832 *lmk;
14051404
u8 tmp[3];
14061405
int ret;
@@ -1462,14 +1461,13 @@ static int lmk04832_probe(struct spi_device *spi)
14621461
device_property_read_u32(lmk->dev, "ti,sysref-pulse-count",
14631462
&lmk->sysref_pulse_cnt);
14641463

1465-
for_each_child_of_node(lmk->dev->of_node, child) {
1464+
for_each_child_of_node_scoped(lmk->dev->of_node, child) {
14661465
int reg;
14671466

14681467
ret = of_property_read_u32(child, "reg", &reg);
14691468
if (ret) {
14701469
dev_err(lmk->dev, "missing reg property in child: %s\n",
14711470
child->full_name);
1472-
of_node_put(child);
14731471
return ret;
14741472
}
14751473

‎drivers/clk/clk-scpi.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,20 +265,19 @@ static int scpi_clocks_probe(struct platform_device *pdev)
265265
{
266266
int ret;
267267
struct device *dev = &pdev->dev;
268-
struct device_node *child, *np = dev->of_node;
268+
struct device_node *np = dev->of_node;
269269
const struct of_device_id *match;
270270

271271
if (!get_scpi_ops())
272272
return -ENXIO;
273273

274-
for_each_available_child_of_node(np, child) {
274+
for_each_available_child_of_node_scoped(np, child) {
275275
match = of_match_node(scpi_clk_match, child);
276276
if (!match)
277277
continue;
278278
ret = scpi_clk_add(dev, child, match);
279279
if (ret) {
280280
scpi_clocks_remove(pdev);
281-
of_node_put(child);
282281
return ret;
283282
}
284283

‎drivers/clk/spacemit/Kconfig‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22

3-
config SPACEMIT_CCU
4-
tristate "Clock support for SpacemiT SoCs"
3+
menu "Clock support for SpacemiT platforms"
54
depends on ARCH_SPACEMIT || COMPILE_TEST
5+
6+
config SPACEMIT_CCU
7+
tristate
68
select AUXILIARY_BUS
79
select MFD_SYSCON
8-
help
9-
Say Y to enable clock controller unit support for SpacemiT SoCs.
10-
11-
if SPACEMIT_CCU
1210

1311
config SPACEMIT_K1_CCU
1412
tristate "Support for SpacemiT K1 SoC"
15-
depends on ARCH_SPACEMIT || COMPILE_TEST
13+
select SPACEMIT_CCU
1614
help
1715
Support for clock controller unit in SpacemiT K1 SoC.
1816

19-
endif
17+
config SPACEMIT_K3_CCU
18+
tristate "Support for SpacemiT K3 SoC"
19+
select SPACEMIT_CCU
20+
help
21+
Support for clock controller unit in SpacemiT K3 SoC.
22+
23+
endmenu

‎drivers/clk/spacemit/Makefile‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0
22

3-
obj-$(CONFIG_SPACEMIT_K1_CCU) = spacemit-ccu-k1.o
4-
spacemit-ccu-k1-y = ccu_pll.o ccu_mix.o ccu_ddn.o
3+
obj-$(CONFIG_SPACEMIT_CCU) += spacemit-ccu.o
4+
spacemit-ccu-y += ccu_common.o
5+
spacemit-ccu-y += ccu_pll.o
6+
spacemit-ccu-y += ccu_mix.o
7+
spacemit-ccu-y += ccu_ddn.o
8+
9+
obj-$(CONFIG_SPACEMIT_K1_CCU) += spacemit-ccu-k1.o
510
spacemit-ccu-k1-y += ccu-k1.o
11+
12+
obj-$(CONFIG_SPACEMIT_K3_CCU) += spacemit-ccu-k3.o
13+
spacemit-ccu-k3-y += ccu-k3.o

0 commit comments

Comments
 (0)