dlan17/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'aspeed-6.18-devicetree-1' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux into soc/dt

Browse Source 
Further ASPEED devicetree updates for v6.18

New platforms:

- Meta Clemente

  Clemente is a compute-tray platform using an AST2600 SoC

Updated platforms:

- Harma (Meta): Hot-swap controller, power monitoring, GPIO names

There are also some devicetree cleanups from Rob and Krzysztof that touch a
variety of platforms and the DTSIs. These lead to fewer warnings emitted for the
ASPEED devicetrees.

* tag 'aspeed-6.18-devicetree-1' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux:
  ARM: dts: aspeed: Drop syscon "reg-io-width" properties
  ARM: dts: aspeed: Drop "sdhci" compatibles
  ARM: dts: aspeed: Fix/add I2C device vendor prefixes
  ARM: dts: aspeed: Minor whitespace cleanup
  ARM: dts: aspeed: clemente: add Meta Clemente BMC
  ARM: dts: aspeed: Add NCSI3 and NCSI4 pinctrl nodes
  dt-bindings: arm: aspeed: add Meta Clemente board
  ARM: dts: aspeed: harma: add mp5990
  ARM: dts: aspeed: harma: revise gpio name
  ARM: dts: aspeed: harma: add power monitor support

Link: https://lore.kernel.org/r/5793039afcedeb28179a3c9909631d8251abc73e.camel@codeconstruct.com.au
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann
2025-09-15 15:39:03 +02:00
parent d75f5aded4 3708a165a9
commit 10588787c8
23 changed files with 1360 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml
+1
View File
@@ -82,6 +82,7 @@ properties:
- asus,x4tf-bmc
- facebook,bletchley-bmc
- facebook,catalina-bmc
- facebook,clemente-bmc
- facebook,cloudripper-bmc
- facebook,darwin-bmc
- facebook,elbert-bmc
arch/arm/boot/dts/aspeed/Makefile
+1
View File
@@ -19,6 +19,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \
aspeed-bmc-delta-ahe50dc.dtb \
aspeed-bmc-facebook-bletchley.dtb \
aspeed-bmc-facebook-catalina.dtb \
aspeed-bmc-facebook-clemente.dtb \
aspeed-bmc-facebook-cmm.dtb \
aspeed-bmc-facebook-darwin.dtb \
aspeed-bmc-facebook-elbert.dtb \
arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts
+1 -1
View File
@@ -243,7 +243,7 @@
compatible = "ti,tmp75";
reg = <0x49>;
};
temperature-sensor@4a{
temperature-sensor@4a {
compatible = "ti,tmp75";
reg = <0x4a>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts
+1 -1
View File
@@ -171,7 +171,7 @@
reg = <0x50>;
};
dps650ab@58 {
compatible = "dps650ab";
compatible = "delta,dps650ab";
reg = <0x58>;
};
};
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts
+2 -2
View File
@@ -526,11 +526,11 @@
tach-ch = /bits/ 8 <0x03>;
};
};
fanctl0: fan-controller@21{
fanctl0: fan-controller@21 {
compatible = "maxim,max31790";
reg = <0x21>;
};
fanctl1: fan-controller@27{
fanctl1: fan-controller@27 {
compatible = "maxim,max31790";
reg = <0x27>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-clemente.dts
+1283
View File
File diff suppressed because it is too large Load Diff
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts
+26 -17
View File
@@ -183,11 +183,9 @@
&i2c0 {
status = "okay";
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -234,7 +232,7 @@
"","",
"","",
"","",
"","fcb1-activate",
"","fcb2-activate",
"","";
};
};
@@ -257,11 +255,9 @@
&i2c2 {
status = "okay";
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -308,7 +304,7 @@
"","",
"","",
"","",
"","fcb0-activate",
"","fcb1-activate",
"","";
};
};
@@ -373,6 +369,12 @@
compatible = "infineon,xdp710";
reg = <0x40>;
};
power-sensor@45 {
compatible = "ti,ina238";
reg = <0x45>;
shunt-resistor = <500>;
};
};
&i2c5 {
@@ -514,6 +516,10 @@
#address-cells = <1>;
#size-cells = <0>;
reg = <0>;
power-sensor@20 {
compatible = "mps,mp5990";
reg = <0x20>;
};
power-monitor@61 {
compatible = "isil,isl69260";
reg = <0x61>;
@@ -692,14 +698,14 @@
"","",
/*A4-A7 line 8-15*/
"","power-config-asic-module-enable",
"","power-config-asic-power-good",
"","power-config-pdb-power-good",
"power-p3v3-standby","power-config-asic-power-good",
"power-p1v8-good","power-config-pdb-power-good",
"presence-cpu","smi-control-n",
/*B0-B3 line 16-23*/
"","nmi-control-n",
"","nmi-control-sync-flood-n",
"","",
"power-pvdd33-s5","nmi-control-sync-flood-n",
"","",
"power-pvdd18-s5","",
/*B4-B7 line 24-31*/
"","FM_CPU_SP5R1",
"reset-cause-rsmrst","FM_CPU_SP5R2",
@@ -743,7 +749,7 @@
/*F4-F7 line 88-95*/
"presence-asic-modules-0","rt-cpu0-p1-force-enable",
"presence-asic-modules-1","bios-debug-msg-disable",
"","uart-control-buffer-select",
"power-asic-good","uart-control-buffer-select",
"presence-cmm","ac-control-n",
/*G0-G3 line 96-103*/
"FM_CPU_CORETYPE2","",
@@ -795,7 +801,7 @@
"asic0-card-type-detection2-n","",
"uart-switch-lsb","",
"uart-switch-msb","",
"","",
"power-12v-memory-good","",
/*M4-M7 line 200-207*/
"","","","","","","","",
/*N0-N3 line 208-215*/
@@ -803,7 +809,10 @@
/*N4-N7 line 216-223*/
"","","","","","","","",
/*O0-O3 line 224-231*/
"","","","","","","","",
"","",
"irq-pvddcore0-ocp-alert","",
"irq-pvddcore1-ocp-alert","",
"","",
/*O4-O7 line 232-239*/
"","","","","","","","",
/*P0-P3 line 240-247*/
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts
+12 -24
View File
@@ -312,11 +312,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -435,11 +433,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -558,11 +554,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -681,11 +675,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -804,11 +796,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
@@ -926,11 +916,9 @@
reg = <0x50>;
};
pwm@5e{
compatible = "max31790";
pwm@5e {
compatible = "maxim,max31790";
reg = <0x5e>;
#address-cells = <1>;
#size-cells = <0>;
};
power-sensor@40 {
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-santabarbara.dts
+1 -1
View File
@@ -233,7 +233,7 @@
"FM_NIC_PPS_IN_S0_R","FM_NIC_PPS_IN_S1_R";
};
fan-controller@21{
fan-controller@21 {
compatible = "maxim,max31790";
reg = <0x21>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-tiogapass.dts
+1 -1
View File
@@ -508,7 +508,7 @@
status = "okay";
//HSC, AirMax Conn A
adm1278@45 {
compatible = "adm1275";
compatible = "adi,adm1275";
reg = <0x45>;
shunt-resistor-micro-ohms = <250>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-yosemite4.dts
+6 -6
View File
@@ -1186,19 +1186,19 @@
ti,mode = /bits/ 8 <1>;
};
pwm@20{
pwm@20 {
compatible = "maxim,max31790";
reg = <0x20>;
};
gpio@22{
gpio@22 {
compatible = "ti,tca6424";
reg = <0x22>;
gpio-controller;
#gpio-cells = <2>;
};
pwm@2f{
pwm@2f {
compatible = "maxim,max31790";
reg = <0x2f>;
};
@@ -1234,19 +1234,19 @@
ti,mode = /bits/ 8 <1>;
};
pwm@20{
pwm@20 {
compatible = "maxim,max31790";
reg = <0x20>;
};
gpio@22{
gpio@22 {
compatible = "ti,tca6424";
reg = <0x22>;
gpio-controller;
#gpio-cells = <2>;
};
pwm@2f{
pwm@2f {
compatible = "maxim,max31790";
reg = <0x2f>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts
+1 -1
View File
@@ -263,7 +263,7 @@
reg = <0x51>;
};
tca_pres1: tca9554@20{
tca_pres1: tca9554@20 {
compatible = "ti,tca9554";
reg = <0x20>;
#address-cells = <1>;
arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-sbp1.dts
+4 -4
View File
@@ -3778,10 +3778,10 @@
pinctrl-0 = <&U65200_pins>;
pinctrl-names = "default";
U65200_pins: cfg-pins {
pins = "gp60", "gp61", "gp62",
"gp63", "gp64", "gp65", "gp66",
"gp67", "gp70", "gp71", "gp72",
"gp73", "gp74", "gp75", "gp76", "gp77";
pins = "gp60", "gp61", "gp62", "gp63", "gp64",
"gp65", "gp66", "gp67", "gp70", "gp71",
"gp72", "gp73", "gp74", "gp75", "gp76",
"gp77";
function = "gpio";
input-enable;
bias-pull-up;
arch/arm/boot/dts/aspeed/aspeed-bmc-lenovo-hr855xg2.dts
+2 -2
View File
@@ -151,7 +151,7 @@
pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;
};
&adc{
&adc {
status = "okay";
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_adc0_default
@@ -211,7 +211,7 @@
status = "okay";
bus-frequency = <90000>;
HotSwap@10 {
compatible = "adm1272";
compatible = "adi,adm1272";
reg = <0x10>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts
+1 -1
View File
@@ -282,7 +282,7 @@
};
&sgpiom0 {
status="okay";
status = "okay";
ngpios = <128>;
gpio-line-names =
"","",
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-palmetto.dts
+1 -1
View File
@@ -151,7 +151,7 @@
};
rtc@68 {
compatible = "dallas,ds3231";
compatible = "maxim,ds3231";
reg = <0x68>;
};
};
arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts
+1 -1
View File
@@ -64,7 +64,7 @@
linux,code = <ASPEED_GPIO(F, 7)>;
};
event-pcie-e2b-present{
event-pcie-e2b-present {
label = "pcie-e2b-present";
gpios = <&gpio ASPEED_GPIO(E, 7) GPIO_ACTIVE_LOW>;
linux,code = <ASPEED_GPIO(E, 7)>;
arch/arm/boot/dts/aspeed/aspeed-bmc-quanta-s6q.dts
+2 -2
View File
@@ -509,7 +509,7 @@
reg = <1>;
cpu0_pvccin@60 {
compatible = "isil,raa229004";
compatible = "renesas,raa229004";
reg = <0x60>;
};
@@ -530,7 +530,7 @@
reg = <2>;
cpu1_pvccin@72 {
compatible = "isil,raa229004";
compatible = "renesas,raa229004";
reg = <0x72>;
};
arch/arm/boot/dts/aspeed/aspeed-bmc-vegman.dtsi
+1 -1
View File
@@ -30,7 +30,7 @@
reusable;
};
ramoops@9eff0000{
ramoops@9eff0000 {
compatible = "ramoops";
reg = <0x9eff0000 0x10000>;
record-size = <0x2000>;
arch/arm/boot/dts/aspeed/aspeed-g4.dtsi
-1
View File
@@ -356,7 +356,6 @@
lpc: lpc@1e789000 {
compatible = "aspeed,ast2400-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
arch/arm/boot/dts/aspeed/aspeed-g5.dtsi
-2
View File
@@ -273,7 +273,6 @@
gfx: display@1e6e6000 {
compatible = "aspeed,ast2500-gfx", "syscon";
reg = <0x1e6e6000 0x1000>;
reg-io-width = <4>;
clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
resets = <&syscon ASPEED_RESET_CRT1>;
syscon = <&syscon>;
@@ -441,7 +440,6 @@
lpc: lpc@1e789000 {
compatible = "aspeed,ast2500-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
arch/arm/boot/dts/aspeed/aspeed-g6-pinctrl.dtsi
+10
View File
@@ -412,6 +412,16 @@
groups = "MDIO4";
};
pinctrl_ncsi3_default: ncsi3_default {
function = "RMII3";
groups = "NCSI3";
};
pinctrl_ncsi4_default: ncsi4_default {
function = "RMII4";
groups = "NCSI4";
};
pinctrl_ncts1_default: ncts1_default {
function = "NCTS1";
groups = "NCTS1";
arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
+2 -4
View File
@@ -382,7 +382,6 @@
gfx: display@1e6e6000 {
compatible = "aspeed,ast2600-gfx", "syscon";
reg = <0x1e6e6000 0x1000>;
reg-io-width = <4>;
clocks = <&syscon ASPEED_CLK_GATE_D1CLK>;
resets = <&syscon ASPEED_RESET_GRAPHICS>;
syscon = <&syscon>;
@@ -572,7 +571,6 @@
lpc: lpc@1e789000 {
compatible = "aspeed,ast2600-lpc-v2", "simple-mfd", "syscon";
reg = <0x1e789000 0x1000>;
reg-io-width = <4>;
#address-cells = <1>;
#size-cells = <1>;
@@ -662,7 +660,7 @@
status = "disabled";
sdhci0: sdhci@1e740100 {
compatible = "aspeed,ast2600-sdhci", "sdhci";
compatible = "aspeed,ast2600-sdhci";
reg = <0x100 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
sdhci,auto-cmd12;
@@ -671,7 +669,7 @@
};
sdhci1: sdhci@1e740200 {
compatible = "aspeed,ast2600-sdhci", "sdhci";
compatible = "aspeed,ast2600-sdhci";
reg = <0x200 0x100>;
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
sdhci,auto-cmd12;