Commit b55eb1ae authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

Pull "ASPEED device tree updates for 4.16" from Joel Stanley:

Clock driver support:

 Rework all platforms to use proper clock bindings. Linux should now boot
 upstream kernels on ast2400 and ast2500 platforms without out of tree
 patches.

New systems:

 Witherspoon: OpenPower Power9 server manufactured by IBM that uses the ASPEED ast2500
 Zaius: OpenPower Power9 server manufactured by Invatech that uses the ASPEED ast2500
 Q71L: Intel Xeon server manufactured by Qanta that uses the ASPEED ast2400

 We also see updates to the Palmetto and Romulus systems to bring them in
 line with the functionality of those above.

 The systems take advantage of recently added drivers for LPC Snoop
 device and the PWM/Tachometer fan controller.

OpenBMC flash layout:

 The flash layout used OpenBMC systems is added and the device trees now
 use it.

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

:
  ARM: dts: aspeed-evb: Add unit name to memory node
  ARM: dts: aspeed-plametto: Add flash layout and fix memory node
  ARM: dts: aspeed-romulus: Update Romulus system
  ARM: dts: aspeed: Add Qanta Q71L BMC machine
  ARM: dts: aspeed: Add Ingrasys Zaius BMC machine
  ARM: dts: aspeed: Add Witherspoon BMC machine
  ARM: dts: aspeed: Sort ASPEED entries in makefile
  ARM: dts: Add OpenBMC flash layout
  ARM: dts: aspeed: Update license headers
  ARM: dts: aspeed: Remove skeleton.dtsi
  ARM: dts: aspeed: Add LPC Snoop device
  ARM: dts: aspeed: Add PWM and tachometer node
  ARM: dts: aspeed: Add clock phandle to GPIO
  ARM: dts: aspeed: Add flash controller clocks
  ARM: dts: aspeed: Add watchdog clocks
  ARM: dts: aspeed: Add MAC clocks
  ARM: dts: aspeed: Add proper clock references
  ARM: dts: aspeed: Add LPC and child devices
  dt-bindings: gpio: Add ASPEED constants
  dt-bindings: clock: Add ASPEED constants

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7598a4e0 e40ed274

arch/arm/boot/dts/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -1107,6 +1107,10 @@ dtb-$(CONFIG_ARCH_MEDIATEK) += \ 
	mt8127-moose.dtb \

	mt8135-evbp1.dtb

dtb-$(CONFIG_ARCH_ZX) += zx296702-ad1.dtb

dtb-$(CONFIG_ARCH_ASPEED) += aspeed-bmc-opp-palmetto.dtb \

dtb-$(CONFIG_ARCH_ASPEED) += \

	aspeed-ast2500-evb.dtb \

	aspeed-bmc-opp-palmetto.dtb \

	aspeed-bmc-opp-romulus.dtb \

	aspeed-ast2500-evb.dtb
 
	aspeed-bmc-opp-witherspoon.dtb \

	aspeed-bmc-opp-zaius.dtb \

	aspeed-bmc-quanta-q71l.dtb

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

+2 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0+

/dts-v1/;



#include "aspeed-g5.dtsi"
@@ -16,7 +16,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};

};

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

+3 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0+

/dts-v1/;



#include "aspeed-g4.dtsi"
@@ -12,7 +12,7 @@ 
		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

	memory@40000000 {

		reg = <0x40000000 0x20000000>;

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

		m25p,fast-read;

		label = "bmc";

#include "openbmc-flash-layout.dtsi"

	};

};

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

+127 −8
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

// SPDX-License-Identifier: GPL-2.0+

/dts-v1/;



#include "aspeed-g5.dtsi"

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



/ {

	model = "Romulus BMC";

	compatible = "ibm,romulus-bmc", "aspeed,ast2500";



	aliases {

		serial4 = &uart5;

	};



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory {

		reg = <0x80000000 0x40000000>;

	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	reserved-memory {
@@ -29,6 +25,49 @@ 
			no-map;

			reg = <0xbf000000 0x01000000>; /* 16M */

		};



		flash_memory: region@98000000 {

			no-map;

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

		};

	};



	leds {

		compatible = "gpio-leds";



		fault {

			gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>;

		};



		identify {

			gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_HIGH>;

		};



		power {

			gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;

		};

	};



	fsi: gpio-fsi {

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

		#address-cells = <2>;

		#size-cells = <0>;



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

		data-gpios = <&gpio ASPEED_GPIO(AA, 2) GPIO_ACTIVE_HIGH>;

		mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;

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

		trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>;

	};



	gpio-keys {

		compatible = "gpio-keys";



		checkstop {

			label = "checkstop";

			gpios = <&gpio ASPEED_GPIO(J, 2) GPIO_ACTIVE_LOW>;

			linux,code = <ASPEED_GPIO(J, 2)>;

		};

	};

};
@@ -38,6 +77,7 @@ 
		status = "okay";

		m25p,fast-read;

		label = "bmc";

#include "openbmc-flash-layout.dtsi"

	};

};
@@ -53,6 +93,12 @@ 
	};

};



&lpc_ctrl {

	status = "okay";

	memory-region = <&flash_memory>;

	flash = <&spi1>;

};



&uart1 {

	/* Rear RS-232 connector */

	status = "okay";
@@ -81,6 +127,10 @@ 
	pinctrl-0 = <&pinctrl_rmii1_default>;

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};
@@ -133,8 +183,77 @@ 


&i2c12 {

	status = "okay";



	max31785@52 {

		compatible = "maxim,max31785";

		reg = <0x52>;

	};

};



&gpio {

	nic_func_mode0 {

		gpio-hog;

		gpios = <ASPEED_GPIO(D, 3) GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "nic_func_mode0";

	};

	nic_func_mode1 {

		gpio-hog;

		gpios = <ASPEED_GPIO(D, 4) GPIO_ACTIVE_HIGH>;

		output-low;

		line-name = "nic_func_mode1";

	};

};



&vuart {

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



	fan@0 {

		reg = <0x00>;

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

	};



	fan@1 {

		reg = <0x00>;

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

	};



	fan@2 {

		reg = <0x01>;

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

	};



	fan@3 {

		reg = <0x01>;

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

	};



	fan@4 {

		reg = <0x00>;

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

	};



	fan@5 {

		reg = <0x00>;

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

	};



	fan@6 {

		reg = <0x01>;

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

	};

};

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

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

/dts-v1/;

#include "aspeed-g5.dtsi"

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

#include <dt-bindings/leds/leds-pca955x.h>



/ {

	model = "Witherspoon BMC";

	compatible = "ibm,witherspoon-bmc", "aspeed,ast2500";



	chosen {

		stdout-path = &uart5;

		bootargs = "console=ttyS4,115200 earlyprintk";

	};



	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		flash_memory: region@98000000 {

			no-map;

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

		};

	};



	gpio-keys-polled {

		compatible = "gpio-keys-polled";

		#address-cells = <1>;

		#size-cells = <0>;

		poll-interval = <1000>;



		fan0-presence {

			label = "fan0-presence";

			gpios = <&pca0 4 GPIO_ACTIVE_LOW>;

			linux,code = <4>;

		};



		fan1-presence {

			label = "fan1-presence";

			gpios = <&pca0 5 GPIO_ACTIVE_LOW>;

			linux,code = <5>;

		};



		fan2-presence {

			label = "fan2-presence";

			gpios = <&pca0 6 GPIO_ACTIVE_LOW>;

			linux,code = <6>;

		};



		fan3-presence {

			label = "fan3-presence";

			gpios = <&pca0 7 GPIO_ACTIVE_LOW>;

			linux,code = <7>;

		};

	};



	leds {

		compatible = "gpio-leds";



		fan0 {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 0 GPIO_ACTIVE_LOW>;

		};



		fan1 {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 1 GPIO_ACTIVE_LOW>;

		};



		fan2 {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 2 GPIO_ACTIVE_LOW>;

		};



		fan3 {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 3 GPIO_ACTIVE_LOW>;

		};



		front-fault {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 13 GPIO_ACTIVE_LOW>;

		};



		front-power {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 14 GPIO_ACTIVE_LOW>;

		};



		front-id {

			retain-state-shutdown;

			default-state = "keep";

			gpios = <&pca0 15 GPIO_ACTIVE_LOW>;

		};



		rear-fault {

			gpios = <&gpio ASPEED_GPIO(N, 2) GPIO_ACTIVE_LOW>;

		};



		rear-id {

			gpios = <&gpio ASPEED_GPIO(N, 4) GPIO_ACTIVE_LOW>;

		};



		rear-power {

			gpios = <&gpio ASPEED_GPIO(N, 3) GPIO_ACTIVE_LOW>;

		};



		power-button {

			gpios = <&gpio ASPEED_GPIO(R, 5) GPIO_ACTIVE_LOW>;

		};

	};



	fsi: gpio-fsi {

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

		#address-cells = <2>;

		#size-cells = <0>;



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

		data-gpios = <&gpio ASPEED_GPIO(E, 0) GPIO_ACTIVE_HIGH>;

		mux-gpios = <&gpio ASPEED_GPIO(A, 6) GPIO_ACTIVE_HIGH>;

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

		trans-gpios = <&gpio ASPEED_GPIO(R, 2) GPIO_ACTIVE_HIGH>;

	};



	iio-hwmon-dps310 {

		compatible = "iio-hwmon";

		io-channels = <&dps 0>;

	};



	iio-hwmon-bmp280 {

		compatible = "iio-hwmon";

		io-channels = <&bmp 1>;

	};



};



&fmc {

	status = "okay";



	flash@0 {

		status = "okay";

		label = "bmc";

		m25p,fast-read;

#include "openbmc-flash-layout.dtsi"

	};



	flash@1 {

		status = "okay";

		label = "alt";

		m25p,fast-read;

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;



	flash@0 {

		status = "okay";

		label = "pnor";

		m25p,fast-read;

	};

};



&uart1 {

	/* Rear RS-232 connector */

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd1_default

			&pinctrl_rxd1_default

			&pinctrl_nrts1_default

			&pinctrl_ndtr1_default

			&pinctrl_ndsr1_default

			&pinctrl_ncts1_default

			&pinctrl_ndcd1_default

			&pinctrl_nri1_default>;

};



&uart2 {

	/* APSS */

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_txd2_default &pinctrl_rxd2_default>;

};



&uart5 {

	status = "okay";

};



&lpc_ctrl {

	status = "okay";

	memory-region = <&flash_memory>;

	flash = <&spi1>;

};



&mac0 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii1_default>;

	use-ncsi;

};



&i2c2 {

	status = "okay";



	/* MUX ->

	 *    Samtec 1

	 *    Samtec 2

	 */

};



&i2c3 {

	status = "okay";



	bmp: bmp280@77 {

		compatible = "bosch,bmp280";

		reg = <0x77>;

		#io-channel-cells = <1>;

	};



	max31785@52 {

		compatible = "maxim,max31785a";

		reg = <0x52>;

		#address-cells = <1>;

		#size-cells = <0>;

	};



	dps: dps310@76 {

		compatible = "infineon,dps310";

		reg = <0x76>;

		#io-channel-cells = <0>;

	};



	pca0: pca9552@60 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		#address-cells = <1>;

		#size-cells = <0>;



		gpio-controller;

		#gpio-cells = <2>;



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@10 {

			reg = <10>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@11 {

			reg = <11>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@12 {

			reg = <12>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@13 {

			reg = <13>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@14 {

			reg = <14>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@15 {

			reg = <15>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};



	power-supply@68 {

		compatible = "ibm,cffps1";

		reg = <0x68>;

	};



	power-supply@69 {

		compatible = "ibm,cffps1";

		reg = <0x69>;

	};

};



&i2c4 {

	status = "okay";



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	ir35221@70 {

		compatible = "infineon,ir35221";

		reg = <0x70>;

	};



	ir35221@71 {

		compatible = "infineon,ir35221";

		reg = <0x71>;

	};

};





&i2c5 {

	status = "okay";



	tmp423a@4c {

		compatible = "ti,tmp423";

		reg = <0x4c>;

	};



	ir35221@70 {

		compatible = "infineon,ir35221";

		reg = <0x70>;

	};



	ir35221@71 {

		compatible = "infineon,ir35221";

		reg = <0x71>;

	};

};



&i2c9 {

	status = "okay";



	tmp275@4a {

		compatible = "ti,tmp275";

		reg = <0x4a>;

	};

};



&i2c10 {

	/* MUX

	 *   -> PCIe Slot 3

	 *   -> PCIe Slot 4

	 */

	status = "okay";

};



&i2c11 {

	status = "okay";



	pca9552: pca9552@60 {

		compatible = "nxp,pca9552";

		reg = <0x60>;

		#address-cells = <1>;

		#size-cells = <0>;

		gpio-controller;

		#gpio-cells = <2>;



		gpio-line-names = "PS_SMBUS_RESET_N", "APSS_RESET_N",

			"GPU0_TH_OVERT_N_BUFF",	"GPU1_TH_OVERT_N_BUFF",

			"GPU2_TH_OVERT_N_BUFF", "GPU3_TH_OVERT_N_BUFF",

			"GPU4_TH_OVERT_N_BUFF",	"GPU5_TH_OVERT_N_BUFF",

			"GPU0_PWR_GOOD_BUFF", "GPU1_PWR_GOOD_BUFF",

			"GPU2_PWR_GOOD_BUFF", "GPU3_PWR_GOOD_BUFF",

			"GPU4_PWR_GOOD_BUFF", "GPU5_PWR_GOOD_BUFF",

			"12V_BREAKER_FLT_N", "THROTTLE_UNLATCHED_N";



		gpio@0 {

			reg = <0>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@1 {

			reg = <1>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@2 {

			reg = <2>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@3 {

			reg = <3>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@4 {

			reg = <4>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@5 {

			reg = <5>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@6 {

			reg = <6>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@7 {

			reg = <7>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@8 {

			reg = <8>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@9 {

			reg = <9>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@10 {

			reg = <10>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@11 {

			reg = <11>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@12 {

			reg = <12>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@13 {

			reg = <13>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@14 {

			reg = <14>;

			type = <PCA955X_TYPE_GPIO>;

		};



		gpio@15 {

			reg = <15>;

			type = <PCA955X_TYPE_GPIO>;

		};

	};



	rtc@32 {

		compatible = "epson,rx8900";

		reg = <0x32>;

	};



	eeprom@51 {

		compatible = "atmel,24c64";

		reg = <0x51>;

	};



	ucd90160@64 {

		compatible = "ti,ucd90160";

		reg = <0x64>;

	};

};



&i2c12 {

	status = "okay";

};



&i2c13 {

	status = "okay";

};



&vuart {

	status = "okay";

};



&gfx {

	status = "okay";

};



&pinctrl {

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

};



&wdt1 {

	aspeed,reset-type = "none";

	aspeed,external-signal;

	aspeed,ext-push-pull;

	aspeed,ext-active-high;



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_wdtrst1_default>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE