Commit 48dd4cf0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ASPEED device tree updates for 5.4

New machines:

 - Facebook Wedge100, Wedge40 and Minipack
 - Lenovo Hr855xg2
 - Wistron Mihawk

There's a few other updates, notably some changes to to use the newly
added SDHCI driver.

* tag 'aspeed-5.4-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: swift: Add eMMC device
  ARM: dts: aspeed: Enable first MMC slot on AST2500 EVB
  ARM: dts: aspeed: Describe SD controllers
  ARM: dts: aspeed: Add Mihawk BMC platform
  ARM: dts: aspeed: fp5280g2: Fix power supply address
  ARM: dts: aspeed: tiogapass: Add Riser card
  ARM: dts: aspeed: tiogapass: Move battery sensor
  ARM: dts: aspeed: Add Facebook Wedge100 BMC
  ARM: dts: aspeed: Add Facebook Wedge40 BMC
  ARM: dts: aspeed: swift: Fix FSI GPIOs
  ARM: dts: aspeed: Add SGPM pinmux
  ARM: dts: aspeed: tiogapass: Add VR devices
  ARM: dts: aspeed: Add Lenovo Hr855xg2 BMC
  ARM: dts: aspeed: Add Facebook Minipack BMC

Link: https://lore.kernel.org/r/CACPK8XfKHpNYXNE_VRaLeGUQa7-hkmUS0nsPfaeSLE4sckKFHg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents af6ba9d2 49b0f3be

arch/arm/boot/dts/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -1276,13 +1276,18 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-arm-centriq2400-rep.dtb \

	aspeed-bmc-arm-stardragon4800-rep2.dtb \

	aspeed-bmc-facebook-cmm.dtb \

	aspeed-bmc-facebook-minipack.dtb \

	aspeed-bmc-facebook-tiogapass.dtb \

	aspeed-bmc-facebook-wedge40.dtb \

	aspeed-bmc-facebook-wedge100.dtb \

	aspeed-bmc-facebook-yamp.dtb \

	aspeed-bmc-intel-s2600wf.dtb \

	aspeed-bmc-inspur-fp5280g2.dtb \

	aspeed-bmc-lenovo-hr630.dtb \

	aspeed-bmc-lenovo-hr855xg2.dtb \

	aspeed-bmc-microsoft-olympus.dtb \

	aspeed-bmc-opp-lanyang.dtb \

	aspeed-bmc-opp-mihawk.dtb \

	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-bmc-opp-swift.dtb \

arch/arm/boot/dts/aspeed-ast2500-evb.dts

+11 −0
Original line number Diff line number Diff line
@@ -94,6 +94,17 @@ 
	};

};



&sdmmc {

	status = "okay";

};



&sdhci0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sd1_default>;

};



/*

 * Enable port A as device (via the virtual hub) and port B as

 * host by default on the eval board. This can be easily changed

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

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

// Copyright (c) 2018 Facebook Inc.

/dts-v1/;



#include "aspeed-g5.dtsi"



/ {

	model = "Facebook Minipack 100 BMC";

	compatible = "facebook,minipack-bmc", "aspeed,ast2500";



	aliases {

		/*

		 * Override the default serial aliases to avoid breaking

		 * the legacy applications.

		 */

		serial0 = &uart5;

		serial1 = &uart1;

		serial2 = &uart2;

		serial3 = &uart3;

		serial4 = &uart4;



		/*

		 * i2c switch 2-0070, pca9548, 8 child channels assigned

		 * with bus number 16-23.

		 */

		i2c16 = &imux16;

		i2c17 = &imux17;

		i2c18 = &imux18;

		i2c19 = &imux19;

		i2c20 = &imux20;

		i2c21 = &imux21;

		i2c22 = &imux22;

		i2c23 = &imux23;



		/*

		 * i2c switch 8-0070, pca9548, 8 child channels assigned

		 * with bus number 24-31.

		 */

		i2c24 = &imux24;

		i2c25 = &imux25;

		i2c26 = &imux26;

		i2c27 = &imux27;

		i2c28 = &imux28;

		i2c29 = &imux29;

		i2c30 = &imux30;

		i2c31 = &imux31;



		/*

		 * i2c switch 9-0070, pca9548, 8 child channels assigned

		 * with bus number 32-39.

		 */

		i2c32 = &imux32;

		i2c33 = &imux33;

		i2c34 = &imux34;

		i2c35 = &imux35;

		i2c36 = &imux36;

		i2c37 = &imux37;

		i2c38 = &imux38;

		i2c39 = &imux39;



		/*

		 * i2c switch 11-0070, pca9548, 8 child channels assigned

		 * with bus number 40-47.

		 */

		i2c40 = &imux40;

		i2c41 = &imux41;

		i2c42 = &imux42;

		i2c43 = &imux43;

		i2c44 = &imux44;

		i2c45 = &imux45;

		i2c46 = &imux46;

		i2c47 = &imux47;

	};



	chosen {

		stdout-path = &uart1;

		bootargs = "debug console=ttyS1,9600n8 root=/dev/ram rw";

	};



	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};

};



&wdt1 {

	status = "okay";

	aspeed,reset-type = "system";

};



&wdt2 {

	status = "okay";

	aspeed,reset-type = "system";

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

#include "facebook-bmc-flash-layout.dtsi"

	};

};



&uart1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd1_default

		     &pinctrl_rxd1_default

		     &pinctrl_ncts1_default

		     &pinctrl_ndsr1_default

		     &pinctrl_ndtr1_default

		     &pinctrl_nrts1_default>;

};



&uart2 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd2_default

		     &pinctrl_rxd2_default>;

};



&uart3 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd3_default

		     &pinctrl_rxd3_default>;

};



&uart4 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd4_default

		     &pinctrl_rxd4_default>;

};



&uart5 {

	status = "okay";

};



&mac1 {

	status = "okay";

	no-hw-checksum;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&i2c0 {

	status = "okay";

	bus-frequency = <400000>;

	multi-master;

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;



		imux16: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};



		imux17: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};



		imux18: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};



		imux19: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};



		imux20: i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

		};



		imux21: i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

		};



		imux22: i2c@6 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

		};



		imux23: i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

		};

	};

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

	multi-master;

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";

};



&i2c7 {

	status = "okay";

};



&i2c8 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;



		imux24: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};



		imux25: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};



		imux26: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};



		imux27: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};



		imux28: i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

		};



		imux29: i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

		};



		imux30: i2c@6 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

		};



		imux31: i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

		};

	};

};



&i2c9 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;



		imux32: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};



		imux33: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};



		imux34: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};



		imux35: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};



		imux36: i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

		};



		imux37: i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

		};



		imux38: i2c@6 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

		};



		imux39: i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

		};

	};

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;



		imux40: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};



		imux41: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};



		imux42: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};



		imux43: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};



		imux44: i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

		};



		imux45: i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

		};



		imux46: i2c@6 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

		};



		imux47: i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;

		};

	};

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&vhub {

	status = "okay";

};

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

+267 −5
Original line number Diff line number Diff line
@@ -12,6 +12,27 @@ 
	aliases {

		serial0 = &uart1;

		serial4 = &uart5;



		/*

		 * Hardcode the bus number of i2c switches' channels to

		 * avoid breaking the legacy applications.

		 */

		i2c16 = &imux16;

		i2c17 = &imux17;

		i2c18 = &imux18;

		i2c19 = &imux19;

		i2c20 = &imux20;

		i2c21 = &imux21;

		i2c22 = &imux22;

		i2c23 = &imux23;

		i2c24 = &imux24;

		i2c25 = &imux25;

		i2c26 = &imux26;

		i2c27 = &imux27;

		i2c28 = &imux28;

		i2c29 = &imux29;

		i2c30 = &imux30;

		i2c31 = &imux31;

	};

	chosen {

		stdout-path = &uart5;
@@ -25,13 +46,9 @@ 
	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,

					<&adc 4>, <&adc 5>, <&adc 6>;

			      <&adc 4>, <&adc 5>, <&adc 6>, <&adc 7>;

	};



	iio-hwmon-battery {

		compatible = "iio-hwmon";

		io-channels = <&adc 7>;

	};

};



&fmc {
@@ -124,6 +141,215 @@ 
&i2c1 {

	status = "okay";

	//X24 Riser

	i2c-switch@71 {

		compatible = "nxp,pca9544";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x71>;



		imux16: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;



			ina230@45 {

				compatible = "ti,ina230";

				reg = <0x45>;

			};



			tmp75@48 {

				compatible = "ti,tmp75";

				reg = <0x48>;

			};



			tmp421@49 {

				compatible = "ti,tmp75";

				reg = <0x49>;

			};



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				pagesize = <32>;

			};



			i2c-switch@73 {

				compatible = "nxp,pca9546";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x73>;



				imux20: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;

				};



				imux21: i2c@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

				};



				imux22: i2c@2 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <2>;

				};



				imux23: i2c@3 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <3>;

				};



			};



		};



		imux17: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;



			ina230@45 {

				compatible = "ti,ina230";

				reg = <0x45>;

			};



			tmp421@48 {

				compatible = "ti,tmp75";

				reg = <0x48>;

			};



			tmp421@49 {

				compatible = "ti,tmp75";

				reg = <0x49>;

			};



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				pagesize = <32>;

			};



			i2c-switch@73 {

				compatible = "nxp,pca9546";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x73>;



				imux24: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;

				};



				imux25: i2c@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

				};



				imux26: i2c@2 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <2>;

				};



				imux27: i2c@3 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <3>;

				};



			};



		};



		imux18: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;



			ina230@45 {

				compatible = "ti,ina230";

				reg = <0x45>;

			};



			tmp421@48 {

				compatible = "ti,tmp75";

				reg = <0x48>;

			};



			tmp421@49 {

				compatible = "ti,tmp75";

				reg = <0x49>;

			};



			eeprom@50 {

				compatible = "atmel,24c64";

				reg = <0x50>;

				pagesize = <32>;

			};



			i2c-switch@73 {

				compatible = "nxp,pca9546";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x73>;



				imux28: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;

				};



				imux29: i2c@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

				};



				imux30: i2c@2 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <2>;

				};



				imux31: i2c@3 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <3>;

				};



			};



		};



		imux19: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;



			i2c-switch@40 {

				compatible = "ti,ina230";

				reg = <0x40>;

			};



			i2c-switch@41 {

				compatible = "ti,ina230";

				reg = <0x41>;

			};



			i2c-switch@45 {

				compatible = "ti,ina230";

				reg = <0x45>;

			};



		};



	};

};



&i2c2 {
@@ -144,6 +370,42 @@ 
&i2c5 {

	status = "okay";

	// CPU Voltage regulators

	regulator@48 {

		compatible = "infineon,pxe1610";

		reg = <0x48>;

	};

	regulator@4a {

		compatible = "infineon,pxe1610";

		reg = <0x4a>;

	};

	regulator@50 {

		compatible = "infineon,pxe1610";

		reg = <0x50>;

	};

	regulator@52 {

		compatible = "infineon,pxe1610";

		reg = <0x52>;

	};

	regulator@58 {

		compatible = "infineon,pxe1610";

		reg = <0x58>;

	};

	regulator@5a {

		compatible = "infineon,pxe1610";

		reg = <0x5a>;

	};

	regulator@68 {

		compatible = "infineon,pxe1610";

		reg = <0x68>;

	};

	regulator@70 {

		compatible = "infineon,pxe1610";

		reg = <0x70>;

	};

	regulator@72 {

		compatible = "infineon,pxe1610";

		reg = <0x72>;

	};

};



&i2c6 {

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

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

// Copyright (c) 2018 Facebook Inc.

/dts-v1/;



#include "aspeed-g4.dtsi"



/ {

	model = "Facebook Wedge 100 BMC";

	compatible = "facebook,wedge100-bmc", "aspeed,ast2400";



	aliases {

		/*

		 * Override the default uart aliases to avoid breaking

		 * the legacy applications.

		 */

		serial0 = &uart5;

		serial1 = &uart1;

		serial2 = &uart3;

		serial3 = &uart4;

	};



	chosen {

		stdout-path = &uart3;

		bootargs = "console=ttyS2,9600n8 root=/dev/ram rw";

	};



	memory@40000000 {

		reg = <0x40000000 0x20000000>;

	};

};



&wdt1 {

	status = "okay";

	aspeed,reset-type = "system";

};



&wdt2 {

	status = "okay";

	aspeed,reset-type = "system";

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "fmc0";

#include "facebook-bmc-flash-layout.dtsi"

	};

};



&uart1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd1_default

		     &pinctrl_rxd1_default>;

};



&uart3 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd3_default

		     &pinctrl_rxd3_default>;

};



&uart4 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd4_default

		     &pinctrl_rxd4_default>;

};



&uart5 {

	status = "okay";

};



&mac1 {

	status = "okay";

	no-hw-checksum;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";

};



&i2c7 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;

	};

};



&i2c8 {

	status = "okay";

};



&i2c9 {

	status = "okay";

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&vhub {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE