Skip to content

Commit ec73364

Browse files
committed
Merge branches 'clk-bindings', 'clk-cleanup', 'clk-renesas', 'clk-thead' and 'clk-spacemit' into clk-next
* clk-bindings: dt-bindings: clock: mediatek: Add power-domains property dt-bindings: clock: silabs,si5341: Add missing properties dt-bindings: clock: adi,axi-clkgen: add clock-output-names property dt-bindings: clock: Remove unused fujitsu,mb86s70-crg11 binding dt-bindings: clock: Convert silabs,si570 to DT schema dt-bindings: clock: Convert silabs,si5341 to DT schema dt-bindings: clock: Convert silabs,si514/544 to DT schema * clk-cleanup: clk: tegra: do not overallocate memory for bpmp clocks clk: ep93xx: Use int type to store negative error codes dt-bindings: clock: st: flexgen: remove deprecated compatibles clk: st: flexgen: remove unused compatible clk: clk-axi-clkgen: remove unneeded semicolon clk: tegra: Remove redundant semicolons clk: npcm: select CONFIG_AUXILIARY_BUS clk: remove unneeded 'fast_io' parameter in regmap_config * clk-renesas: (27 commits) clk: renesas: r9a09g05[67]: Reduce differences clk: renesas: r9a09g047: Add USB3.0 clocks/resets clk: renesas: cpg-mssr: Fix memory leak in cpg_mssr_reserved_init() clk: renesas: r9a09g056: Add clock and reset entries for I3C clk: renesas: r9a09g057: Add clock and reset entries for I3C dt-bindings: clock: renesas,r9a09g047-cpg: Add USB3.0 core clocks clk: renesas: r9a09g077: Add Ethernet Subsystem core and module clocks clk: renesas: rzv2h: Simplify polling condition in __rzv2h_cpg_assert() clk: renesas: rzv2h: Re-assert reset on deassert timeout clk: renesas: rzg2l: Re-assert reset on deassert timeout clk: renesas: rzg2l: Simplify rzg2l_cpg_assert() and rzg2l_cpg_deassert() dt-bindings: clock: renesas,r9a09g077/87: Add Ethernet clock IDs clk: renesas: r9a09g047: Add GPT clocks and resets clk: renesas: r9a09g077: Add module clocks for SCI1-SCI5 clk: renesas: rzv2h: remove round_rate() in favor of determine_rate() clk: renesas: rzg2l: convert from round_rate() to determine_rate() clk: renesas: r9a07g04[34]: Use tabs instead of spaces clk: renesas: r9a07g043: Add MSTOP for RZ/G2UL clk: renesas: r9a07g044: Add MSTOP for RZ/G2L clk: renesas: r9a08g045: Add MSTOP for GPIO ... * clk-thead: clk: thead: th1520-ap: set all AXI clocks to CLK_IS_CRITICAL clk: thead: support changing DPU pixel clock rate clk: thead: add support for enabling/disabling PLLs clk: thead: Correct parent for DPU pixel clocks clk: thead: th1520-ap: fix parent of padctrl0 clock clk: thead: th1520-ap: describe gate clocks with clk_gate * clk-spacemit: clk: spacemit: fix i2s clock clk: spacemit: introduce pre-div for ddn clock dt-bindings: clock: spacemit: introduce i2s pre-clock to fix i2s clock clk: spacemit: ccu_pll: convert from round_rate() to determine_rate() clk: spacemit: ccu_mix: convert from round_rate() to determine_rate() clk: spacemit: ccu_ddn: convert from round_rate() to determine_rate() clk: spacemit: fix sspax_clk dt-bindings: clock: spacemit: CLK_SSPA_I2S_BCLK for SSPA
5 parents ac28c75 + 49ef649 + 1ef1b8b + 73e6f3a + 519cff1 commit ec73364

42 files changed

Lines changed: 931 additions & 549 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/clock/st/st,flexgen.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,9 @@ Required properties:
6464
audio use case)
6565
"st,flexgen-video", "st,flexgen" (enable clock propagation on parent
6666
and activate synchronous mode)
67-
"st,flexgen-stih407-a0"
6867
"st,flexgen-stih410-a0"
69-
"st,flexgen-stih407-c0"
7068
"st,flexgen-stih410-c0"
7169
"st,flexgen-stih418-c0"
72-
"st,flexgen-stih407-d0"
7370
"st,flexgen-stih410-d0"
7471
"st,flexgen-stih407-d2"
7572
"st,flexgen-stih418-d2"
Lines changed: 172 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,172 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/pinctrl/renesas,r9a09g077-pinctrl.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas RZ/T2H and RZ/N2H Pin and GPIO controller
8+
9+
maintainers:
10+
- Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
11+
12+
description:
13+
The Renesas RZ/T2H and RZ/N2H SoCs feature a combined Pin and GPIO controller.
14+
Pin multiplexing and GPIO configuration are performed on a per-pin basis.
15+
Each port supports up to 8 pins, each configurable for either GPIO (port mode)
16+
or alternate function mode. Each pin supports function mode values ranging from
17+
0x0 to 0x2A, allowing selection from up to 43 different functions.
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- renesas,r9a09g077-pinctrl # RZ/T2H
23+
- renesas,r9a09g087-pinctrl # RZ/N2H
24+
25+
reg:
26+
minItems: 1
27+
items:
28+
- description: Non-safety I/O Port base
29+
- description: Safety I/O Port safety region base
30+
- description: Safety I/O Port Non-safety region base
31+
32+
reg-names:
33+
minItems: 1
34+
items:
35+
- const: nsr
36+
- const: srs
37+
- const: srn
38+
39+
gpio-controller: true
40+
41+
'#gpio-cells':
42+
const: 2
43+
description:
44+
The first cell contains the global GPIO port index, constructed using the
45+
RZT2H_GPIO() helper macro from <dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h>
46+
(e.g. "RZT2H_GPIO(3, 0)" for P03_0). The second cell represents the consumer
47+
flag. Use the macros defined in include/dt-bindings/gpio/gpio.h.
48+
49+
gpio-ranges:
50+
maxItems: 1
51+
52+
clocks:
53+
maxItems: 1
54+
55+
power-domains:
56+
maxItems: 1
57+
58+
definitions:
59+
renesas-rzt2h-n2h-pins-node:
60+
type: object
61+
allOf:
62+
- $ref: pincfg-node.yaml#
63+
- $ref: pinmux-node.yaml#
64+
properties:
65+
pinmux:
66+
description:
67+
Values are constructed from I/O port number, pin number, and
68+
alternate function configuration number using the RZT2H_PORT_PINMUX()
69+
helper macro from <dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h>.
70+
pins: true
71+
phandle: true
72+
input: true
73+
input-enable: true
74+
output-enable: true
75+
oneOf:
76+
- required: [pinmux]
77+
- required: [pins]
78+
additionalProperties: false
79+
80+
patternProperties:
81+
# Grouping nodes: allow multiple "-pins" subnodes within a "-group"
82+
'.*-group$':
83+
type: object
84+
description:
85+
Pin controller client devices can organize pin configuration entries into
86+
grouping nodes ending in "-group". These group nodes may contain multiple
87+
child nodes each ending in "-pins" to configure distinct sets of pins.
88+
additionalProperties: false
89+
patternProperties:
90+
'-pins$':
91+
$ref: '#/definitions/renesas-rzt2h-n2h-pins-node'
92+
93+
# Standalone "-pins" nodes under client devices or groups
94+
'-pins$':
95+
$ref: '#/definitions/renesas-rzt2h-n2h-pins-node'
96+
97+
'-hog$':
98+
type: object
99+
description: GPIO hog node
100+
properties:
101+
gpio-hog: true
102+
gpios: true
103+
input: true
104+
output-high: true
105+
output-low: true
106+
line-name: true
107+
required:
108+
- gpio-hog
109+
- gpios
110+
additionalProperties: false
111+
112+
allOf:
113+
- $ref: pinctrl.yaml#
114+
115+
required:
116+
- compatible
117+
- reg
118+
- reg-names
119+
- gpio-controller
120+
- '#gpio-cells'
121+
- gpio-ranges
122+
- clocks
123+
- power-domains
124+
125+
unevaluatedProperties: false
126+
127+
examples:
128+
- |
129+
#include <dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h>
130+
#include <dt-bindings/pinctrl/renesas,r9a09g077-pinctrl.h>
131+
132+
pinctrl@802c0000 {
133+
compatible = "renesas,r9a09g077-pinctrl";
134+
reg = <0x802c0000 0x2000>,
135+
<0x812c0000 0x2000>,
136+
<0x802b0000 0x2000>;
137+
reg-names = "nsr", "srs", "srn";
138+
clocks = <&cpg CPG_CORE R9A09G077_CLK_PCLKM>;
139+
gpio-controller;
140+
#gpio-cells = <2>;
141+
gpio-ranges = <&pinctrl 0 0 288>;
142+
power-domains = <&cpg>;
143+
144+
serial0-pins {
145+
pinmux = <RZT2H_PORT_PINMUX(38, 0, 1)>, /* Tx */
146+
<RZT2H_PORT_PINMUX(38, 1, 1)>; /* Rx */
147+
};
148+
149+
sd1-pwr-en-hog {
150+
gpio-hog;
151+
gpios = <RZT2H_GPIO(39, 2) 0>;
152+
output-high;
153+
line-name = "sd1_pwr_en";
154+
};
155+
156+
i2c0-pins {
157+
pins = "RIIC0_SDA", "RIIC0_SCL";
158+
input-enable;
159+
};
160+
161+
sd0-sd-group {
162+
ctrl-pins {
163+
pinmux = <RZT2H_PORT_PINMUX(12, 0, 0x29)>, /* SD0_CLK */
164+
<RZT2H_PORT_PINMUX(12, 1, 0x29)>; /* SD0_CMD */
165+
};
166+
167+
data-pins {
168+
pinmux = <RZT2H_PORT_PINMUX(12, 0, 0x29)>, /* SD0_CLK */
169+
<RZT2H_PORT_PINMUX(12, 1, 0x29)>; /* SD0_CMD */
170+
};
171+
};
172+
};

drivers/clk/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,7 @@ config COMMON_CLK_LOCHNAGAR
364364
config COMMON_CLK_NPCM8XX
365365
tristate "Clock driver for the NPCM8XX SoC Family"
366366
depends on ARCH_NPCM || COMPILE_TEST
367+
select AUXILIARY_BUS
367368
help
368369
This driver supports the clocks on the Nuvoton BMC NPCM8XX SoC Family,
369370
all the clocks are initialized by the bootloader, so this driver

drivers/clk/actions/owl-common.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ static const struct regmap_config owl_regmap_config = {
1818
.reg_stride = 4,
1919
.val_bits = 32,
2020
.max_register = 0x00cc,
21-
.fast_io = true,
2221
};
2322

2423
static void owl_clk_set_regmap(const struct owl_clk_desc *desc,

drivers/clk/clk-axi-clkgen.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ static int axi_clkgen_setup_limits(struct axi_clkgen *axi_clkgen,
540540
default:
541541
return dev_err_probe(dev, -ENODEV, "Unknown speed grade %d\n",
542542
speed_grade);
543-
};
543+
}
544544

545545
/* Overwrite vco limits for ultrascale+ */
546546
if (tech == ADI_AXI_FPGA_TECH_ULTRASCALE_PLUS) {

drivers/clk/clk-axm5516.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,6 @@ static const struct regmap_config axmclk_regmap_config = {
529529
.reg_stride = 4,
530530
.val_bits = 32,
531531
.max_register = 0x1fffc,
532-
.fast_io = true,
533532
};
534533

535534
static const struct of_device_id axmclk_match_table[] = {

drivers/clk/clk-ep93xx.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,9 +486,10 @@ static const struct ep93xx_gate ep93xx_uarts[] = {
486486
static int ep93xx_uart_clock_init(struct ep93xx_clk_priv *priv)
487487
{
488488
struct clk_parent_data parent_data = { };
489-
unsigned int i, idx, ret, clk_uart_div;
489+
unsigned int i, idx, clk_uart_div;
490490
struct ep93xx_clk *clk;
491491
u32 val;
492+
int ret;
492493

493494
regmap_read(priv->map, EP93XX_SYSCON_PWRCNT, &val);
494495
if (val & EP93XX_SYSCON_PWRCNT_UARTBAUD)

drivers/clk/nxp/clk-lpc32xx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@ static const struct regmap_config lpc32xx_scb_regmap_config = {
6868
.reg_stride = 4,
6969
.val_format_endian = REGMAP_ENDIAN_LITTLE,
7070
.max_register = 0x114,
71-
.fast_io = true,
7271
};
7372

7473
static struct regmap *clk_regmap;

drivers/clk/qcom/a53-pll.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ static const struct regmap_config a53pll_regmap_config = {
3333
.reg_stride = 4,
3434
.val_bits = 32,
3535
.max_register = 0x40,
36-
.fast_io = true,
3736
};
3837

3938
static struct pll_freq_tbl *qcom_a53pll_get_freq_tbl(struct device *dev)

drivers/clk/qcom/a7-pll.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ static const struct regmap_config a7pll_regmap_config = {
5050
.reg_stride = 4,
5151
.val_bits = 32,
5252
.max_register = 0x1000,
53-
.fast_io = true,
5453
};
5554

5655
static int qcom_a7pll_probe(struct platform_device *pdev)

0 commit comments

Comments
 (0)