Skip to content

Commit 9dd7a5a

Browse files
committed
Merge tag 'visconti-arm-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti into arm/dt
Visconti device tree updates for 5.19 - Update the clock providers for PCIe host controller - Update the clock providers for ethernet device - Update the clock providers for SPI - Update the clock providers for watchdog timer - Update the clock providers for I2C - Update the clock providers for UART - Add clock controller support for TMPV7708 * tag 'visconti-arm-dt-for-v5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/iwamatsu/linux-visconti: arm64: dts: visconti: Update the clock providers for PCIe host controller arm64: dts: visconti: Update the clock providers for ethernet device arm64: dts: visconti: Update the clock providers for SPI arm64: dts: visconti: Update the clock providers for watchdog timer arm64: dts: visconti: Update the clock providers for I2C arm64: dts: visconti: Update the clock providers for UART arm64: dts: visconti: Add clock controller support for TMPV7708 Link: https://lore.kernel.org/r/TYWPR01MB94201E842A2F8E5E9EBF740D92C99@TYWPR01MB9420.jpnprd01.prod.outlook.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 045d0c3 + 5d3b6ed commit 9dd7a5a

File tree

4 files changed

+53
-62
lines changed

4 files changed

+53
-62
lines changed

arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,16 @@
3232

3333
&uart0 {
3434
status = "okay";
35-
clocks = <&uart_clk>;
36-
clock-names = "apb_pclk";
3735
};
3836

3937
&uart1 {
4038
status = "okay";
41-
clocks = <&uart_clk>;
42-
clock-names = "apb_pclk";
4339
};
4440

4541
&piether {
4642
status = "okay";
4743
phy-handle = <&phy0>;
4844
phy-mode = "rgmii-id";
49-
clocks = <&clk300mhz>, <&clk125mhz>;
50-
clock-names = "stmmaceth", "phy_ref_clk";
5145

5246
mdio0 {
5347
#address-cells = <1>;
@@ -62,7 +56,6 @@
6256

6357
&wdt {
6458
status = "okay";
65-
clocks = <&wdt_clk>;
6659
};
6760

6861
&gpio {
@@ -79,6 +72,4 @@
7972

8073
&pcie {
8174
status = "okay";
82-
clocks = <&extclk100mhz>, <&clk600mhz>, <&clk25mhz>;
83-
clock-names = "ref", "core", "aux";
8475
};

arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrb.dts

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,22 +32,16 @@
3232

3333
&uart0 {
3434
status = "okay";
35-
clocks = <&uart_clk>;
36-
clock-names = "apb_pclk";
3735
};
3836

3937
&uart1 {
4038
status = "okay";
41-
clocks = <&uart_clk>;
42-
clock-names = "apb_pclk";
4339
};
4440

4541
&piether {
4642
status = "okay";
4743
phy-handle = <&phy0>;
4844
phy-mode = "rgmii-id";
49-
clocks = <&clk300mhz>, <&clk125mhz>;
50-
clock-names = "stmmaceth", "phy_ref_clk";
5145

5246
mdio0 {
5347
#address-cells = <1>;

arch/arm64/boot/dts/toshiba/tmpv7708-visrobo-vrc.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
&wdt {
1515
status = "okay";
16-
clocks = <&wdt_clk>;
1716
};
1817

1918
&gpio {
@@ -26,8 +25,6 @@
2625

2726
&spi0 {
2827
status = "okay";
29-
clocks = <&clk300mhz>, <&clk150mhz>;
30-
clock-names = "sspclk", "apb_pclk";
3128

3229
mmc-slot@0 {
3330
compatible = "mmc-spi-slot";
@@ -40,5 +37,4 @@
4037

4138
&i2c0 {
4239
status = "okay";
43-
clocks = <&clk150mhz>;
4440
};

arch/arm64/boot/dts/toshiba/tmpv7708.dtsi

Lines changed: 53 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*
88
*/
99

10+
#include <dt-bindings/clock/toshiba,tmpv770x.h>
1011
#include <dt-bindings/interrupt-controller/irq.h>
1112
#include <dt-bindings/interrupt-controller/arm-gic.h>
1213

@@ -128,57 +129,16 @@
128129
<GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;
129130
};
130131

131-
uart_clk: uart-clk {
132-
compatible = "fixed-clock";
133-
clock-frequency = <150000000>;
134-
#clock-cells = <0>;
135-
};
136-
137-
clk25mhz: clk25mhz {
138-
compatible = "fixed-clock";
139-
#clock-cells = <0>;
140-
clock-frequency = <25000000>;
141-
clock-output-names = "clk25mhz";
142-
};
143-
144-
clk125mhz: clk125mhz {
145-
compatible = "fixed-clock";
146-
clock-frequency = <125000000>;
147-
#clock-cells = <0>;
148-
clock-output-names = "clk125mhz";
149-
};
150-
151-
clk150mhz: clk150mhz {
152-
compatible = "fixed-clock";
153-
clock-frequency = <150000000>;
154-
#clock-cells = <0>;
155-
clock-output-names = "clk150mhz";
156-
};
157-
158-
clk300mhz: clk300mhz {
159-
compatible = "fixed-clock";
160-
clock-frequency = <300000000>;
161-
#clock-cells = <0>;
162-
clock-output-names = "clk300mhz";
163-
};
164-
165-
clk600mhz: clk600mhz {
166-
compatible = "fixed-clock";
167-
#clock-cells = <0>;
168-
clock-frequency = <600000000>;
169-
clock-output-names = "clk600mhz";
170-
};
171-
172132
extclk100mhz: extclk100mhz {
173133
compatible = "fixed-clock";
174134
#clock-cells = <0>;
175135
clock-frequency = <100000000>;
176136
clock-output-names = "extclk100mhz";
177137
};
178138

179-
wdt_clk: wdt-clk {
139+
osc2_clk: osc2-clk {
180140
compatible = "fixed-clock";
181-
clock-frequency = <150000000>;
141+
clock-frequency = <20000000>;
182142
#clock-cells = <0>;
183143
};
184144

@@ -216,12 +176,28 @@
216176
interrupt-parent = <&gic>;
217177
};
218178

179+
pipllct: clock-controller@24220000 {
180+
compatible = "toshiba,tmpv7708-pipllct";
181+
reg = <0 0x24220000 0 0x820>;
182+
#clock-cells = <1>;
183+
clocks = <&osc2_clk>;
184+
};
185+
186+
pismu: syscon@24200000 {
187+
compatible = "toshiba,tmpv7708-pismu", "syscon";
188+
reg = <0 0x24200000 0 0x2140>;
189+
#clock-cells = <1>;
190+
#reset-cells = <1>;
191+
};
192+
219193
uart0: serial@28200000 {
220194
compatible = "arm,pl011", "arm,primecell";
221195
reg = <0 0x28200000 0 0x1000>;
222196
interrupts = <GIC_SPI 133 IRQ_TYPE_LEVEL_HIGH>;
223197
pinctrl-names = "default";
224198
pinctrl-0 = <&uart0_pins>;
199+
clocks = <&pismu TMPV770X_CLK_PIUART0>;
200+
clock-names = "apb_pclk";
225201
status = "disabled";
226202
};
227203

@@ -231,6 +207,8 @@
231207
interrupts = <GIC_SPI 134 IRQ_TYPE_LEVEL_HIGH>;
232208
pinctrl-names = "default";
233209
pinctrl-0 = <&uart1_pins>;
210+
clocks = <&pismu TMPV770X_CLK_PIUART1>;
211+
clock-names = "apb_pclk";
234212
status = "disabled";
235213
};
236214

@@ -240,6 +218,8 @@
240218
interrupts = <GIC_SPI 135 IRQ_TYPE_LEVEL_HIGH>;
241219
pinctrl-names = "default";
242220
pinctrl-0 = <&uart2_pins>;
221+
clocks = <&pismu TMPV770X_CLK_PIUART2>;
222+
clock-names = "apb_pclk";
243223
status = "disabled";
244224
};
245225

@@ -249,6 +229,8 @@
249229
interrupts = <GIC_SPI 136 IRQ_TYPE_LEVEL_HIGH>;
250230
pinctrl-names = "default";
251231
pinctrl-0 = <&uart3_pins>;
232+
clocks = <&pismu TMPV770X_CLK_PIUART2>;
233+
clock-names = "apb_pclk";
252234
status = "disabled";
253235
};
254236

@@ -261,6 +243,7 @@
261243
clock-frequency = <400000>;
262244
#address-cells = <1>;
263245
#size-cells = <0>;
246+
clocks = <&pismu TMPV770X_CLK_PII2C0>;
264247
status = "disabled";
265248
};
266249

@@ -273,6 +256,7 @@
273256
clock-frequency = <400000>;
274257
#address-cells = <1>;
275258
#size-cells = <0>;
259+
clocks = <&pismu TMPV770X_CLK_PII2C1>;
276260
status = "disabled";
277261
};
278262

@@ -285,6 +269,7 @@
285269
clock-frequency = <400000>;
286270
#address-cells = <1>;
287271
#size-cells = <0>;
272+
clocks = <&pismu TMPV770X_CLK_PII2C2>;
288273
status = "disabled";
289274
};
290275

@@ -297,6 +282,7 @@
297282
clock-frequency = <400000>;
298283
#address-cells = <1>;
299284
#size-cells = <0>;
285+
clocks = <&pismu TMPV770X_CLK_PII2C3>;
300286
status = "disabled";
301287
};
302288

@@ -309,6 +295,7 @@
309295
clock-frequency = <400000>;
310296
#address-cells = <1>;
311297
#size-cells = <0>;
298+
clocks = <&pismu TMPV770X_CLK_PII2C4>;
312299
status = "disabled";
313300
};
314301

@@ -321,6 +308,7 @@
321308
clock-frequency = <400000>;
322309
#address-cells = <1>;
323310
#size-cells = <0>;
311+
clocks = <&pismu TMPV770X_CLK_PII2C5>;
324312
status = "disabled";
325313
};
326314

@@ -333,6 +321,7 @@
333321
clock-frequency = <400000>;
334322
#address-cells = <1>;
335323
#size-cells = <0>;
324+
clocks = <&pismu TMPV770X_CLK_PII2C6>;
336325
status = "disabled";
337326
};
338327

@@ -345,6 +334,7 @@
345334
clock-frequency = <400000>;
346335
#address-cells = <1>;
347336
#size-cells = <0>;
337+
clocks = <&pismu TMPV770X_CLK_PII2C7>;
348338
status = "disabled";
349339
};
350340

@@ -357,6 +347,7 @@
357347
clock-frequency = <400000>;
358348
#address-cells = <1>;
359349
#size-cells = <0>;
350+
clocks = <&pismu TMPV770X_CLK_PII2C8>;
360351
status = "disabled";
361352
};
362353

@@ -369,6 +360,8 @@
369360
num-cs = <1>;
370361
#address-cells = <1>;
371362
#size-cells = <0>;
363+
clocks = <&pismu TMPV770X_CLK_PISPI1>;
364+
clock-names = "apb_pclk";
372365
status = "disabled";
373366
};
374367

@@ -381,6 +374,8 @@
381374
num-cs = <1>;
382375
#address-cells = <1>;
383376
#size-cells = <0>;
377+
clocks = <&pismu TMPV770X_CLK_PISPI1>;
378+
clock-names = "apb_pclk";
384379
status = "disabled";
385380
};
386381

@@ -393,6 +388,8 @@
393388
num-cs = <1>;
394389
#address-cells = <1>;
395390
#size-cells = <0>;
391+
clocks = <&pismu TMPV770X_CLK_PISPI2>;
392+
clock-names = "apb_pclk";
396393
status = "disabled";
397394
};
398395

@@ -405,6 +402,8 @@
405402
num-cs = <1>;
406403
#address-cells = <1>;
407404
#size-cells = <0>;
405+
clocks = <&pismu TMPV770X_CLK_PISPI3>;
406+
clock-names = "apb_pclk";
408407
status = "disabled";
409408
};
410409

@@ -417,6 +416,8 @@
417416
num-cs = <1>;
418417
#address-cells = <1>;
419418
#size-cells = <0>;
419+
clocks = <&pismu TMPV770X_CLK_PISPI4>;
420+
clock-names = "apb_pclk";
420421
status = "disabled";
421422
};
422423

@@ -429,6 +430,8 @@
429430
num-cs = <1>;
430431
#address-cells = <1>;
431432
#size-cells = <0>;
433+
clocks = <&pismu TMPV770X_CLK_PISPI5>;
434+
clock-names = "apb_pclk";
432435
status = "disabled";
433436
};
434437

@@ -441,6 +444,8 @@
441444
num-cs = <1>;
442445
#address-cells = <1>;
443446
#size-cells = <0>;
447+
clocks = <&pismu TMPV770X_CLK_PISPI6>;
448+
clock-names = "apb_pclk";
444449
status = "disabled";
445450
};
446451

@@ -452,12 +457,15 @@
452457
snps,txpbl = <4>;
453458
snps,rxpbl = <4>;
454459
snps,tso;
460+
clocks = <&pismu TMPV770X_CLK_PIETHER_BUS>, <&pismu TMPV770X_CLK_PIETHER_125M>;
461+
clock-names = "stmmaceth", "phy_ref_clk";
455462
status = "disabled";
456463
};
457464

458465
wdt: wdt@28330000 {
459466
compatible = "toshiba,visconti-wdt";
460467
reg = <0 0x28330000 0 0x1000>;
468+
clocks = <&pismu TMPV770X_CLK_WDTCLK>;
461469
status = "disabled";
462470
};
463471

@@ -498,6 +506,8 @@
498506
0 0 0 3 &gic GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH
499507
0 0 0 4 &gic GIC_SPI 215 IRQ_TYPE_LEVEL_HIGH>;
500508
max-link-speed = <2>;
509+
clocks = <&extclk100mhz>, <&pismu TMPV770X_CLK_PCIE_MSTR>, <&pismu TMPV770X_CLK_PCIE_AUX>;
510+
clock-names = "ref", "core", "aux";
501511
status = "disabled";
502512
};
503513
};

0 commit comments

Comments
 (0)