Skip to content

L
linux
Commit e3bbc53a authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'bmc-5.13-devicetree' of... 

Merge tag 'bmc-5.13-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/dt

BMC device tree updates for 5.13

The ASPEED and Nuvoton pull request now comes as a combined BMC pull
request.

 - New machines

  * ASRock E3C246D4I, an AST2500 BMC for an Xeon E-2100/E-2200 mini-ITX
    system
  * Quanta GBS, an NPCM730 BMC for an x86 server

 - Power10 BMC updates for Everest and Rainier

 - GPIO line names for Mihawk

* tag 'bmc-5.13-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (21 commits)
  ARM: dts: nuvoton: Add Quanta GBS BMC Device Tree
  ARM: dts: aspeed: mihawk: Add GPIO line names
  ARM: dts: aspeed: Add Rainier 1S4U machine
  ARM: dts: aspeed: everest: Add size/address cells
  ARM: dts: aspeed: everest: Enable fan watchdog
  ARM: dts: aspeed: everest: Add RTC
  ARM: dts: aspeed: everest: GPIOs support
  ARM: dts: aspeed: everest: Add UCD90320 power sequencer
  ARM: dts: aspeed: everest: Add power supply i2c devices
  ARM: dts: aspeed: everest: Add pca9552 fan presence
  ARM: dts: aspeed: everest: Add FSI CFAMs and re-number engines
  ARM: dts: aspeed: everest: Add max31785 fan controller device
  ARM: dts: aspeed: everest: Add I2C components
  ARM: dts: aspeed: rainier 4U: Fix fan configuration
  ARM: dts: aspeed: rainier: Add missing fan nodes
  ARM: dts: aspeed: rainier: Enable fan watchdog
  ARM: dts: aspeed: rainier: Add presence GPIOs
  ARM: dts: aspeed: rainier: Add additional processor CFAMs
  ARM: dts: aspeed: rainier: Add gpio-keys-polled for fans
  ARM: dts: aspeed: rainier: Add directly controlled LEDs
  ...

Link: https://lore.kernel.org/r/CACPK8Xe-KV5BeQwOH6NKC1++FCVqwwNCGBh7hEbBORfrmxfTtQ@mail.gmail.comSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d8fcfbf3 ee33e2fb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3678 additions and 108 deletions
arch/arm/boot/dts/Makefile
View file @ e3bbc53a
......@@ -335,6 +335,7 @@ dtb-$(CONFIG_ARCH_LPC32XX) += \
lpc3250-phy3250.dtb
dtb-$(CONFIG_ARCH_NPCM7XX) += \
nuvoton-npcm730-gsj.dtb \
nuvoton-npcm730-gbs.dtb \
nuvoton-npcm730-kudo.dtb \
nuvoton-npcm750-evb.dtb \
nuvoton-npcm750-runbmc-olympus.dtb
......@@ -1414,6 +1415,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-ampere-mtjade.dtb \
aspeed-bmc-arm-centriq2400-rep.dtb \
aspeed-bmc-arm-stardragon4800-rep2.dtb \
aspeed-bmc-asrock-e3c246d4i.dtb \
aspeed-bmc-bytedance-g220a.dtb \
aspeed-bmc-facebook-cmm.dtb \
aspeed-bmc-facebook-galaxy100.dtb \
......@@ -1426,6 +1428,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-facebook-yosemitev2.dtb \
aspeed-bmc-ibm-everest.dtb \
aspeed-bmc-ibm-rainier.dtb \
aspeed-bmc-ibm-rainier-1s4u.dtb \
aspeed-bmc-ibm-rainier-4u.dtb \
aspeed-bmc-intel-s2600wf.dtb \
aspeed-bmc-inspur-fp5280g2.dtb \
......
arch/arm/boot/dts/aspeed-bmc-asrock-e3c246d4i.dts 0 → 100644
View file @ e3bbc53a
// SPDX-License-Identifier: GPL-2.0+
/dts-v1/;
#include "aspeed-g5.dtsi"
#include <dt-bindings/gpio/aspeed-gpio.h>
#include <dt-bindings/i2c/i2c.h>
/{
model = "ASRock E3C246D4I BMC";
compatible = "asrock,e3c246d4i-bmc", "aspeed,ast2500";
aliases {
serial4 = &uart5;
};
chosen {
stdout-path = &uart5;
bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";
};
memory@80000000 {
reg = <0x80000000 0x20000000>;
};
leds {
compatible = "gpio-leds";
heartbeat {
/* BMC_HB_LED_N */
gpios = <&gpio ASPEED_GPIO(H, 6) GPIO_ACTIVE_LOW>;
linux,default-trigger = "timer";
};
system-fault {
/* SYSTEM_FAULT_LED_N */
gpios = <&gpio ASPEED_GPIO(Z, 2) GPIO_ACTIVE_LOW>;
panic-indicator;
};
};
gpio-keys {
compatible = "gpio-keys";
uid-button {
label = "uid-button";
gpios = <&gpio ASPEED_GPIO(F, 1) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(F, 1)>;
};
};
iio-hwmon {
compatible = "iio-hwmon";
io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>, <&adc 4>,
<&adc 5>, <&adc 6>, <&adc 7>, <&adc 8>, <&adc 9>,
<&adc 10>, <&adc 11>, <&adc 12>;
};
};
&fmc {
status = "okay";
flash@0 {
status = "okay";
m25p,fast-read;
label = "bmc";
spi-max-frequency = <100000000>; /* 100 MHz */
#include "openbmc-flash-layout.dtsi"
};
};
&uart5 {
status = "okay";
};
&vuart {
status = "okay";
aspeed,sirq-active-high;
};
&mac0 {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;
};
&i2c1 {
status = "okay";
/* thermal sensor, one diode run to a disconnected header */
w83773g@4c {
compatible = "nuvoton,w83773g";
reg = <0x4c>;
};
};
&i2c3 {
status = "okay";
/* FRU EEPROM */
eeprom@57 {
compatible = "st,24c128", "atmel,24c128";
reg = <0x57>;
pagesize = <16>;
};
};
&video {
status = "okay";
};
&vhub {
status = "okay";
};
&lpc_ctrl {
status = "okay";
};
&lpc_snoop {
status = "okay";
snoop-ports = <0x80>;
};
&gpio {
status = "okay";
gpio-line-names =
/* A */ "BMC_MAC1_INTB", "BMC_MAC2_INTB", "NMI_BTN_N", "BMC_NMI",
"", "", "", "",
/* B */ "", "", "", "", "", "IRQ_BMC_PCH_SMI_LPC_N", "", "",
/* C */ "", "", "", "", "", "", "", "",
/* D */ "BMC_PSIN", "BMC_PSOUT", "BMC_RESETCON", "RESETCON",
"", "", "", "",
/* E */ "", "", "", "", "", "", "", "",
/* F */ "LOCATORLED_STATUS_N", "LOCATORBTN", "", "",
"", "", "BMC_PCH_SCI_LPC", "BMC_NCSI_MUX_CTL",
/* G */ "HWM_BAT_EN", "CHASSIS_ID0", "CHASSIS_ID1", "CHASSIS_ID2",
"BMC_ALERT1_N_R", "BMC_ALERT2_N_R", "BMC_ALERT3_N", "SML0ALERT",
/* H */ "FM_ME_RCVR_N", "O_PWROK", "SKL_CNL_R", "D4_DIMM_EVENT_3V_N",
"MFG_MODE_N", "BMC_RTCRST", "BMC_HB_LED_N", "BMC_CASEOPEN",
/* I */ "", "", "", "", "", "", "", "",
/* J */ "BMC_READY", "BMC_PCH_BIOS_CS_N", "BMC_SMI", "",
"", "", "", "",
/* K */ "", "", "", "", "", "", "", "",
/* L */ "BMC_CTS1", "BMC_DCD1", "BMC_DSR1", "BMC_RI1",
"BMC_DTR1", "BMC_RTS1", "BMC_TXD1", "BMC_RXD1",
/* M */ "BMC_LAN0_DIS_N", "BMC_LAN1_DIS_N", "", "",
"", "", "", "",
/* N */ "", "", "", "", "", "", "", "",
/* O */ "", "", "", "", "", "", "", "",
/* P */ "", "", "", "", "", "", "", "",
/* Q */ "", "", "", "",
"BMC_SBM_PRESENT_1_N", "BMC_SBM_PRESENT_2_N",
"BMC_SBM_PRESENT_3_N", "BMC_PCIE_WAKE_N",
/* R */ "", "", "", "", "", "", "", "",
/* S */ "PCHHOT_BMC_N", "", "RSMRST",
"", "", "", "", "",
/* T */ "", "", "", "", "", "", "", "",
/* U */ "", "", "", "", "", "", "", "",
/* V */ "", "", "", "", "", "", "", "",
/* W */ "PS_PWROK", /* dummy always-high signal */
"", "", "", "", "", "", "",
/* X */ "", "", "", "", "", "", "", "",
/* Y */ "SLP_S3", "SLP_S5", "", "", "", "", "", "",
/* Z */ "CPU_CATERR_BMC_PCH_N", "", "SYSTEM_FAULT_LED_N", "BMC_THROTTLE_N",
"", "", "", "",
/* AA */ "CPU1_THERMTRIP_LATCH_N", "", "CPU1_PROCHOT_N", "",
"", "", "IRQ_SMI_ACTIVE_N", "FM_BIOS_POST_CMPLT_N",
/* AB */ "", "", "ME_OVERRIDE", "BMC_DMI_MODIFY",
"", "", "", "",
/* AC */ "LAD0", "LAD1", "LAD2", "LAD3",
"CK_33M_BMC", "LFRAME", "SERIRQ", "S_PLTRST";
/* Assert BMC_READY so BIOS doesn't sit around waiting for it */
bmc-ready {
gpio-hog;
gpios = <ASPEED_GPIO(J, 0) GPIO_ACTIVE_LOW>;
output-high;
};
};
&adc {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_adc0_default
&pinctrl_adc1_default
&pinctrl_adc2_default
&pinctrl_adc3_default
&pinctrl_adc4_default
&pinctrl_adc5_default
&pinctrl_adc6_default
&pinctrl_adc7_default
&pinctrl_adc8_default
&pinctrl_adc9_default
&pinctrl_adc10_default
&pinctrl_adc11_default
&pinctrl_adc12_default>;
};
&kcs3 {
status = "okay";
aspeed,lpc-io-reg = <0xca2>;
};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-1s4u.dts 0 → 100644
View file @ e3bbc53a
// SPDX-License-Identifier: GPL-2.0-or-later
// Copyright 2021 IBM Corp.
/dts-v1/;
#include "aspeed-bmc-ibm-rainier-4u.dts"
/ {
model = "Rainier 1S4U";
};
&max {
/delete-node/ fan4;
/delete-node/ fan5;
};
arch/arm/boot/dts/aspeed-bmc-ibm-rainier-4u.dts
View file @ e3bbc53a
......@@ -22,16 +22,30 @@ power-supply@6b {
&fan0 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan1 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan2 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan3 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan4 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
&fan5 {
tach-pulses = <4>;
/delete-property/ maxim,fan-dual-tach;
};
arch/arm/boot/dts/aspeed-bmc-opp-mihawk.dts
View file @ e3bbc53a
......@@ -383,6 +383,39 @@ fan@11 {
};
};
&gpio {
gpio-line-names =
/*A0-A7*/ "","cfam-reset","","","","","","",
/*B0-B7*/ "","","","","","","","",
/*C0-C7*/ "","","","","","","","",
/*D0-D7*/ "fsi-enable","","","","","","","",
/*E0-E7*/ "","","","","","fsi-mux","fsi-clock","fsi-data",
/*F0-F7*/ "","id-button","","","","","air-water","",
/*G0-G7*/ "","","","","","","","",
/*H0-H7*/ "","","","","","","","",
/*I0-I7*/ "","","","","","","","",
/*J0-J7*/ "","","checkstop","","","","","",
/*K0-K7*/ "","","","","","","","",
/*L0-L7*/ "","","","","","","","",
/*M0-M7*/ "","","","","","","","",
/*N0-N7*/ "","","","","","","","",
/*O0-O7*/ "","","","","","","","",
/*P0-P7*/ "","","","","","","","",
/*Q0-Q7*/ "","","","","","","","",
/*R0-R7*/ "","","fsi-trans","","","","","",
/*S0-S7*/ "","","","","","","","",
/*T0-T7*/ "","","","","","","","",
/*U0-U7*/ "","","","","","","","",
/*V0-V7*/ "","","","","","","","",
/*W0-W7*/ "","","","","","","","",
/*X0-X7*/ "","","","","","","","",
/*Y0-Y7*/ "","","","","","","","",
/*Z0-Z7*/ "presence-ps1","","presence-ps0","","","","","",
/*AA0-AA7*/ "led-front-fault","power-button","led-front-id","","","","","",
/*AB0-AB7*/ "","","","","","","","",
/*AC0-AC7*/ "","","","","","","","";
};
&fmc {
status = "okay";
flash@0 {
......
arch/arm/boot/dts/nuvoton-npcm730-gbs.dts 0 → 100644
View file @ e3bbc53a
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7