Unverified Commit eb425d57 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-5.16-devicetree-2' of... 

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

ASPEED device tree updates for 5.16, round 2

 - New machines:

  * Inventec Transformers, an x86 family server with an AST2600 BMC

 - Updates to the Everest and Rainier sensors, gpios and KCS devices

 - New UART routing device tree description

* tag 'aspeed-5.16-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: Add uart routing to device tree
  ARM: dts: aspeed: rainier: Enable earlycon
  ARM: dts: aspeed: rainier: Add front panel LEDs
  ARM: dts: aspeed: rainier: Add 'factory-reset-toggle' as GPIOF6
  ARM: dts: aspeed: rainier: Remove PSU gpio-keys
  ARM: dts: aspeed: rainier: Remove gpio hog for GPIOP7
  ARM: dts: aspeed: rainier: Add eeprom on bus 12
  ARM: dts: aspeed: p10bmc: Enable KCS channel 2
  ARM: dts: aspeed: p10bmc: Use KCS 3 for MCTP binding
  ARM: dts: aspeed: Adding Inventec Transformers BMC
  ARM: dts: aspeed: everest: Fix bus 15 muxed eeproms
  ARM: dts: aspeed: everest: Add IBM Operation Panel I2C device
  ARM: dts: aspeed: everest: Add I2C switch on bus 8
  ARM: dts: aspeed: rainier and everest: Remove PCA gpio specification
  ARM: dts: aspeed: p10bmc: Fix ADC iio-hwmon battery node name

Link: https://lore.kernel.org/r/CACPK8Xd=eAMk-S3akhGgL4i_K190Nz9t=_CrdHQMJ+nbW172mg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 8f0450c5 f9241fe8

arch/arm/boot/dts/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -1517,4 +1517,5 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-portwell-neptune.dtb \

	aspeed-bmc-quanta-q71l.dtb \

	aspeed-bmc-supermicro-x11spi.dtb \

	aspeed-bmc-inventec-transformers.dtb \

	aspeed-bmc-tyan-s7106.dtb

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

+62 −673
Original line number Diff line number Diff line
@@ -108,6 +108,8 @@ aliases { 
		i2c44 = &i2c15mux2chn1;

		i2c45 = &i2c15mux2chn2;

		i2c46 = &i2c15mux2chn3;

		i2c47 = &i2c8mux0chn0;

		i2c48 = &i2c8mux0chn1;



		serial4 = &uart5;
@@ -244,7 +246,7 @@ led-pcieslot-power { 
		};

	};



	iio-hwmon {

	iio-hwmon-battery {

		compatible = "iio-hwmon";

		io-channels = <&adc1 7>;

	};
@@ -325,86 +327,6 @@ pca1: pca9552@62 { 
			"presence-lcd-op",

			"presence-base-op",

			"";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@10 {

			reg = <10>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@11 {

			reg = <11>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@12 {

			reg = <12>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@13 {

			reg = <13>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@14 {

			reg = <14>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@15 {

			reg = <15>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};

};
@@ -468,56 +390,6 @@ pca2: pca9552@65 { 
			"expander-cable-card3",

			"expander-cable-card4",

			"expander-cable-card5";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};



	i2c-switch@70 {
@@ -561,36 +433,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -627,36 +469,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -693,36 +505,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};

	};
@@ -753,67 +535,6 @@ pca3: pca9552@66 { 
			"expander-cable-card9",

			"expander-cable-card10",

			"expander-cable-card11";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@10 {

			reg = <10>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@11 {

			reg = <11>;

			type = <PCA955X_TYPE_GPIO>;

		};



	};



	i2c-switch@70 {
@@ -857,36 +578,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -923,36 +614,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -989,36 +650,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -1055,36 +686,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};

	};
@@ -1134,36 +735,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -1200,36 +771,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -1266,36 +807,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};
@@ -1332,36 +843,6 @@ led@1 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};

	};
@@ -1375,11 +856,6 @@ pca_pcie_slot: pca9552@65 { 
		gpio-controller;

		#gpio-cells = <2>;



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		led@1 {

			label = "pcieslot-c01";

			reg = <1>;
@@ -1467,26 +943,6 @@ led@11 { 
			default-state = "keep";

			type = <PCA955X_TYPE_LED>;

		};



		gpio@12 {

			reg = <12>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@13 {

			reg = <13>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@14 {

			reg = <14>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@15 {

			reg = <15>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};

};
@@ -2110,11 +1566,6 @@ led@6 { 
			type = <PCA955X_TYPE_LED>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		led@8 {

			label = "vrm4";

			reg = <8>;
@@ -2245,11 +1696,6 @@ led@6 { 
			type = <PCA955X_TYPE_LED>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		led@8 {

			label = "vrm0";

			reg = <8>;
@@ -2338,6 +1784,27 @@ eeprom@50 { 
		compatible = "atmel,24c128";

		reg = <0x50>;

	};



	i2c-switch@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;



		i2c8mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};



		i2c8mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};

	};

};



&i2c9 {
@@ -2441,15 +1908,21 @@ eeprom@52 { 
};



&i2c14 {

	multi-master;

	status = "okay";



	ibm-panel@62 {

		compatible = "ibm,op-panel";

		reg = <(0x62 | I2C_OWN_SLAVE_ADDRESS)>;

	};



	i2c-switch@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		status = "okay";

		i2c-mux-idle-disconnect;

		idle-state = <1>;



		i2c14mux0chn0: i2c@0 {

			#address-cells = <1>;
@@ -2679,16 +2152,6 @@ led@13 { 
					default-state = "keep";

					type = <PCA955X_TYPE_LED>;

				};



				gpio@14 {

					reg = <14>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@15 {

					reg = <15>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};



			pca0: pca9552@61 {
@@ -2708,86 +2171,6 @@ pca0: pca9552@61 { 
					"presence-fan2",

					"presence-fan1",

					"presence-fan0";



				gpio@0 {

					reg = <0>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@1 {

					reg = <1>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@2 {

					reg = <2>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@3 {

					reg = <3>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@4 {

					reg = <4>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@5 {

					reg = <5>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@6 {

					reg = <6>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@7 {

					reg = <7>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@8 {

					reg = <8>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@9 {

					reg = <9>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@10 {

					reg = <10>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@11 {

					reg = <11>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@12 {

					reg = <12>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@13 {

					reg = <13>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@14 {

					reg = <14>;

					type = <PCA955X_TYPE_GPIO>;

				};



				gpio@15 {

					reg = <15>;

					type = <PCA955X_TYPE_GPIO>;

				};

			};

		};

	};
@@ -2857,9 +2240,9 @@ i2c15mux0chn0: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2868,9 +2251,9 @@ i2c15mux0chn1: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2879,9 +2262,9 @@ i2c15mux0chn2: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2890,9 +2273,9 @@ i2c15mux0chn3: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};

	};
@@ -2909,9 +2292,9 @@ i2c15mux1chn0: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2920,9 +2303,9 @@ i2c15mux1chn1: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2931,9 +2314,9 @@ i2c15mux1chn2: i2c@2 { 
			#size-cells = <0>;

			reg = <2>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2942,9 +2325,9 @@ i2c15mux1chn3: i2c@3 { 
			#size-cells = <0>;

			reg = <3>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};

	};
@@ -2961,9 +2344,9 @@ i2c15mux2chn0: i2c@0 { 
			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -2972,9 +2355,9 @@ i2c15mux2chn1: i2c@1 { 
			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

			eeprom@53 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				reg = <0x53>;

			};

		};
@@ -4224,11 +3607,6 @@ &lpc_ctrl { 
	memory-region = <&flash_memory>;

};



&kcs4 {

	compatible = "openbmc,mctp-lpc";

	status = "okay";

};



&mac2 {

	status = "okay";

	pinctrl-names = "default";
@@ -4267,3 +3645,14 @@ &xdma { 
	status = "okay";

	memory-region = <&vga_memory>;

};



&kcs2 {

	status = "okay";

	aspeed,lpc-io-reg = <0xca8 0xcac>;

};



&kcs3 {

	status = "okay";

	aspeed,lpc-io-reg = <0xca2>;

	aspeed,lpc-interrupts = <11 IRQ_TYPE_LEVEL_LOW>;

};

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

+61 −573

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/boot/dts/aspeed-bmc-inventec-transformers.dts

0 → 100644
+328 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-or-later

// Copyright 2021 Inventec Corp.



/dts-v1/;



#include "aspeed-g6.dtsi"

#include "aspeed-g6-pinctrl.dtsi"

#include <dt-bindings/i2c/i2c.h>

#include <dt-bindings/gpio/aspeed-gpio.h>



/ {

       model = "TRANSFORMERS BMC";

       compatible = "inventec,transformer-bmc", "aspeed,ast2600";



       aliases {

               serial4 = &uart5;

       };



       chosen {

               stdout-path = &uart5;

               bootargs = "console=ttyS4,115200n8";

       };



       memory@80000000 {

               device_type = "memory";

               reg = <0x80000000 0x80000000>;

       };



       leds {

               compatible = "gpio-leds";



               // UID led

               uid {

                       label = "UID_LED";

                       gpios = <&gpio0 ASPEED_GPIO(X, 0) GPIO_ACTIVE_LOW>;

               };



               // Heart beat led

               heartbeat {

                       label = "HB_LED";

                       gpios = <&gpio0 ASPEED_GPIO(P, 7) GPIO_ACTIVE_LOW>;

               };

       };

};



&mdio0 {

       status = "okay";



       ethphy0: ethernet-phy@0 {

               compatible = "ethernet-phy-ieee802.3-c22";

               reg = <1>;

       };

};



&mac3 {

       status = "okay";

       phy-mode = "rgmii";

       phy-handle = <&ethphy0>;

       pinctrl-names = "default";

       pinctrl-0 = <&pinctrl_rgmii4_default>;

};



&fmc {

       status = "okay";



       flash@0 {

               status = "okay";

               m25p,fast-read;

               label = "bmc";

               spi-max-frequency = <33000000>;

               spi-tx-bus-width = <2>;

               spi-rx-bus-width = <2>;

#include "openbmc-flash-layout.dtsi"

       };



       flash@1 {

               status = "okay";

               m25p,fast-read;

               label = "bmc2";

               spi-max-frequency = <33000000>;

               spi-tx-bus-width = <2>;

               spi-rx-bus-width = <2>;

       };

};



&spi1 {

       status = "okay";

       pinctrl-names = "default";

       pinctrl-0 = <&pinctrl_spi1_default>;



       flash@0 {

               status = "okay";

               m25p,fast-read;

               label = "bios";

               spi-max-frequency = <33000000>;

               spi-tx-bus-width = <1>;

               spi-rx-bus-width = <1>;

       };

};



&wdt1 {

       status = "okay";

};



&uart1 {

       status = "okay";

};



&uart5 {

       status = "okay";

};



&i2c0 {

       status = "okay";



       //Set bmc' slave address;

       bmc_slave@10 {

               compatible = "ipmb-dev";

               reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;

               i2c-protocol;

       };

};



&i2c2 {

       status = "okay";

};



&i2c3 {

       // FRU AT24C512C-SSHM-T

       status = "okay";

       eeprom@50 {

               compatible = "atmel,24c512";

               reg = <0x50>;

               pagesize = <128>;

       };

};



&i2c5 {

       status = "okay";

};



&i2c6 {

       status = "okay";



       tmp75@49 {

               compatible = "ti,tmp75";

               reg = <0x49>;

       };



       tmp75@4f {

               compatible = "ti,tmp75";

               reg = <0x4f>;

       };



       tmp468@48 {

               compatible = "ti,tmp468";

               reg = <0x48>;

       };

};



&i2c7 {

       status = "okay";

       adm1278@40 {

               compatible = "adi,adm1278";

               reg = <0x40>;

       };

};





&i2c8 {

       // FRU AT24C512C-SSHM-T

       status = "okay";



       eeprom@51 {

               compatible = "atmel,24c512";

               reg = <0x51>;

               pagesize = <128>;

       };



       eeprom@53 {

               compatible = "atmel,24c512";

               reg = <0x53>;

               pagesize = <128>;

       };

};



&i2c9 {

       // M.2

       status = "okay";

};



&i2c10 {

       // I2C EXPANDER

       status = "okay";



       i2c-switch@71 {

               compatible = "nxp,pca9544";

               #address-cells = <1>;

               #size-cells = <0>;

               reg = <0x71>;

       };



       i2c-switch@73 {

               compatible = "nxp,pca9544";

               #address-cells = <1>;

               #size-cells = <0>;

               reg = <0x73>;

       };

};



&i2c11 {

       // I2C EXPANDER

       status = "okay";



       i2c-switch@70 {

               compatible = "nxp,pca9544";

               #address-cells = <1>;

               #size-cells = <0>;

               reg = <0x70>;



               pcie_eeprom_riser1: i2c@0 {

                       #address-cells = <1>;

                       #size-cells = <0>;

                       reg = <0>;



                       eeprom@55 {

                               compatible = "atmel,24c512";

                               reg = <0x55>;

                               pagesize = <128>;

                       };

               };



               pcie_eeprom_riser2: i2c@1 {

                       #address-cells = <1>;

                       #size-cells = <0>;

                       reg = <1>;



                       eeprom@55 {

                               compatible = "atmel,24c512";

                               reg = <0x55>;

                               pagesize = <128>;

                       };

               };



               pcie_eeprom_riser3: i2c@2 {

                       #address-cells = <1>;

                       #size-cells = <0>;

                       reg = <2>;



                       eeprom@55 {

                               compatible = "atmel,24c512";

                               reg = <0x55>;

                               pagesize = <128>;

                       };

               };

       };

};



&i2c12 {

       status = "okay";



       psu0:psu0@58 {

               compatible = "pmbus";

               reg = <0x58>;

       };

};



&gpio0 {

       status = "okay";

       gpio-line-names =

       /*A0-A7*/   "","","","","","","","",

       /*B0-B7*/   "presence-ps0","power-chassis-good","","","","","presence-ps1","",

       /*C0-C7*/   "","","","","","","","",

       /*D0-D7*/   "","","","","","","","",

       /*E0-E7*/   "","","","","","","","",

       /*F0-F7*/   "","","","","power-chassis-control","","","",

       /*G0-G7*/   "","","jtag-mux","","","","","",

       /*H0-H7*/   "","","","","reset-button","power-button","","",

       /*I0-I7*/   "","","","","","","","",

       /*J0-J7*/   "","","","","","","","",

       /*K0-K7*/   "","","","","","","","",

       /*L0-L7*/   "","","","","","","","",

       /*M0-M7*/   "","","","","","","","",

       /*N0-N7*/   "","","","","","","","",

       /*O0-O7*/   "","","","","","","","",

       /*P0-P7*/   "","","","tck-mux","","","","",

       /*Q0-Q7*/   "","","","","","","","",

       /*R0-R7*/   "","","","","","","","",

       /*S0-S7*/   "","","","","","","","",

       /*T0-T7*/   "","","","","","","","",

       /*U0-U7*/   "","nmi-button","","","","","","",

       /*V0-V7*/   "","","","","power-config-full-load","","","",

       /*W0-W7*/   "","","","","","","","",

       /*X0-X7*/   "","","","","","","","",

       /*Y0-Y7*/   "","","","","","","","",

       /*Z0-Z7*/   "","","","","","","","",

       /*AA0-AA7*/ "","","","","","","","",

       /*AB0-AB7*/ "","","","","","","","",

       /*AC0-AC7*/ "","","","","","","","";

};



&lpc_snoop {

       status = "okay";

       snoop-ports = <0x80>;

};



&emmc_controller {

       status = "okay";

};



&emmc {

       status = "okay";

       non-removable;

       max-frequency = <52000000>;

       bus-width = <8>;

};



&vhub {

       status = "okay";

       aspeed,vhub-downstream-ports = <7>;

       aspeed,vhub-generic-endpoints = <21>;

       pinctrl-names = "default";

       pinctrl-0 = <&pinctrl_usb2ad_default>;

};



&rtc {

       status = "okay";

};

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

+6 −0
Original line number Diff line number Diff line
@@ -383,6 +383,12 @@ ibt: ibt@140 { 
					interrupts = <8>;

					status = "disabled";

				};



				uart_routing: uart-routing@9c {

					compatible = "aspeed,ast2400-uart-routing";

					reg = <0x9c 0x4>;

					status = "disabled";

				};

			};



			uart2: serial@1e78d000 {