Skip to content

Commit 0a25e38

Browse files
arndbarndb
committed
Merge tag 'aspeed-6.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into soc/dt
ASPEED device tree updates for 6.4 - Fixes for romed8hm3 GPIO, asrock SPI clocks, bonnell eeprom - Misc updates for various BMC systems - Add AST2600 UDMA node * tag 'aspeed-6.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: ARM: dts: aspeed-g6: Add UDMA node ARM: dts: aspeed: greatlakes: add mctp device ARM: dts: aspeed: greatlakes: Add gpio names ARM: dts: aspeed: p10bmc: Change power supply info ARM: dts: aspeed: bonnell: Update eeprom size ARM: dts: aspeed: bonnell: Remove MAC3 ARM: dts: aspeed: everest: Add reserved memory for TPM event log ARM: dts: aspeed: mtmitchell: Enable NCSI ARM: dts: aspeed: asrock: Correct firmware flash SPI clocks ARM: dts: aspeed: e3c246d4i: Add PECI device ARM: dts: aspeed: romed8hm3: Fix GPIO polarity of system-fault LED Link: https://lore.kernel.org/r/CACPK8XfmK5S=1PQjBQHb6daDR3qTWN-_NLoXP7+ZDCk13wDxcA@mail.gmail.com Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 9e0dabb + 7d4f0b0 commit 0a25e38

7 files changed

+118
-21
lines changed

‎arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,14 @@
251251
pinctrl-0 = <&pinctrl_rgmii1_default>;
252252
};
253253

254+
&mac3 {
255+
status = "okay";
256+
pinctrl-names = "default";
257+
pinctrl-0 = <&pinctrl_rmii4_default>;
258+
clock-names = "MACCLK", "RCLK";
259+
use-ncsi;
260+
};
261+
254262
&fmc {
255263
status = "okay";
256264
flash@0 {
@@ -439,6 +447,26 @@
439447
status = "okay";
440448
};
441449

450+
&i2c8 {
451+
status = "okay";
452+
453+
gpio@77 {
454+
compatible = "nxp,pca9539";
455+
reg = <0x77>;
456+
gpio-controller;
457+
#address-cells = <1>;
458+
#size-cells = <0>;
459+
#gpio-cells = <2>;
460+
461+
bmc-ocp0-en-hog {
462+
gpio-hog;
463+
gpios = <7 GPIO_ACTIVE_LOW>;
464+
output-high;
465+
line-name = "bmc-ocp0-en-n";
466+
};
467+
};
468+
};
469+
442470
&i2c9 {
443471
status = "okay";
444472
};
@@ -530,13 +558,20 @@
530558
/*V0-V7*/ "s0-hightemp-n","s0-fault-alert","s0-sys-auth-failure-n",
531559
"host0-reboot-ack-n","host0-ready","host0-shd-req-n",
532560
"host0-shd-ack-n","s0-overtemp-n",
533-
/*W0-W7*/ "ocp-aux-pwren","ocp-main-pwren","ocp-pgood","",
561+
/*W0-W7*/ "","ocp-main-pwren","ocp-pgood","",
534562
"bmc-ok","bmc-ready","spi0-program-sel","spi0-backup-sel",
535563
/*X0-X7*/ "i2c-backup-sel","s1-fault-alert","s1-fw-boot-ok",
536564
"s1-hightemp-n","s0-spi-auth-fail-n","s1-sys-auth-failure-n",
537565
"s1-overtemp-n","s1-spi-auth-fail-n",
538566
/*Y0-Y7*/ "","","","","","","","host0-special-boot",
539567
/*Z0-Z7*/ "reset-button","ps0-pgood","ps1-pgood","","","","","";
568+
569+
ocp-aux-pwren-hog {
570+
gpio-hog;
571+
gpios = <ASPEED_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
572+
output-high;
573+
line-name = "ocp-aux-pwren";
574+
};
540575
};
541576

542577
&gpio1 {

‎arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
status = "okay";
6464
m25p,fast-read;
6565
label = "bmc";
66-
spi-max-frequency = <100000000>; /* 100 MHz */
66+
spi-max-frequency = <50000000>; /* 50 MHz */
6767
#include "openbmc-flash-layout.dtsi"
6868
};
6969
};
@@ -202,3 +202,7 @@
202202
status = "okay";
203203
aspeed,lpc-io-reg = <0xca2>;
204204
};
205+
206+
&peci0 {
207+
status = "okay";
208+
};

‎arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
};
3232

3333
system-fault {
34-
gpios = <&gpio ASPEED_GPIO(Z, 2) GPIO_ACTIVE_LOW>;
34+
gpios = <&gpio ASPEED_GPIO(Z, 2) GPIO_ACTIVE_HIGH>;
3535
panic-indicator;
3636
};
3737
};
@@ -51,7 +51,7 @@
5151
status = "okay";
5252
m25p,fast-read;
5353
label = "bmc";
54-
spi-max-frequency = <100000000>; /* 100 MHz */
54+
spi-max-frequency = <50000000>; /* 50 MHz */
5555
#include "openbmc-flash-layout-64.dtsi"
5656
};
5757
};

‎arch/arm/boot/dts/aspeed-bmc-facebook-greatlakes.dts

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,7 @@
156156

157157
&i2c8 {
158158
status = "okay";
159+
mctp-controller;
159160
temperature-sensor@1f {
160161
compatible = "ti,tmp421";
161162
reg = <0x1f>;
@@ -165,6 +166,10 @@
165166
compatible = "st,24c32";
166167
reg = <0x50>;
167168
};
169+
mctp@10 {
170+
compatible = "mctp-i2c-controller";
171+
reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
172+
};
168173
};
169174

170175
&i2c9 {
@@ -238,4 +243,52 @@
238243
&gpio0 {
239244
pinctrl-names = "default";
240245
pinctrl-0 = <&pinctrl_gpiu1_default &pinctrl_gpiu7_default>;
246+
247+
gpio-line-names =
248+
/*A0-A7*/ "","","","","","","","",
249+
/*B0-B7*/ "power-bmc-nic","presence-ocp-debug",
250+
"power-bmc-slot1","power-bmc-slot2",
251+
"power-bmc-slot3","power-bmc-slot4","","",
252+
/*C0-C7*/ "presence-ocp-nic","","","reset-cause-nic-primary",
253+
"reset-cause-nic-secondary","","","",
254+
/*D0-D7*/ "","","","","","","","",
255+
/*E0-E7*/ "","","","","","","","",
256+
/*F0-F7*/ "slot1-bmc-reset-button","slot2-bmc-reset-button",
257+
"slot3-bmc-reset-button","slot4-bmc-reset-button",
258+
"","","","presence-emmc",
259+
/*G0-G7*/ "","","","","","","","",
260+
/*H0-H7*/ "","","","",
261+
"presence-mb-slot1","presence-mb-slot2",
262+
"presence-mb-slot3","presence-mb-slot4",
263+
/*I0-I7*/ "","","","","","","bb-bmc-button","",
264+
/*J0-J7*/ "","","","","","","","",
265+
/*K0-K7*/ "","","","","","","","",
266+
/*L0-L7*/ "","","","","","","","",
267+
/*M0-M7*/ "","power-nic-bmc-enable","","usb-bmc-enable","","reset-cause-usb-hub","","",
268+
/*N0-N7*/ "","","","","bmc-ready","","","",
269+
/*O0-O7*/ "","","","","","","fan0-bmc-cpld-enable","fan1-bmc-cpld-enable",
270+
/*P0-P7*/ "fan2-bmc-cpld-enable","fan3-bmc-cpld-enable",
271+
"reset-cause-pcie-slot1","reset-cause-pcie-slot2",
272+
"reset-cause-pcie-slot3","reset-cause-pcie-slot4","","",
273+
/*Q0-Q7*/ "","","","","","","","",
274+
/*R0-R7*/ "","","","","","","","",
275+
/*S0-S7*/ "","","power-p5v-usb","presence-bmc-tpm","","","","",
276+
/*T0-T7*/ "","","","","","","","",
277+
/*U0-U7*/ "","","","","","","","GND",
278+
/*V0-V7*/ "bmc-slot1-ac-button","bmc-slot2-ac-button",
279+
"bmc-slot3-ac-button","bmc-slot4-ac-button",
280+
"","","","",
281+
/*W0-W7*/ "","","","","","","","",
282+
/*X0-X7*/ "","","","","","","","",
283+
/*Y0-Y7*/ "","","","reset-cause-emmc","","","","",
284+
/*Z0-Z7*/ "","","","","","","","";
285+
};
286+
287+
&gpio1 {
288+
gpio-line-names =
289+
/*18A0-18A7*/ "","","","","","","","",
290+
/*18B0-18B7*/ "","","","","","","","",
291+
/*18C0-18C7*/ "","","","","","","","",
292+
/*18D0-18D7*/ "","","","","","","","",
293+
/*18E0-18E3*/ "","","","","","","","";
241294
};

‎arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -552,14 +552,14 @@
552552
&i2c3 {
553553
status = "okay";
554554

555-
power-supply@58 {
556-
compatible = "ibm,cffps";
557-
reg = <0x58>;
555+
power-supply@5a {
556+
compatible = "acbel,fsg032";
557+
reg = <0x5a>;
558558
};
559559

560-
power-supply@59 {
561-
compatible = "ibm,cffps";
562-
reg = <0x59>;
560+
power-supply@5b {
561+
compatible = "acbel,fsg032";
562+
reg = <0x5b>;
563563
};
564564
};
565565

@@ -686,7 +686,7 @@
686686
};
687687

688688
eeprom@50 {
689-
compatible = "atmel,24c64";
689+
compatible = "atmel,24c128";
690690
reg = <0x50>;
691691
};
692692

@@ -884,16 +884,6 @@
884884
use-ncsi;
885885
};
886886

887-
&mac3 {
888-
status = "okay";
889-
pinctrl-names = "default";
890-
pinctrl-0 = <&pinctrl_rmii4_default>;
891-
clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>,
892-
<&syscon ASPEED_CLK_MAC4RCLK>;
893-
clock-names = "MACCLK", "RCLK";
894-
use-ncsi;
895-
};
896-
897887
&wdt1 {
898888
aspeed,reset-type = "none";
899889
aspeed,external-signal;

‎arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,11 @@
162162
#size-cells = <1>;
163163
ranges;
164164

165+
event_log: tcg_event_log@b3d00000 {
166+
no-map;
167+
reg = <0xb3d00000 0x100000>;
168+
};
169+
165170
ramoops@b3e00000 {
166171
compatible = "ramoops";
167172
reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */
@@ -1887,6 +1892,7 @@
18871892
tpm@2e {
18881893
compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
18891894
reg = <0x2e>;
1895+
memory-region = <&event_log>;
18901896
};
18911897
};
18921898

‎arch/arm/boot/dts/aspeed-g6.dtsi

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -863,6 +863,15 @@
863863
clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;
864864
status = "disabled";
865865
};
866+
867+
udma: dma-controller@1e79e000 {
868+
compatible = "aspeed,ast2600-udma";
869+
reg = <0x1e79e000 0x1000>;
870+
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
871+
dma-channels = <28>;
872+
#dma-cells = <1>;
873+
status = "disabled";
874+
};
866875
};
867876
};
868877
};

0 commit comments

Comments
 (0)