Unverified Commit 0a25e385 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-6.4-devicetree' of... 

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: default avatarArnd Bergmann <arnd@arndb.de>
parents 9e0dabbd 7d4f0b0d

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

+36 −1
Original line number Diff line number Diff line
@@ -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 {

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

+5 −1
Original line number Diff line number Diff line
@@ -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";

};

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

+2 −2
Original line number Diff line number Diff line
@@ -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"

	};

};

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

+53 −0
Original line number Diff line number Diff line
@@ -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*/ "","","","","","","","";

};

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

+7 −17
Original line number Diff line number Diff line
@@ -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;