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

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

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

ASPEED device tree updates for 5.15

 - New machines:

  * TYAN S7106 BMC, a x86 server from about four years ago

 - Descriptions for the AST2600 ADC, which now has an upstream driver

 - Lots of GPIO line names. The OpenBMC project has adopted a scheme for
   naming the lines, and new additions will follow this guide

 - New I2C devices for Rainier, Everest, EthanolX, Mt Jade

 - Fixes for fp5280g2 which has seen some recent development, including
   the addtion of a QEmu machine for testing

* tag 'aspeed-5.16-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: fp5280g2: Use the 64M layout
  ARM: dts: aspeed: Add TYAN S7106 BMC machine
  ARM: dts: aspeed: rainier: Add power-config-full-load gpio
  ARM: dts: aspeed: p10bmc: Define secure boot gpio
  ARM: dts: aspeed: mtjade: Add some gpios
  ARM: dts: aspeed: Add ADC for AST2600 and enable for Rainier and Everest
  ARM: dts: everest: Define name for gpio line B6
  ARM: dts: everest: Define name for gpio line Q2
  ARM: dts: rainier: Define name for gpio line Q2
  ARM: dts: everest: Add 'factory-reset-toggle' as GPIOF6
  ARM: dts: aspeed: everest: Add I2C bus 15 muxes
  ARM: dts: aspeed: rainier: Add system LEDs
  ARM: dts: aspeed: amd-ethanolx: Add FRU EEPROM
  ARM: dts: fp5280g2: Enable KCS 3 for MCTP binding

Link: https://lore.kernel.org/r/CACPK8XdrMzY9tzdof7KpzxKquTo7GcWW4N9Zqwtmmu73C7htXA@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 6fa496fd 4eb7fe33

arch/arm/boot/dts/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -1508,4 +1508,5 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-opp-zaius.dtb \

	aspeed-bmc-portwell-neptune.dtb \

	aspeed-bmc-quanta-q71l.dtb \

	aspeed-bmc-supermicro-x11spi.dtb
 
	aspeed-bmc-supermicro-x11spi.dtb \

	aspeed-bmc-tyan-s7106.dtb

arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts

+5 −0
Original line number Diff line number Diff line
@@ -159,6 +159,11 @@ &i2c2 { 
//24LC128 EEPROM

&i2c3 {

	status = "okay";

	eeprom@50 {

		compatible = "atmel,24c256";

		reg = <0x50>;

		pagesize = <64>;

	};

};



//P0 Power regulators

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

+20 −1
Original line number Diff line number Diff line
@@ -86,6 +86,18 @@ S0_cpu_fault { 
			linux,code = <ASPEED_GPIO(J, 1)>;

		};



		S0_scp_auth_fail {

			label = "S0_SCP_AUTH_FAIL";

			gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(J, 2)>;

		};



		S1_scp_auth_fail {

			label = "S1_SCP_AUTH_FAIL";

			gpios = <&gpio ASPEED_GPIO(Z, 5) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(Z, 5)>;

		};



		S1_overtemp {

			label = "S1_OVERTEMP";

			gpios = <&gpio ASPEED_GPIO(Z, 6) GPIO_ACTIVE_LOW>;
@@ -590,7 +602,7 @@ &gpio { 
	/*Q0-Q7*/	"","","","","","UID_BUTTON","","",

	/*R0-R7*/	"","","BMC_EXT_HIGHTEMP_L","OCP_AUX_PWREN",

			"OCP_MAIN_PWREN","RESET_BUTTON","","",

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

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

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

	/*U0-U7*/	"","","","","","","","",

	/*V0-V7*/	"","","","","","","","",
@@ -604,4 +616,11 @@ &gpio { 
			"S1_BMC_DDR_ADR","","","","",

	/*AC0-AC7*/	"SYS_PWR_GD","","","","","BMC_READY","SLAVE_PRESENT_L",

			"BMC_OCP_PG";



	i2c4_o_en {

		gpio-hog;

		gpios = <ASPEED_GPIO(Y, 2) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_I2C4_O_EN";

	};

};

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

+178 −4
Original line number Diff line number Diff line
@@ -96,6 +96,18 @@ aliases { 
		i2c32 = &i2c14mux1chn1;

		i2c33 = &i2c14mux1chn2;

		i2c34 = &i2c14mux1chn3;

		i2c35 = &i2c15mux0chn0;

		i2c36 = &i2c15mux0chn1;

		i2c37 = &i2c15mux0chn2;

		i2c38 = &i2c15mux0chn3;

		i2c39 = &i2c15mux1chn0;

		i2c40 = &i2c15mux1chn1;

		i2c41 = &i2c15mux1chn2;

		i2c42 = &i2c15mux1chn3;

		i2c43 = &i2c15mux2chn0;

		i2c44 = &i2c15mux2chn1;

		i2c45 = &i2c15mux2chn2;

		i2c46 = &i2c15mux2chn3;



		serial4 = &uart5;
@@ -231,20 +243,36 @@ led-pcieslot-power { 
			gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_LOW>;

		};

	};



	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&adc1 7>;

	};

};



&adc1 {

	status = "okay";

	aspeed,int-vref-microvolt = <2500000>;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_adc8_default &pinctrl_adc9_default

				 &pinctrl_adc10_default &pinctrl_adc11_default

				 &pinctrl_adc12_default &pinctrl_adc13_default

				 &pinctrl_adc14_default &pinctrl_adc15_default>;

};



&gpio0 {

	gpio-line-names =

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

	/*B0-B7*/	"USERSPACE_RSTIND_BUFF","","","","","","","",

	/*B0-B7*/	"USERSPACE_RSTIND_BUFF","","","","","","checkstop","",

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

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

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

	/*F0-F7*/	"PIN_HOLE_RESET_IN_N","","",

				"PIN_HOLE_RESET_OUT_N","","","","",

				"PIN_HOLE_RESET_OUT_N","","",

				"factory-reset-toggle","",

	/*G0-G7*/	"","","","","","","","",

	/*H0-H7*/	"led-rtc-battery","led-bmc","led-rear-enc-id0","led-rear-enc-fault0","","","","",

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

	/*I0-I7*/	"","","","","","","bmc-secure-boot","",

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

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

	/*L0-L7*/	"","","","","","","","",
@@ -252,7 +280,7 @@ &gpio0 { 
	/*N0-N7*/	"","","","","","","","",

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

	/*P0-P7*/	"","","","","led-pcieslot-power","","","",

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

	/*Q0-Q7*/	"","","regulator-standby-faulted","","","","","",

	/*R0-R7*/	"bmc-tpm-reset","power-chassis-control","power-chassis-good","","","I2C_FLASH_MICRO_N","","",

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

	/*T0-T7*/	"","","","","","","","",
@@ -2816,6 +2844,152 @@ eeprom@50 { 


&i2c15 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9546";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c15mux0chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux0chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux0chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux0chn3: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};

	};



	i2c-switch@71 {

		compatible = "nxp,pca9546";

		reg = <0x71>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c15mux1chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux1chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux1chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux1chn3: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};

	};



	i2c-switch@72 {

		compatible = "nxp,pca9546";

		reg = <0x72>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c15mux2chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux2chn1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

			};

		};



		i2c15mux2chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};



		i2c15mux2chn3: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};

	};

};



&ehci1 {

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

+1354 −217

File changed.

Preview size limit exceeded, changes collapsed.