Commit 743f4e5b authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ASPEED device tree updates for 5.5

 - Lots of work on the AST2600 boards as bringup continues. There's the
 eval board, and two IBM boards called Tacoma and Rainier

 - A new flash layout for OpenBMC systems with larger flashes

 - Better support for the MAC clocking when talking to a NCSI device,
 making Linux less reliant on u-boot having done the correct thing

 - LED fixes for vesin and fp5280g2

 - SGPIO support

 - Facebook network BMC cleanup with the common hardware moved to a
 shared dtsi

* tag 'aspeed-5.5-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed: (48 commits)
  ARM: dts: aspeed-g6: Add timer description
  ARM: dts: aspeed: ast2600evb: Enable i2c buses
  ARM: dts: aspeed-g5: Add SGPIO description
  ARM: dts: aspeed: yamp: Use common dtsi
  ARM: dts: aspeed: minipack: Use common dtsi
  ARM: dts: aspeed: cmm: Use common dtsi
  ARM: dts: aspeed: Common dtsi for Facebook AST2500 Network BMCs
  ARM: dts: aspeed: rainier: gpio-keys for PSU presence
  ARM: dts: aspeed: rainier: Fix i2c eeprom size
  ARM: dts: tacoma: Hog LPC pinmux
  ARM: dts: aspeed: rainier: Enable VUART1
  ARM: dts: aspeed: rainier: Add i2c eeproms
  ARM: dts: aspeed: tacoma: Use 64MB for firmware memory
  ARM: dts: aspeed: tacoma: Add host FSI description
  ARM: dts: ast2600evb: Enable UART workaround
  ARM: dts: aspeed: tacoma: Add UART1 and workaround
  ARM: dts: aspeed-g6: Add remaining UARTs
  ARM: dts: aspeed-g6: Fix i2c clock source
  ARM: dts: aspeed: Add RCLK to MAC clocks for RMII interfaces
  ARM: dts: aspeed: tacoma: Enable FMC and SPI devices
  ...

Link: https://lore.kernel.org/r/CACPK8Xe8XiJ+oEp3_AXO5Mox-mXWVrOJKQLJMKJxg1WdYCTzMw@mail.gmail.com


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 44124df4 3eca037f

arch/arm/boot/dts/Makefile

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

	aspeed-bmc-facebook-wedge100.dtb \

	aspeed-bmc-facebook-yamp.dtb \

	aspeed-bmc-ibm-rainier.dtb \

	aspeed-bmc-intel-s2600wf.dtb \

	aspeed-bmc-inspur-fp5280g2.dtb \

	aspeed-bmc-lenovo-hr630.dtb \
@@ -1308,6 +1309,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-bmc-opp-swift.dtb \

	aspeed-bmc-opp-tacoma.dtb \

	aspeed-bmc-opp-vesnin.dtb \

	aspeed-bmc-opp-witherspoon.dtb \

	aspeed-bmc-opp-zaius.dtb \

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

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ 
		status = "okay";

		m25p,fast-read;

		label = "bmc";

		spi-max-frequency = <50000000>;

#include "openbmc-flash-layout.dtsi"

	};

};
@@ -50,6 +51,7 @@ 
		status = "okay";

		m25p,fast-read;

		label = "pnor";

		spi-max-frequency = <100000000>;

	};

};

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

+136 −1
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ 


	phy-mode = "rgmii";

	phy-handle = <&ethphy1>;



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default>;

};



&mac2 {
@@ -62,6 +65,9 @@ 


	phy-mode = "rgmii";

	phy-handle = <&ethphy2>;



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii3_default>;

};



&mac3 {
@@ -69,12 +75,141 @@ 


	phy-mode = "rgmii";

	phy-handle = <&ethphy3>;



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii4_default>;

};



&emmc {

&emmc_controller {

	status = "okay";

};



&emmc {

	non-removable;

	bus-width = <4>;

	max-frequency = <52000000>;

};



&rtc {

	status = "okay";

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

		spi-max-frequency = <50000000>;



		partitions {

			compatible = "fixed-partitions";

			#address-cells = <1>;

			#size-cells = <1>;



			u-boot@0 {

				reg = <0x0 0xe0000>; // 896KB

				label = "u-boot";

			};



			u-boot-env@e0000 {

				reg = <0xe0000 0x20000>; // 128KB

				label = "u-boot-env";

			};



			kernel@100000 {

				reg = <0x100000 0x900000>; // 9MB

				label = "kernel";

			};



			rofs@a00000 {

				reg = <0xa00000 0x2000000>; // 32MB

				label = "rofs";

			};



			rwfs@6000000 {

				reg = <0x2a00000 0x1600000>; // 22MB

				label = "rwfs";

			};

		};

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;



	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "pnor";

		spi-max-frequency = <100000000>;

	};

};



&uart5 {

	// Workaround for A0

	compatible = "snps,dw-apb-uart";

};



&i2c0 {

	status = "okay";



	temp@2e {

		compatible = "adi,adt7490";

		reg = <0x2e>;

	};

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";

};



&i2c7 {

	status = "okay";

};



&i2c8 {

	status = "okay";

};



&i2c9 {

	status = "okay";

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&i2c14 {

	status = "okay";

};



&i2c15 {

	status = "okay";

};

arch/arm/boot/dts/aspeed-bmc-arm-stardragon4800-rep2.dts

+3 −0
Original line number Diff line number Diff line
@@ -92,6 +92,9 @@ 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii2_default>;

	clocks = <&syscon ASPEED_CLK_GATE_MAC2CLK>,

		 <&syscon ASPEED_CLK_MAC2RCLK>;

	clock-names = "MACCLK", "RCLK";

	use-ncsi;

};

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

+16 −50
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
// Copyright (c) 2018 Facebook Inc.

/dts-v1/;



#include "aspeed-g5.dtsi"

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



/ {

	model = "Facebook Backpack CMM BMC";
@@ -53,10 +53,6 @@ 
		bootargs = "console=ttyS1,9600n8 root=/dev/ram rw earlyprintk";

	};



	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	ast-adc-hwmon {

		compatible = "iio-hwmon";

		io-channels = <&adc 0>, <&adc 1>, <&adc 2>, <&adc 3>,
@@ -64,39 +60,7 @@ 
	};

};



&pinctrl {

	aspeed,external-nodes = <&gfx &lhc>;

};



/*

 * Update reset type to "system" (full chip) to fix warm reboot hang issue

 * when reset type is set to default ("soc", gated by reset mask registers).

 */

&wdt1 {

	status = "okay";

	aspeed,reset-type = "system";

};



/*

 * wdt2 is not used by Backpack CMM.

 */

&wdt2 {

	status = "disabled";

};



&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
@@ -107,8 +71,6 @@ 
};



&uart3 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd3_default

		     &pinctrl_rxd3_default

		     &pinctrl_ncts3_default
@@ -123,17 +85,6 @@ 
		     &pinctrl_rxd4_default>;

};



&uart5 {

	status = "okay";

};



&mac1 {

	status = "okay";

	no-hw-checksum;

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



/*

 * I2C bus reserved for communication with COM-E.

 */
@@ -380,3 +331,18 @@ 
&ehci1 {

	status = "okay";

};



&vhub {

	status = "disabled";

};



&sdhci0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_sd1_default>;

};



&sdhci1 {

	status = "disabled";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE