Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'nuvoton-6.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
Nuvoton device tree updates for 6.2
- Update fix-partition syntax
- WPCM450 updates for SPI controller, clock, watchdog, serial
- GPIO line names for Supermicro X9SCI-LN4F BMC
* tag 'nuvoton-6.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
ARM: dts: nuvoton: wpcm450: Add missing aliases for serial0/serial1
ARM: dts: wpcm450: Enable watchdog by default
ARM: dts: wpcm450: Add clock controller node
ARM: dts: wpcm450-supermicro-x9sci-ln4f: Add SPI flash
ARM: dts: wpcm450: Add FIU SPI controller node
ARM: dts: nuvoton: Remove bogus unit addresses from fixed-partition nodes
ARM: dts: nuvoton,wpcm450-supermicro-x9sci-ln4f: Add GPIO line names
Link: https://lore.kernel.org/r/CACPK8XffL5_L5D_ZGQid0r4h0wfTc+XBGUO1-0QW7ErPPrrvEQ@mail.gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+75
-15
+1
-1
arch/arm/boot/dts/nuvoton-npcm730-gbs.dts
+1
-1
arch/arm/boot/dts/nuvoton-npcm730-gbs.dts
+1
-1
arch/arm/boot/dts/nuvoton-npcm730-gsj.dts
+1
-1
arch/arm/boot/dts/nuvoton-npcm730-gsj.dts
+3
-3
arch/arm/boot/dts/nuvoton-npcm730-kudo.dts
+3
-3
arch/arm/boot/dts/nuvoton-npcm730-kudo.dts
···
388
388
spi-max-frequency = <5000000>;
389
389
spi-rx-bus-width = <2>;
390
390
label = "bmc";
391
-
partitions@80000000 {
391
+
partitions {
392
392
compatible = "fixed-partitions";
393
393
#address-cells = <1>;
394
394
#size-cells = <1>;
···
422
422
reg = <1>;
423
423
spi-max-frequency = <5000000>;
424
424
spi-rx-bus-width = <2>;
425
-
partitions@88000000 {
425
+
partitions {
426
426
compatible = "fixed-partitions";
427
427
#address-cells = <1>;
428
428
#size-cells = <1>;
···
447
447
reg = <0>;
448
448
spi-max-frequency = <5000000>;
449
449
spi-rx-bus-width = <2>;
450
-
partitions@A0000000 {
450
+
partitions {
451
451
compatible = "fixed-partitions";
452
452
#address-cells = <1>;
453
453
#size-cells = <1>;
+2
-2
arch/arm/boot/dts/nuvoton-npcm750-evb.dts
+2
-2
arch/arm/boot/dts/nuvoton-npcm750-evb.dts
···
74
74
spi-rx-bus-width = <2>;
75
75
reg = <0>;
76
76
spi-max-frequency = <5000000>;
77
-
partitions@80000000 {
77
+
partitions {
78
78
compatible = "fixed-partitions";
79
79
#address-cells = <1>;
80
80
#size-cells = <1>;
···
135
135
spi-rx-bus-width = <2>;
136
136
reg = <0>;
137
137
spi-max-frequency = <5000000>;
138
-
partitions@A0000000 {
138
+
partitions {
139
139
compatible = "fixed-partitions";
140
140
#address-cells = <1>;
141
141
#size-cells = <1>;
+3
-3
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts
+3
-3
arch/arm/boot/dts/nuvoton-npcm750-runbmc-olympus.dts
···
107
107
reg = <0>;
108
108
spi-rx-bus-width = <2>;
109
109
110
-
partitions@80000000 {
110
+
partitions {
111
111
compatible = "fixed-partitions";
112
112
#address-cells = <1>;
113
113
#size-cells = <1>;
···
146
146
reg = <1>;
147
147
npcm,fiu-rx-bus-width = <2>;
148
148
149
-
partitions@88000000 {
149
+
partitions {
150
150
compatible = "fixed-partitions";
151
151
#address-cells = <1>;
152
152
#size-cells = <1>;
···
173
173
reg = <0>;
174
174
spi-rx-bus-width = <2>;
175
175
176
-
partitions@A0000000 {
176
+
partitions {
177
177
compatible = "fixed-partitions";
178
178
#address-cells = <1>;
179
179
#size-cells = <1>;
+32
-4
arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts
+32
-4
arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts
···
15
15
model = "Supermicro X9SCi-LN4F BMC";
16
16
compatible = "supermicro,x9sci-ln4f-bmc", "nuvoton,wpcm450";
17
17
18
+
aliases {
19
+
serial0 = &serial0;
20
+
serial1 = &serial1;
21
+
};
22
+
18
23
chosen {
19
24
stdout-path = "serial0:115200n8";
20
25
};
···
58
53
};
59
54
};
60
55
56
+
&fiu {
57
+
status = "okay";
58
+
59
+
flash@0 {
60
+
reg = <0>;
61
+
compatible = "jedec,spi-nor";
62
+
};
63
+
};
64
+
65
+
&gpio0 {
66
+
gpio-line-names =
67
+
/* 0 */ "", "host-reset-control-n", "", "", "", "", "", "",
68
+
/* 8 */ "", "", "", "", "power-chassis-control-n", "", "uid-button", "";
69
+
};
70
+
71
+
&gpio1 {
72
+
gpio-line-names =
73
+
/* 0 */ "", "", "", "", "led-heartbeat", "", "", "led-uid",
74
+
/* 8 */ "", "", "", "", "", "", "", "";
75
+
};
76
+
77
+
&gpio4 {
78
+
gpio-line-names =
79
+
/* 0 */ "", "", "", "", "", "", "", "",
80
+
/* 8 */ "", "", "", "", "", "", "", "power-chassis-good";
81
+
};
82
+
61
83
&pinctrl {
62
84
key_pins: mux-keys {
63
85
groups = "gspi", "sspi";
···
107
75
108
76
&serial1 {
109
77
/* "Serial over LAN" port. Connected to ttyS2 of the host system. */
110
-
status = "okay";
111
-
};
112
-
113
-
&watchdog0 {
114
78
status = "okay";
115
79
};
+33
-1
arch/arm/boot/dts/nuvoton-wpcm450.dtsi
+33
-1
arch/arm/boot/dts/nuvoton-wpcm450.dtsi
···
37
37
#clock-cells = <0>;
38
38
};
39
39
40
+
refclk: clock-48mhz {
41
+
/* 48 MHz reference oscillator */
42
+
compatible = "fixed-clock";
43
+
clock-output-names = "ref";
44
+
clock-frequency = <48000000>;
45
+
#clock-cells = <0>;
46
+
};
47
+
40
48
soc {
41
49
compatible = "simple-bus";
42
50
#address-cells = <1>;
···
55
47
gcr: syscon@b0000000 {
56
48
compatible = "nuvoton,wpcm450-gcr", "syscon", "simple-mfd";
57
49
reg = <0xb0000000 0x200>;
50
+
};
51
+
52
+
clk: clock-controller@b0000200 {
53
+
compatible = "nuvoton,wpcm450-clk";
54
+
reg = <0xb0000200 0x100>;
55
+
clocks = <&refclk>;
56
+
clock-names = "ref";
57
+
#clock-cells = <1>;
58
+
#reset-cells = <1>;
58
59
};
59
60
60
61
serial0: serial@b8000000 {
···
98
81
interrupts = <1 IRQ_TYPE_LEVEL_HIGH>;
99
82
reg = <0xb800101c 0x4>;
100
83
clocks = <&clk24m>;
101
-
status = "disabled";
102
84
};
103
85
104
86
aic: interrupt-controller@b8002000 {
···
471
455
groups = "hg7";
472
456
function = "hg7";
473
457
};
458
+
};
459
+
460
+
fiu: spi-controller@c8000000 {
461
+
compatible = "nuvoton,wpcm450-fiu";
462
+
#address-cells = <1>;
463
+
#size-cells = <0>;
464
+
reg = <0xc8000000 0x1000>, <0xc0000000 0x4000000>;
465
+
reg-names = "control", "memory";
466
+
clocks = <&clk 0>;
467
+
status = "disabled";
468
+
};
469
+
470
+
shm: syscon@c8001000 {
471
+
compatible = "nuvoton,wpcm450-shm", "syscon";
472
+
reg = <0xc8001000 0x1000>;
473
+
reg-io-width = <1>;
474
474
};
475
475
};
476
476
};