Commit 4b9743e8 authored by Olof Johansson's avatar Olof Johansson
Browse files

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

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

ASPEED device tree updates for 4.18

New hardware support added:

  USB controllers for AST2400 and AST2500 which have drivers
  merged in 4.18.

  Hardware random number generator which we made enhancements to many
  releases ago, but never added the device tree parts.

  Misc changes to support watchdog and gpio-keys features used by
  OpenBMC systems.

New machines:

 Intel S2600WF, an Intel platform family with an ASPEED AST2500 BMC.

 Inventec Lanyang, a Power 9 platform with AST2500.

 Portwell Neptune, a x86 server development kit with an AST2500.

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

:
  ARM: dts: Aspeed: Enable USB ports on eval board.
  ARM: dts: Add Aspeed SoC USB controllers to device-tree
  ARM: dts: aspeed: Add S2600WF BMC Machine
  ARM: dts: aspeed: Add Inventec Lanyang BMC
  ARM: dts: aspeed: Add Portwell Neptune machine
  ARM: dts: aspeed: witherspoon: Set alternate boot
  ARM: dts: aspeed: witherspoon: Add gpio keys for power supply presence
  ARM: dts: aspeed: witherspoon: Enable checkstop and cooling gpio keys
  ARM: dts: aspeed: zaius: Add pcie-e2b-present gpio key
  ARM: dts: aspeed: romulus: Add id-button gpio key
  ARM: dts: aspeed: Describe random number device

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e0c66d34 5b1d4fa9

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ pine64 Pine64 
pixcir  PIXCIR MICROELECTRONICS Co., Ltd

plathome	Plat'Home Co., Ltd.

plda	PLDA

portwell	Portwell Inc.

poslab	Poslab Technology Co., Ltd.

powervr	PowerVR (deprecated, use img)

probox2	PROBOX2 (by W2COMP Co., Ltd.)

arch/arm/boot/dts/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -1170,8 +1170,11 @@ dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb 
dtb-$(CONFIG_ARCH_ASPEED) += \

	aspeed-ast2500-evb.dtb \

	aspeed-bmc-arm-centriq2400-rep.dtb \

	aspeed-bmc-intel-s2600wf.dtb \

	aspeed-bmc-opp-lanyang.dtb \

	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-bmc-opp-witherspoon.dtb \

	aspeed-bmc-opp-zaius.dtb \

	aspeed-bmc-portwell-neptune.dtb \

	aspeed-bmc-quanta-q71l.dtb

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

+18 −0
Original line number Diff line number Diff line
@@ -79,3 +79,21 @@ 
		reg = <0x4d>;

	};

};



&ehci0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usb2ah_default>;

};



&ehci1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_usb2bh_default>;

};



&uhci {

	status = "okay";



	/* No pinctrl, this follows the above EHCI settings */

};

arch/arm/boot/dts/aspeed-bmc-intel-s2600wf.dts

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

// Copyright (c) 2017 Intel Corporation

/dts-v1/;



#include "aspeed-g5.dtsi"



/ {

	model = "S2600WF BMC";

	compatible = "intel,s2600wf-bmc", "aspeed,ast2500";



	chosen {

		stdout-path = &uart5;

		bootargs = "earlyprintk";

	};



	memory {

		reg = <0x80000000 0x20000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		vga_memory: framebuffer@7f000000 {

			no-map;

			reg = <0x7f000000 0x01000000>;

		};

	};



	iio-hwmon {

		compatible = "iio-hwmon";

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

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

			<&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,

			<&adc 12>, <&adc 13>, <&adc 14>, <&adc 15>;

	};



};



&fmc {

	status = "okay";

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

	};

};



&uart5 {

	status = "okay";

};



&mac0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii1_default>;

	use-ncsi;

};



&mac1 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

};



&i2c4 {

	status = "okay";

};



&i2c5 {

	status = "okay";

};



&i2c6 {

	status = "okay";

};



&i2c7 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&gfx {

	status = "okay";

};



&pinctrl {

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

};



&pwm_tacho {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default

			 &pinctrl_pwm2_default &pinctrl_pwm3_default

			 &pinctrl_pwm4_default &pinctrl_pwm5_default

			 &pinctrl_pwm6_default &pinctrl_pwm7_default>;

};

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

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

// Copyright (c) 2018 Inventec Corporation

/dts-v1/;



#include "aspeed-g5.dtsi"

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



/ {

	model = "Lanyang BMC";

	compatible = "inventec,lanyang-bmc", "aspeed,ast2500";



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

		reg = <0x80000000 0x40000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		flash_memory: region@98000000 {

			no-map;

			reg = <0x98000000 0x04000000>; /* 64M */

		};

	};



	leds {

		compatible = "gpio-leds";



		sys_boot_status {

			label = "System_boot_status";

			gpios = <&gpio ASPEED_GPIO(B, 6) GPIO_ACTIVE_LOW>;

		};



		attention {

			label = "Attention_locator";

			gpios = <&gpio ASPEED_GPIO(B, 7) GPIO_ACTIVE_HIGH>;

		};



		plt_fault {

			label = "Platform_fault";

			gpios = <&gpio ASPEED_GPIO(B, 1) GPIO_ACTIVE_HIGH>;

		};



		hdd_fault {

			label = "Onboard_drive_fault";

			gpios = <&gpio ASPEED_GPIO(B, 3) GPIO_ACTIVE_HIGH>;

		};

		bmc_err {

			lable = "BMC_fault";

			gpios = <&gpio ASPEED_GPIO(H, 6) GPIO_ACTIVE_HIGH>;

		};



		sys_err {

			lable = "Sys_fault";

			gpios = <&gpio ASPEED_GPIO(H, 7) GPIO_ACTIVE_HIGH>;

		};

	};



	fsi: gpio-fsi {

		compatible = "fsi-master-gpio", "fsi-master";

		#address-cells = <2>;

		#size-cells = <0>;



		clock-gpios = <&gpio ASPEED_GPIO(J, 0) GPIO_ACTIVE_HIGH>;

		data-gpios = <&gpio ASPEED_GPIO(J, 1) GPIO_ACTIVE_HIGH>;

		trans-gpios = <&gpio ASPEED_GPIO(D, 5) GPIO_ACTIVE_HIGH>;

		enable-gpios = <&gpio ASPEED_GPIO(D, 0) GPIO_ACTIVE_HIGH>;

		mux-gpios = <&gpio ASPEED_GPIO(H, 2) GPIO_ACTIVE_HIGH>;

	};



	iio-hwmon {

		compatible = "iio-hwmon";

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

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

			<&adc 8>, <&adc 9>, <&adc 10>, <&adc 11>,

			<&adc 13>, <&adc 14>, <&adc 15>;

	};



	iio-hwmon-battery {

		compatible = "iio-hwmon";

		io-channels = <&adc 12>;

	};

};



&pwm_tacho {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_pwm0_default &pinctrl_pwm1_default

		&pinctrl_pwm2_default &pinctrl_pwm3_default>;



	fan@0 {

		reg = <0x00>;

		aspeed,fan-tach-ch = /bits/ 8 <0x00>;

	};



	fan@1 {

		reg = <0x01>;

		aspeed,fan-tach-ch = /bits/ 8 <0x01>;

	};



	fan@2 {

		reg = <0x02>;

		aspeed,fan-tach-ch = /bits/ 8 <0x02>;

	};



	fan@3 {

		reg = <0x03>;

		aspeed,fan-tach-ch = /bits/ 8 <0x03>;

	};

};



&fmc {

	status = "okay";

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

		label = "pnor";

		m25p,fast-read;

	};

};



&spi2 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi2ck_default

		     &pinctrl_spi2cs0_default

		     &pinctrl_spi2cs1_default

		     &pinctrl_spi2miso_default

		     &pinctrl_spi2mosi_default>;



	flash@0 {

		status = "okay";

	};

};



&uart1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd1_default

		     &pinctrl_rxd1_default>;

};



&lpc_ctrl {

	status = "okay";

	memory-region = <&flash_memory>;

	flash = <&spi1>;

};



&lpc_snoop {

	status = "okay";

	snoop-ports = <0x80>;

};



&uart5 {

	status = "okay";

};



&mac0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii1_default>;

	use-ncsi;

};



&mac1 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&i2c0 {

	status = "okay";



	eeprom@55 {

		compatible = "atmel,24c64";

		reg = <0x55>;

		pagesize = <32>;

	};



	rtc@68 {

		compatible = "nxp,pcf8523";

		reg = <0x68>;

	};



	tmp75@48 {

		compatible = "ti,tmp75";

		reg = <0x48>;

	};

};



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

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";

};



&vuart {

	status = "okay";

};



&gfx {

	status = "okay";

};



&pinctrl {

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

};



&gpio {

	pin_gpio_b0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(B, 0) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_HDD1_PWR_EN";

	};



	pin_gpio_b5 {

		gpio-hog;

		gpios = <ASPEED_GPIO(B, 5) GPIO_ACTIVE_HIGH>;

		input;

		line-name = "BMC_USB1_OCI2";

	};



	pin_gpio_h5 {

		gpio-hog;

		gpios = <ASPEED_GPIO(H, 5) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_CP0_PERST_ENABLE_R";

	};



	pin_gpio_z2 {

		gpio-hog;

		gpios = <ASPEED_GPIO(Z, 2) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "RST_PCA9546_U177_N";

	};



	pin_gpio_aa6 {

		gpio-hog;

		gpios = <ASPEED_GPIO(AA, 6) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_CP0_RESET_N";

	};



	pin_gpio_aa7 {

		gpio-hog;

		gpios = <ASPEED_GPIO(AA, 7) GPIO_ACTIVE_HIGH>;

		output-high;

		line-name = "BMC_TPM_RESET_N";

	};



	pin_gpio_ab0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(AB, 0) GPIO_ACTIVE_LOW>;

		output-high;

		line-name = "BMC_USB_PWRON_N";

	};

};



&ibt {

	status = "okay";

};



&adc {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE