Unverified Commit 153927e6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ASPEED device tree updates for 6.3

 - New machines

   * Ufispace NCPLite AST2600 BMC
   * Facebook Greatlakes AST2600 BMC

 - Updates for ethanolx, bletchley and tyan s8036

* tag 'aspeed-6.3-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: p10bmc: Enable UART2
  ARM: dts: aspeed: Add device tree for Ufispace NCPLite BMC
  dt-bindings: arm: aspeed: document Ufispace NCPLite BMC
  dt-bindings: vendor-prefixes: Add prefix for Ufi Space
  arm: dts: aspeed: tyan s8036: Enable kcs interrupts
  ARM: dts: aspeed: bletchley: Enable wdtrst1
  ARM: dts: aspeed: bletchley: Rename flash1 label
  ARM: dts: aspeed: ethanolx: Add BIOS flash chip
  ARM: dts: aspeed: ethanolx: Enable CTS/RTS pins on UART1
  ARM: dts: aspeed: ethanolx: Add label for the master partition
  ARM: dts: aspeed: ethanolx: Correct EEPROM device name
  ARM: dts: aspeed: ethanolx: Enable VUART
  ARM: dts: aspeed: greatlakes: Add Facebook greatlakes (AST2600) BMC
  dt-bindings: arm: aspeed: add Facebook Greatlakes board

Link: https://lore.kernel.org/r/CACPK8XdbffU5yRSZF-zR2xv-+6aJK+hEXP8TOkW=SvS+nNTGxg@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents cfd5bdf3 1480bcf0

Documentation/devicetree/bindings/arm/aspeed/aspeed.yaml

+2 −0
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ properties: 
              - facebook,cloudripper-bmc

              - facebook,elbert-bmc

              - facebook,fuji-bmc

              - facebook,greatlakes-bmc

              - ibm,everest-bmc

              - ibm,rainier-bmc

              - ibm,tacoma-bmc
@@ -85,6 +86,7 @@ properties: 
              - jabil,rbp-bmc

              - qcom,dc-scm-v1-bmc

              - quanta,s6q-bmc

              - ufispace,ncplite-bmc

          - const: aspeed,ast2600



additionalProperties: true

Documentation/devicetree/bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -1386,6 +1386,8 @@ patternProperties: 
    description: uCRobotics

  "^udoo,.*":

    description: Udoo

  "^ufispace,.*":

    description: Ufi Space Co., Ltd.

  "^ugoos,.*":

    description: Ugoos Industrial Co., Ltd.

  "^uniwest,.*":

arch/arm/boot/dts/Makefile

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

	aspeed-bmc-facebook-fuji.dtb \

	aspeed-bmc-facebook-galaxy100.dtb \

	aspeed-bmc-facebook-greatlakes.dtb \

	aspeed-bmc-facebook-minipack.dtb \

	aspeed-bmc-facebook-tiogapass.dtb \

	aspeed-bmc-facebook-wedge40.dtb \
@@ -1648,6 +1649,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-inventec-transformers.dtb \

	aspeed-bmc-tyan-s7106.dtb \

	aspeed-bmc-tyan-s8036.dtb \

	aspeed-bmc-ufispace-ncplite.dtb \

	aspeed-bmc-vegman-n110.dtb \

	aspeed-bmc-vegman-rx20.dtb \

	aspeed-bmc-vegman-sx20.dtb

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

+23 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 


#include "aspeed-g5.dtsi"

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

#include <dt-bindings/interrupt-controller/irq.h>



/ {

	model = "AMD EthanolX BMC";
@@ -58,10 +59,22 @@ &fmc { 
	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

		#include "openbmc-flash-layout.dtsi"

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bios";

		spi-max-frequency = <100000000>;

	};

};



&mac0 {

	status = "okay";
@@ -78,7 +91,9 @@ &uart1 { 
	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd1_default

		     &pinctrl_rxd1_default>;

		     &pinctrl_rxd1_default

		     &pinctrl_nrts1_default

		     &pinctrl_ncts1_default>;

};



&uart5 {
@@ -160,7 +175,7 @@ &i2c2 { 
&i2c3 {

	status = "okay";

	eeprom@50 {

		compatible = "atmel,24c256";

		compatible = "atmel,24c128";

		reg = <0x50>;

		pagesize = <64>;

	};
@@ -261,6 +276,12 @@ &lpc_ctrl { 
	status = "okay";

};



&vuart {

	status = "okay";

	aspeed,lpc-io-reg = <0x3f8>;

	aspeed,lpc-interrupts = <4 IRQ_TYPE_LEVEL_HIGH>;

};



&pwm_tacho {

	status = "okay";

	pinctrl-names = "default";

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

+12 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ flash@0 { 
	flash@1 {

		status = "okay";

		m25p,fast-read;

		label = "flash1";

		label = "alt-bmc";

		spi-max-frequency = <50000000>;

	};

};
@@ -1064,3 +1064,14 @@ pinctrl_gpiov2_unbiased_default: gpiov2 { 
		bias-disable;

	};

};



&wdt1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_wdtrst1_default>;

	aspeed,reset-type = "soc";

	aspeed,external-signal;

	aspeed,ext-push-pull;

	aspeed,ext-active-high;

	aspeed,ext-pulse-duration = <256>;

};