Commit bbf7499d authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ASPEED device tree updates for 5.2

 - RTC and GFX DRM driver went upstream this cycle

 - Miscellaneous board updates for Facebook and IBM BMCs

* tag 'aspeed-5.2-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/aspeed

:
  ARM: dts: aspeed: Add RTC node
  ARM: dts: aspeed: witherspoon: Update BMC partitioning
  ARM: dts: aspeed: cmm: enable iio-hwmon-adc
  ARM: dts: aspeed: tiogapass: Enable VUART
  ARM: dts: aspeed-g5: Add video engine
  ARM: dts: aspeed: Enable the GFX IP
  ARM: dts: aspeed-g5: Add resets and clocks to GFX node
  ARM: dts: aspeed: witherspoon: Enable vhub
  ARM: dts: aspeed: palmetto: Fix flash_memory region
  ARM: dts: aspeed: ast2500: Update flash layout

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 2fe743c2 6d00c6f8

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

+20 −1
Original line number Diff line number Diff line
@@ -13,12 +13,25 @@ 


	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

		bootargs = "console=tty0 console=ttyS4,115200 earlyprintk";

	};



	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		gfx_memory: framebuffer {

			size = <0x01000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};

	};

};



&fmc {
@@ -27,6 +40,7 @@ 
		status = "okay";

		m25p,fast-read;

		label = "bmc";

#include "openbmc-flash-layout.dtsi"

	};

};
@@ -97,3 +111,8 @@ 
&uhci {

	status = "okay";

};



&gfx {

     status = "okay";

     memory-region = <&gfx_memory>;

};

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

+6 −0
Original line number Diff line number Diff line
@@ -56,6 +56,12 @@ 
	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	ast-adc-hwmon {

		compatible = "iio-hwmon";

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

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

	};

};



&pinctrl {

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

+5 −0
Original line number Diff line number Diff line
@@ -64,6 +64,11 @@ 
	status = "okay";

};



&vuart {

	// VUART Host Console

	status = "okay";

};



&uart1 {

	// Host Console

	status = "okay";

arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts

+2 −2
Original line number Diff line number Diff line
@@ -32,9 +32,9 @@ 
			no-map;

		};



		flash_memory: region@98000000 {

		flash_memory: region@5c000000 {

			no-map;

			reg = <0x98000000 0x01000000>; /* 16MB */

			reg = <0x5C000000 0x02000000>; /* 32MB */

		};

	};

arch/arm/boot/dts/aspeed-bmc-opp-romulus.dts

+8 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ 
			reg = <0x9ef00000 0x00100000>;

			no-map;

		};



		gfx_memory: framebuffer {

			size = <0x01000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};

	};



	leds {
@@ -238,6 +245,7 @@ 


&gfx {

	status = "okay";

	memory-region = <&gfx_memory>;

};



&pinctrl {

CRA Git | Maintained and supported by SUSTech CRA and CCSE