Commit 679bc801 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ASPEED device tree updates for 5.10

 - New machines

  * Wistron Mowgli, an AST2500 BMC for a Power9 OpenPower server

  * Facebook Wedge400, an AST2500 BMC system which we can assume is 4
    times better than the existing Wedge100 top of rack network switch

 - Add a new device, the IBM Operation Panel

 - Fixes for Facebook's collection of BMCs

 - eMMC and vuart fixes

* tag 'aspeed-5.10-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed:
  ARM: dts: aspeed: Add Mowgli BMC platform
  ARM: dts: rainier: Disable internal pull-downs on eMMC pins
  ARM: aspeed: g5: Do not set sirq polarity
  ARM: dts: aspeed: rainier: Add IBM Operation Panel I2C device
  ARM: dts: aspeed: tacoma: Add IBM Operation Panel I2C device
  ARM: dts: aspeed: rainier: Enable XDMA engine
  ARM: dts: aspeed: wedge40: Update UART4 pin settings
  ARM: dts: aspeed: wedge40: Update FMC flash0 label
  ARM: dts: aspeed: Add Facebook Wedge400 BMC
  ARM: dts: aspeed: minipack: Update 64MB FMC flash layout
  ARM: dts: aspeed: yamp: Set 32MB FMC flash layout
  ARM: dts: aspeed: cmm: Set 32MB FMC flash layout
  ARM: dts: aspeed: Remove flash layout from Facebook AST2500 Common dtsi

Link: https://lore.kernel.org/r/CACPK8XcDNBYAHzW6NYB4LFm3YbN63AprgW75ZqS+6uXn2b3kug@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 34cfebc0 e8957058

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -1371,6 +1371,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-facebook-tiogapass.dtb \

	aspeed-bmc-facebook-wedge40.dtb \

	aspeed-bmc-facebook-wedge100.dtb \

	aspeed-bmc-facebook-wedge400.dtb \

	aspeed-bmc-facebook-yamp.dtb \

	aspeed-bmc-facebook-yosemitev2.dtb \

	aspeed-bmc-ibm-rainier.dtb \
@@ -1381,6 +1382,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-microsoft-olympus.dtb \

	aspeed-bmc-opp-lanyang.dtb \

	aspeed-bmc-opp-mihawk.dtb \

	aspeed-bmc-opp-mowgli.dtb \

	aspeed-bmc-opp-nicole.dtb \

	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

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

+17 −0
Original line number Diff line number Diff line
@@ -1571,3 +1571,20 @@ &sdhci0 { 
&sdhci1 {

	status = "disabled";

};



&fmc_flash0 {

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

};



&fmc_flash1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		flash1@0 {

			reg = <0x0 0x2000000>;

			label = "flash1";

		};

	};

};

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

+45 −2
Original line number Diff line number Diff line
@@ -88,17 +88,60 @@ &wdt2 { 
 */

&fmc_flash0 {

	partitions {

		data0@1c00000 {

			reg = <0x1c00000 0x2400000>;

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		/*

		 * u-boot partition: 384KB.

		 */

		u-boot@0 {

			reg = <0x0 0x60000>;

			label = "u-boot";

		};



		/*

		 * u-boot environment variables: 128KB.

		 */

		u-boot-env@60000 {

			reg = <0x60000 0x20000>;

			label = "env";

		};



		/*

		 * FIT image: 59.5 MB.

		 */

		fit@80000 {

			reg = <0x80000 0x3b80000>;

			label = "fit";

		};



		/*

		 * "data0" partition (4MB) is reserved for persistent

		 * data store.

		 */

		data0@3800000 {

			reg = <0x3c00000 0x400000>;

			label = "data0";

		};



		/*

		 * "flash0" partition (covering the entire flash) is

		 * explicitly created to avoid breaking legacy applications.

		 */

		flash0@0 {

			reg = <0x0 0x4000000>;

			label = "flash0";

		};

	};

};



&fmc_flash1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		flash1@0 {

			reg = <0x0 0x4000000>;

		};

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

+3 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ &fmc { 
	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "fmc0";

		label = "spi0.0";

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

	};

};
@@ -71,7 +71,8 @@ &uart4 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd4_default

		     &pinctrl_rxd4_default>;

		     &pinctrl_rxd4_default

		     &pinctrl_ndts4_default>;

};



&uart5 {

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

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

// Copyright (c) 2019 Facebook Inc.

/dts-v1/;



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

#include "ast2500-facebook-netbmc-common.dtsi"



/ {

	model = "Facebook Wedge 400 BMC";

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



	aliases {

		/*

		 * PCA9548 (2-0070) provides 8 channels connecting to

		 * SCM (System Controller Module).

		 */

		i2c16 = &imux16;

		i2c17 = &imux17;

		i2c18 = &imux18;

		i2c19 = &imux19;

		i2c20 = &imux20;

		i2c21 = &imux21;

		i2c22 = &imux22;

		i2c23 = &imux23;



		/*

		 * PCA9548 (8-0070) provides 8 channels connecting to

		 * SMB (Switch Main Board).

		 */

		i2c24 = &imux24;

		i2c25 = &imux25;

		i2c26 = &imux26;

		i2c27 = &imux27;

		i2c28 = &imux28;

		i2c29 = &imux29;

		i2c30 = &imux30;

		i2c31 = &imux31;



		/*

		 * PCA9548 (11-0076) provides 8 channels connecting to

		 * FCM (Fan Controller Module).

		 */

		i2c32 = &imux32;

		i2c33 = &imux33;

		i2c34 = &imux34;

		i2c35 = &imux35;

		i2c36 = &imux36;

		i2c37 = &imux37;

		i2c38 = &imux38;

		i2c39 = &imux39;



		spi2 = &spi_gpio;

	};



	chosen {

		stdout-path = &uart1;

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

	};



	ast-adc-hwmon {

		compatible = "iio-hwmon";

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

	};



	/*

	 * GPIO-based SPI Master is required to access SPI TPM, because

	 * full-duplex SPI transactions are not supported by ASPEED SPI

	 * Controllers.

	 */

	spi_gpio: spi-gpio {

		status = "okay";

		compatible = "spi-gpio";

		#address-cells = <1>;

		#size-cells = <0>;



		cs-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_LOW>;

		gpio-sck = <&gpio ASPEED_GPIO(R, 3) GPIO_ACTIVE_HIGH>;

		gpio-mosi = <&gpio ASPEED_GPIO(R, 4) GPIO_ACTIVE_HIGH>;

		gpio-miso = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_HIGH>;

		num-chipselects = <1>;



		tpmdev@0 {

			compatible = "tcg,tpm_tis-spi";

			spi-max-frequency = <33000000>;

			reg = <0>;

		};

	};

};



/*

 * Both firmware flashes are 128MB on Wedge400 BMC.

 */

&fmc_flash0 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		/*

		 * u-boot partition: 384KB.

		 */

		u-boot@0 {

			reg = <0x0 0x60000>;

			label = "u-boot";

		};



		/*

		 * u-boot environment variables: 128KB.

		 */

		u-boot-env@60000 {

			reg = <0x60000 0x20000>;

			label = "env";

		};



		/*

		 * FIT image: 123.5 MB.

		 */

		fit@80000 {

			reg = <0x80000 0x7b80000>;

			label = "fit";

		};



		/*

		 * "data0" partition (4MB) is reserved for persistent

		 * data store.

		 */

		data0@3800000 {

			reg = <0x7c00000 0x800000>;

			label = "data0";

		};



		/*

		 * "flash0" partition (covering the entire flash) is

		 * explicitly created to avoid breaking legacy applications.

		 */

		flash0@0 {

			reg = <0x0 0x8000000>;

			label = "flash0";

		};

	};

};



&fmc_flash1 {

	partitions {

		compatible = "fixed-partitions";

		#address-cells = <1>;

		#size-cells = <1>;



		flash1@0 {

			reg = <0x0 0x8000000>;

			label = "flash1";

		};

	};

};



&uart2 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd2_default

		     &pinctrl_rxd2_default>;

};



&uart4 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd4_default

		     &pinctrl_rxd4_default>;

};



/*

 * I2C bus #0 is multi-master environment dedicated for BMC and Bridge IC

 * communication.

 */

&i2c0 {

	status = "okay";

	multi-master;

	bus-frequency = <1000000>;

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";



	i2c-switch@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;

		i2c-mux-idle-disconnect;



		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";

};



&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>;

		i2c-mux-idle-disconnect;



		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";

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";



	i2c-switch@76 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x76>;

		i2c-mux-idle-disconnect;



		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>;

		};



	};

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&adc {

	status = "okay";

};



&ehci1 {

	status = "okay";

};



&uhci {

	status = "okay";

};



&sdhci1 {

	/*

	 * DMA mode needs to be disabled to avoid conflicts with UHCI

	 * Controller in AST2500 SoC.

	 */

	sdhci-caps-mask = <0x0 0x580000>;

};