Commit 9ba24e9c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ASPEED device tree updates for 5.1

 - New machine: Inspur ON5263M5, an Intel Xeon OCP compute node

 - Misc device tree updates from the OpenBMC project

 - #interrupt-cells fix for GPIO controller

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

:
  ARM: dts: aspeed: quanta-q71l: enable uart1
  ARM: dts: aspeed: quanta-q71l: enable lpc_ctrl node
  ARM: dts: aspeed: tiogapass: Add uarts for SoL
  ARM: dts: aspeed: tiogapass: Add LPC devices
  ARM: dts: aspeed: Add Inspur on5263m5 BMC
  ARM: dts: aspeed: tiogapass: Add sensors
  ARM: dts: aspeed: tiogapass: Enable KCS
  ARM: dts: aspeed: Add KCS support for LPC BMC
  ARM: dts: aspeed: Add #interrupt-cells property to gpio controllers
  ARM: dts: aspeed-palmetto: Add i2c OCC hwmon node
  ARM: dts: aspeed: stardragon4800: Add power supply

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0b03e47d e1542521

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

+10 −0
Original line number Diff line number Diff line
@@ -173,6 +173,16 @@ 
			};

		};

	};



	dps650ab@58 {

		compatible = "delta,dps650ab";

		reg = <0x58>;

	};



	dps650ab@59 {

		compatible = "delta,dps650ab";

		reg = <0x59>;

	};

};



&i2c9 {

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

+53 −2
Original line number Diff line number Diff line
@@ -21,6 +21,17 @@ 
	memory@80000000 {

		reg = <0x80000000 0x20000000>;

	};



	iio-hwmon {

		compatible = "iio-hwmon";

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

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

	};



	iio-hwmon-battery {

		compatible = "iio-hwmon";

		io-channels = <&adc 7>;

	};

};



&fmc {
@@ -43,6 +54,16 @@ 
	};

};



&lpc_snoop {

	status = "okay";

	snoop-ports = <0x80>;

};



&lpc_ctrl {

	// Enable lpc clock

	status = "okay";

};



&uart1 {

	// Host Console

	status = "okay";
@@ -51,11 +72,33 @@ 
		     &pinctrl_rxd1_default>;

};



&uart2 {

	// SoL Host Console

	status = "okay";

};



&uart3 {

	// SoL BMC Console

	status = "okay";

};



&uart5 {

	// BMC Console

	status = "okay";

};



&kcs2 {

	// BMC KCS channel 2

	status = "okay";

	kcs_addr = <0xca8>;

};



&kcs3 {

	// BMC KCS channel 3

	status = "okay";

	kcs_addr = <0xca2>;

};



&mac0 {

	status = "okay";
@@ -64,6 +107,10 @@ 
	use-ncsi;

};



&adc {

	status = "okay";

};



&i2c0 {

	status = "okay";

	//Airmax Conn B, CPU0 PIROM, CPU1 PIROM
@@ -122,6 +169,10 @@ 


&i2c8 {

	status = "okay";

	tmp421@1f {

		compatible = "ti,tmp421";

		reg = <0x1f>;

	};

	//Mezz Sensor SMBus

};
@@ -140,7 +191,7 @@ 
	};



	fan@1 {

		reg = <0x00>;

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

		reg = <0x01>;

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

	};

};

arch/arm/boot/dts/aspeed-bmc-inspur-on5263m5.dts

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

// Copyright (c) 2018 Inspur Corporation

/dts-v1/;



#include "aspeed-g5.dtsi"

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



/ {

	model = "ON5263M5 BMC";

	compatible = "inspur,on5263m5-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@9f000000 {

			no-map;

			reg = <0x9f000000 0x01000000>;

		};

	};



	leds {

	    compatible = "gpio-leds";

	    bmc_alive {

		label = "bmc_alive";

		gpios = <&gpio ASPEED_GPIO(I, 1) GPIO_ACTIVE_LOW>;

		linux,default-trigger = "timer";

	    };

	};



	iio-hwmon {

		compatible = "iio-hwmon";

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

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

	};



};



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

};



&i2c6 {

	status = "okay";



	tmp421@4e {

		compatible = "ti,tmp421";

		reg = <0x4e>;

	};



	tmp112@48 {

		compatible = "ti,tmp112";

		reg = <0x48>;

	};



	eeprom@54 {

		compatible = "atmel,24c64";

		reg = <0x54>;

		pagesize = <32>;

	};

};



&i2c7 {

	status = "okay";



	adm1278@11 {

		  compatible = "adi,adm1278";

		  reg = <0x11>;

	};

};



&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 <0x00 0x01>;

	};



	fan@1 {

		reg = <0x01>;

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

	};

};



&adc {

	status = "okay";

};

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

+5 −0
Original line number Diff line number Diff line
@@ -169,6 +169,11 @@ 


&i2c3 {

	status = "okay";



	occ-hwmon@50 {

		compatible = "ibm,p8-occ-hwmon";

		reg = <0x50>;

	};

};



&i2c4 {

arch/arm/boot/dts/aspeed-bmc-quanta-q71l.dts

+8 −0
Original line number Diff line number Diff line
@@ -116,6 +116,10 @@ 
	status = "okay";

};



&lpc_ctrl {

	status = "okay";

};



&lpc_snoop {

	status = "okay";

	snoop-ports = <0x80>;
@@ -134,6 +138,10 @@ 
	pinctrl-0 = <&pinctrl_rgmii2_default &pinctrl_mdio2_default>;

};



&uart1 {

	status = "okay";

};



&uart5 {

	status = "okay";

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE