UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAmQ3rWMACgkQa3ZZB4FH
 cJ71Bg/+I8/JSiGupExCkzAlmRbwpFkOXx0VEoWNclAWOTeQxBGm6mjG3w5hGTUm
 2JB/+fSxO56jbuiUzIglm7fUbbHQJVunZLiIXqLi2PJlXJlqLgOzOABJow+nwPvZ
 utOwy52gs0aler/V9SSRDJIRol1UratwkxX1Xo8izNgaKxP3Ru4W5uITlDZvrEDb
 EAFxxpv7QsJQTssGmCu6N5FYd1C4pgsULzEY5kh5JagR4A0Ngygte1LhNc6xHYZL
 DREYCat9UMwP3ZX5J2xV9rooz+79dudYmXiFbP1yJdyx0XQLtQzNQccXfwEMT8W1
 rhJdh9k/JDeDf4uKqtLq+LcnTWphk8Afy/WMU6h89T5gkB3CTekGe/PBoYQHndlZ
 cSxmp+0ZO9o/pEoq5tTQNVwizn08qVXr2iTr+B+t9WhyiBnjafCijdhi2d770D2N
 C0LNLlhAn+ao7MhcHr4wrUoUNoqjzFpvaTg70pcZlbFx/wi9QH1j9AeFQTxMbeS8
 klz44DWknOdRX5AcQRf/V+eRG93jlcDbdu7grvBJ2fwXlpwcUiyCrzETNzC3aiww
 MpSvBNnnYS5/PxJsK2xQ2EowuZ1J/xNonQEwZA1w0krhVZzspnXfi5X2h+oB9n+c
 4thCUytRAnlvhQv5Sk13Ycx7A2C4thHDTNovvQzJ0xbFKVHg2vU=
 =sPZX
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEiK/NIGsWEZVxh/FrYKtH/8kJUicFAmQ5eEwACgkQYKtH/8kJ
 Uiex4w//f2oY8GQO5F6wVALJTVByjhRuDakc07E6yZLzgjEk4wVKLr5t0TUiAkVx
 on7TqfomKSLgZxmRD1EqdQkMiCLqpv8HsdyYNm2U0uqXo/gBDSGuCnAFzQLa3cpT
 OfnuXQZCsUbHaKRqzhFp08GLmlkjTQXmczh0ejG/Bv+Ethl1XL+CcHftvR2aeZJx
 S3xC5UhgvE+s3zU+67q4r1Hhv4RPl2FoPsL9Y+JExkkmHlHnxOW7tBt0POijZ3Pa
 iW67LISEkYqg64zQCf+htfKyz45YAuweq8D8cy/RM677hbCnSolrmxjr4CcFhIwr
 5EqtLOVx2VKRbOOViYyYNtvSg0c8xXb+9VKja9Qx8tnjd4yb26DL72tlGtBCzJvX
 RUN8dFBF47rkzoPhpImpzliQIipw1aAaFYalCwSUUsKMgXil6Y97Edhr5A2AOokS
 wpi8pUZ5v8OO4nDIF3we1sK1qRf+BsfiE5IND8lnYeUfuc5RterX+jrDVbeuZcQJ
 J+hocUmGY7OXgIpvdWEunA8OEzwgVXAcFdKfvMRffvP2WuieqxJEPbUH4hacx/rx
 SsPgwyXA+/tMA9S6zE5SVefPqxwP0FzdCuG299ELtB6LLlEz4ePUWDvh3vpXiLvb
 FVV8z+xg5DOIbj5IhUchvvBV0MHAOBb9ihATHNIa0FEWpgLS0s4=
 =BuBw
 -----END PGP SIGNATURE-----

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 <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2023-04-14 17:59:07 +02:00
parent 9e0dabbd9b 7d4f0b0df7
commit 0a25e38509
7 changed files with 118 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
arch/arm/boot/dts/aspeed-bmc-ampere-mtmitchell.dts
View File

@ -251,6 +251,14 @@
pinctrl-0 = <&pinctrl_rgmii1_default>;
};
&mac3 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii4_default>;
clock-names = "MACCLK", "RCLK";
use-ncsi;
};
&fmc {
status = "okay";
flash@0 {
@ -439,6 +447,26 @@
status = "okay";
};
&i2c8 {
status = "okay";
gpio@77 {
compatible = "nxp,pca9539";
reg = <0x77>;
gpio-controller;
#address-cells = <1>;
#size-cells = <0>;
#gpio-cells = <2>;
bmc-ocp0-en-hog {
gpio-hog;
gpios = <7 GPIO_ACTIVE_LOW>;
output-high;
line-name = "bmc-ocp0-en-n";
};
};
};
&i2c9 {
status = "okay";
};
@ -530,13 +558,20 @@
/*V0-V7*/ "s0-hightemp-n","s0-fault-alert","s0-sys-auth-failure-n",
"host0-reboot-ack-n","host0-ready","host0-shd-req-n",
"host0-shd-ack-n","s0-overtemp-n",
/*W0-W7*/ "ocp-aux-pwren","ocp-main-pwren","ocp-pgood","",
/*W0-W7*/ "","ocp-main-pwren","ocp-pgood","",
"bmc-ok","bmc-ready","spi0-program-sel","spi0-backup-sel",
/*X0-X7*/ "i2c-backup-sel","s1-fault-alert","s1-fw-boot-ok",
"s1-hightemp-n","s0-spi-auth-fail-n","s1-sys-auth-failure-n",
"s1-overtemp-n","s1-spi-auth-fail-n",
/*Y0-Y7*/ "","","","","","","","host0-special-boot",
/*Z0-Z7*/ "reset-button","ps0-pgood","ps1-pgood","","","","","";
ocp-aux-pwren-hog {
gpio-hog;
gpios = <ASPEED_GPIO(W, 0) GPIO_ACTIVE_HIGH>;
output-high;
line-name = "ocp-aux-pwren";
};
};
&gpio1 {

6
arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts
View File

@ -63,7 +63,7 @@
status = "okay";
m25p,fast-read;
label = "bmc";
spi-max-frequency = <100000000>; /* 100 MHz */
spi-max-frequency = <50000000>; /* 50 MHz */
#include "openbmc-flash-layout.dtsi"
};
};
@ -202,3 +202,7 @@
status = "okay";
aspeed,lpc-io-reg = <0xca2>;
};
&peci0 {
status = "okay";
};

4
arch/arm/boot/dts/aspeed-bmc-asrock-romed8hm3.dts
View File

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

53
arch/arm/boot/dts/aspeed-bmc-facebook-greatlakes.dts
View File

@ -156,6 +156,7 @@
&i2c8 {
status = "okay";
mctp-controller;
temperature-sensor@1f {
compatible = "ti,tmp421";
reg = <0x1f>;
@ -165,6 +166,10 @@
compatible = "st,24c32";
reg = <0x50>;
};
mctp@10 {
compatible = "mctp-i2c-controller";
reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;
};
};
&i2c9 {
@ -238,4 +243,52 @@
&gpio0 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_gpiu1_default &pinctrl_gpiu7_default>;
gpio-line-names =
/*A0-A7*/ "","","","","","","","",
/*B0-B7*/ "power-bmc-nic","presence-ocp-debug",
"power-bmc-slot1","power-bmc-slot2",
"power-bmc-slot3","power-bmc-slot4","","",
/*C0-C7*/ "presence-ocp-nic","","","reset-cause-nic-primary",
"reset-cause-nic-secondary","","","",
/*D0-D7*/ "","","","","","","","",
/*E0-E7*/ "","","","","","","","",
/*F0-F7*/ "slot1-bmc-reset-button","slot2-bmc-reset-button",
"slot3-bmc-reset-button","slot4-bmc-reset-button",
"","","","presence-emmc",
/*G0-G7*/ "","","","","","","","",
/*H0-H7*/ "","","","",
"presence-mb-slot1","presence-mb-slot2",
"presence-mb-slot3","presence-mb-slot4",
/*I0-I7*/ "","","","","","","bb-bmc-button","",
/*J0-J7*/ "","","","","","","","",
/*K0-K7*/ "","","","","","","","",
/*L0-L7*/ "","","","","","","","",
/*M0-M7*/ "","power-nic-bmc-enable","","usb-bmc-enable","","reset-cause-usb-hub","","",
/*N0-N7*/ "","","","","bmc-ready","","","",
/*O0-O7*/ "","","","","","","fan0-bmc-cpld-enable","fan1-bmc-cpld-enable",
/*P0-P7*/ "fan2-bmc-cpld-enable","fan3-bmc-cpld-enable",
"reset-cause-pcie-slot1","reset-cause-pcie-slot2",
"reset-cause-pcie-slot3","reset-cause-pcie-slot4","","",
/*Q0-Q7*/ "","","","","","","","",
/*R0-R7*/ "","","","","","","","",
/*S0-S7*/ "","","power-p5v-usb","presence-bmc-tpm","","","","",
/*T0-T7*/ "","","","","","","","",
/*U0-U7*/ "","","","","","","","GND",
/*V0-V7*/ "bmc-slot1-ac-button","bmc-slot2-ac-button",
"bmc-slot3-ac-button","bmc-slot4-ac-button",
"","","","",
/*W0-W7*/ "","","","","","","","",
/*X0-X7*/ "","","","","","","","",
/*Y0-Y7*/ "","","","reset-cause-emmc","","","","",
/*Z0-Z7*/ "","","","","","","","";
};
&gpio1 {
gpio-line-names =
/*18A0-18A7*/ "","","","","","","","",
/*18B0-18B7*/ "","","","","","","","",
/*18C0-18C7*/ "","","","","","","","",
/*18D0-18D7*/ "","","","","","","","",
/*18E0-18E3*/ "","","","","","","","";
};

24
arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts
View File

@ -552,14 +552,14 @@
&i2c3 {
status = "okay";
power-supply@58 {
compatible = "ibm,cffps";
reg = <0x58>;
power-supply@5a {
compatible = "acbel,fsg032";
reg = <0x5a>;
};
power-supply@59 {
compatible = "ibm,cffps";
reg = <0x59>;
power-supply@5b {
compatible = "acbel,fsg032";
reg = <0x5b>;
};
};
@ -686,7 +686,7 @@
};
eeprom@50 {
compatible = "atmel,24c64";
compatible = "atmel,24c128";
reg = <0x50>;
};
@ -884,16 +884,6 @@
use-ncsi;
};
&mac3 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rmii4_default>;
clocks = <&syscon ASPEED_CLK_GATE_MAC4CLK>,
<&syscon ASPEED_CLK_MAC4RCLK>;
clock-names = "MACCLK", "RCLK";
use-ncsi;
};
&wdt1 {
aspeed,reset-type = "none";
aspeed,external-signal;

6
arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts
View File

@ -162,6 +162,11 @@
#size-cells = <1>;
ranges;
event_log: tcg_event_log@b3d00000 {
no-map;
reg = <0xb3d00000 0x100000>;
};
ramoops@b3e00000 {
compatible = "ramoops";
reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */
@ -1887,6 +1892,7 @@
tpm@2e {
compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c";
reg = <0x2e>;
memory-region = <&event_log>;
};
};

9
arch/arm/boot/dts/aspeed-g6.dtsi
View File

@ -863,6 +863,15 @@
clocks = <&syscon ASPEED_CLK_GATE_FSICLK>;
status = "disabled";
};
udma: dma-controller@1e79e000 {
compatible = "aspeed,ast2600-udma";
reg = <0x1e79e000 0x1000>;
interrupts = <GIC_SPI 56 IRQ_TYPE_LEVEL_HIGH>;
dma-channels = <28>;
#dma-cells = <1>;
status = "disabled";
};
};
};
};