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

+36 -1

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

··· 251 251 pinctrl-0 = <&pinctrl_rgmii1_default>; 252 252 }; 253 253 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 + 254 262 &fmc { 255 263 status = "okay"; 256 264 flash@0 { ··· 447 439 status = "okay"; 448 440 }; 449 441 442 + &i2c8 { 443 + status = "okay"; 444 + 445 + gpio@77 { 446 + compatible = "nxp,pca9539"; 447 + reg = <0x77>; 448 + gpio-controller; 449 + #address-cells = <1>; 450 + #size-cells = <0>; 451 + #gpio-cells = <2>; 452 + 453 + bmc-ocp0-en-hog { 454 + gpio-hog; 455 + gpios = <7 GPIO_ACTIVE_LOW>; 456 + output-high; 457 + line-name = "bmc-ocp0-en-n"; 458 + }; 459 + }; 460 + }; 461 + 450 462 &i2c9 { 451 463 status = "okay"; 452 464 }; ··· 558 530 /*V0-V7*/ "s0-hightemp-n","s0-fault-alert","s0-sys-auth-failure-n", 559 531 "host0-reboot-ack-n","host0-ready","host0-shd-req-n", 560 532 "host0-shd-ack-n","s0-overtemp-n", 561 - /*W0-W7*/ "ocp-aux-pwren","ocp-main-pwren","ocp-pgood","", 533 + /*W0-W7*/ "","ocp-main-pwren","ocp-pgood","", 562 534 "bmc-ok","bmc-ready","spi0-program-sel","spi0-backup-sel", 563 535 /*X0-X7*/ "i2c-backup-sel","s1-fault-alert","s1-fw-boot-ok", 564 536 "s1-hightemp-n","s0-spi-auth-fail-n","s1-sys-auth-failure-n", 565 537 "s1-overtemp-n","s1-spi-auth-fail-n", 566 538 /*Y0-Y7*/ "","","","","","","","host0-special-boot", 567 539 /*Z0-Z7*/ "reset-button","ps0-pgood","ps1-pgood","","","","",""; 540 + 541 + ocp-aux-pwren-hog { 542 + gpio-hog; 543 + gpios = <ASPEED_GPIO(W, 0) GPIO_ACTIVE_HIGH>; 544 + output-high; 545 + line-name = "ocp-aux-pwren"; 546 + }; 568 547 }; 569 548 570 549 &gpio1 {

+5 -1

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

··· 63 63 status = "okay"; 64 64 m25p,fast-read; 65 65 label = "bmc"; 66 - spi-max-frequency = <100000000>; /* 100 MHz */ 66 + spi-max-frequency = <50000000>; /* 50 MHz */ 67 67 #include "openbmc-flash-layout.dtsi" 68 68 }; 69 69 }; ··· 201 201 &kcs3 { 202 202 status = "okay"; 203 203 aspeed,lpc-io-reg = <0xca2>; 204 + }; 205 + 206 + &peci0 { 207 + status = "okay"; 204 208 };

+2 -2

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

··· 31 31 }; 32 32 33 33 system-fault { 34 - gpios = <&gpio ASPEED_GPIO(Z, 2) GPIO_ACTIVE_LOW>; 34 + gpios = <&gpio ASPEED_GPIO(Z, 2) GPIO_ACTIVE_HIGH>; 35 35 panic-indicator; 36 36 }; 37 37 }; ··· 51 51 status = "okay"; 52 52 m25p,fast-read; 53 53 label = "bmc"; 54 - spi-max-frequency = <100000000>; /* 100 MHz */ 54 + spi-max-frequency = <50000000>; /* 50 MHz */ 55 55 #include "openbmc-flash-layout-64.dtsi" 56 56 }; 57 57 };

+53

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

··· 156 156 157 157 &i2c8 { 158 158 status = "okay"; 159 + mctp-controller; 159 160 temperature-sensor@1f { 160 161 compatible = "ti,tmp421"; 161 162 reg = <0x1f>; ··· 165 164 eeprom@50 { 166 165 compatible = "st,24c32"; 167 166 reg = <0x50>; 167 + }; 168 + mctp@10 { 169 + compatible = "mctp-i2c-controller"; 170 + reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>; 168 171 }; 169 172 }; 170 173 ··· 243 238 &gpio0 { 244 239 pinctrl-names = "default"; 245 240 pinctrl-0 = <&pinctrl_gpiu1_default &pinctrl_gpiu7_default>; 241 + 242 + gpio-line-names = 243 + /*A0-A7*/ "","","","","","","","", 244 + /*B0-B7*/ "power-bmc-nic","presence-ocp-debug", 245 + "power-bmc-slot1","power-bmc-slot2", 246 + "power-bmc-slot3","power-bmc-slot4","","", 247 + /*C0-C7*/ "presence-ocp-nic","","","reset-cause-nic-primary", 248 + "reset-cause-nic-secondary","","","", 249 + /*D0-D7*/ "","","","","","","","", 250 + /*E0-E7*/ "","","","","","","","", 251 + /*F0-F7*/ "slot1-bmc-reset-button","slot2-bmc-reset-button", 252 + "slot3-bmc-reset-button","slot4-bmc-reset-button", 253 + "","","","presence-emmc", 254 + /*G0-G7*/ "","","","","","","","", 255 + /*H0-H7*/ "","","","", 256 + "presence-mb-slot1","presence-mb-slot2", 257 + "presence-mb-slot3","presence-mb-slot4", 258 + /*I0-I7*/ "","","","","","","bb-bmc-button","", 259 + /*J0-J7*/ "","","","","","","","", 260 + /*K0-K7*/ "","","","","","","","", 261 + /*L0-L7*/ "","","","","","","","", 262 + /*M0-M7*/ "","power-nic-bmc-enable","","usb-bmc-enable","","reset-cause-usb-hub","","", 263 + /*N0-N7*/ "","","","","bmc-ready","","","", 264 + /*O0-O7*/ "","","","","","","fan0-bmc-cpld-enable","fan1-bmc-cpld-enable", 265 + /*P0-P7*/ "fan2-bmc-cpld-enable","fan3-bmc-cpld-enable", 266 + "reset-cause-pcie-slot1","reset-cause-pcie-slot2", 267 + "reset-cause-pcie-slot3","reset-cause-pcie-slot4","","", 268 + /*Q0-Q7*/ "","","","","","","","", 269 + /*R0-R7*/ "","","","","","","","", 270 + /*S0-S7*/ "","","power-p5v-usb","presence-bmc-tpm","","","","", 271 + /*T0-T7*/ "","","","","","","","", 272 + /*U0-U7*/ "","","","","","","","GND", 273 + /*V0-V7*/ "bmc-slot1-ac-button","bmc-slot2-ac-button", 274 + "bmc-slot3-ac-button","bmc-slot4-ac-button", 275 + "","","","", 276 + /*W0-W7*/ "","","","","","","","", 277 + /*X0-X7*/ "","","","","","","","", 278 + /*Y0-Y7*/ "","","","reset-cause-emmc","","","","", 279 + /*Z0-Z7*/ "","","","","","","",""; 280 + }; 281 + 282 + &gpio1 { 283 + gpio-line-names = 284 + /*18A0-18A7*/ "","","","","","","","", 285 + /*18B0-18B7*/ "","","","","","","","", 286 + /*18C0-18C7*/ "","","","","","","","", 287 + /*18D0-18D7*/ "","","","","","","","", 288 + /*18E0-18E3*/ "","","","","","","",""; 246 289 };

+7 -17

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

··· 552 552 &i2c3 { 553 553 status = "okay"; 554 554 555 - power-supply@58 { 556 - compatible = "ibm,cffps"; 557 - reg = <0x58>; 555 + power-supply@5a { 556 + compatible = "acbel,fsg032"; 557 + reg = <0x5a>; 558 558 }; 559 559 560 - power-supply@59 { 561 - compatible = "ibm,cffps"; 562 - reg = <0x59>; 560 + power-supply@5b { 561 + compatible = "acbel,fsg032"; 562 + reg = <0x5b>; 563 563 }; 564 564 }; 565 565 ··· 686 686 }; 687 687 688 688 eeprom@50 { 689 - compatible = "atmel,24c64"; 689 + compatible = "atmel,24c128"; 690 690 reg = <0x50>; 691 691 }; 692 692 ··· 880 880 pinctrl-0 = <&pinctrl_rmii3_default>; 881 881 clocks = <&syscon ASPEED_CLK_GATE_MAC3CLK>, 882 882 <&syscon ASPEED_CLK_MAC3RCLK>; 883 - clock-names = "MACCLK", "RCLK"; 884 - use-ncsi; 885 - }; 886 - 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 883 clock-names = "MACCLK", "RCLK"; 894 884 use-ncsi; 895 885 };

+6

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

··· 162 162 #size-cells = <1>; 163 163 ranges; 164 164 165 + event_log: tcg_event_log@b3d00000 { 166 + no-map; 167 + reg = <0xb3d00000 0x100000>; 168 + }; 169 + 165 170 ramoops@b3e00000 { 166 171 compatible = "ramoops"; 167 172 reg = <0xb3e00000 0x200000>; /* 16 * (4 * 0x8000) */ ··· 1892 1887 tpm@2e { 1893 1888 compatible = "nuvoton,npct75x", "tcg,tpm-tis-i2c"; 1894 1889 reg = <0x2e>; 1890 + memory-region = <&event_log>; 1895 1891 }; 1896 1892 }; 1897 1893

+9

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

··· 863 863 clocks = <&syscon ASPEED_CLK_GATE_FSICLK>; 864 864 status = "disabled"; 865 865 }; 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 + }; 866 875 }; 867 876 }; 868 877 };

Configure Feed

Configure Feed