Unverified Commit 3c9690f7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ASPEED device tree updates for 6.14

- New machines

  * IBM SPB1 AST2600 BMC machine, a Sapphire Rapids x86 server
  * Ampre Mt Jefferson AST2600 BMC

 - Updates to mtmitchell, rainier, blueridge, everest, fuji, system1,
   harma, catalina and minerva

 - A big rework of yosemite4

* tag 'aspeed-6.14-devicetree' of https://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (55 commits)
  ARM: dts: aspeed: yosemite4: adjust secondary flash name
  ARM: dts: aspeed: system1: Use crps PSU driver
  ARM: dts: aspeed: minerva: add second source RTC
  ARM: dts: aspeed: minerva: add bmc ready led setting
  ARM: dts: aspeed: minerva: add i/o expanders on each FCB
  ARM: dts: aspeed: minerva: add i/o expanders on bus 0
  ARM: dts: aspeed: catalina: remove interrupt of GPIOB4 form all IOEXP
  ARM: dts: aspeed: catalina: revise ltc4287 shunt-resistor value
  arm: dts: aspeed: Blueridge and Rainer: Add VRM presence GPIOs
  ARM: dts: aspeed: Blueridge and Fuji: Fix LED node names
  arm: dts: aspeed: Everest and Fuji: Add VRM presence gpio expander
  ARM: dts: aspeed: sbp1: IBM sbp1 BMC board
  dt-bindings: arm: aspeed: add IBM SBP1 board
  ARM: dts: aspeed: Add device tree for Ampere's Mt. Jefferson BMC
  dt-bindings: arm: aspeed: add Mt. Jefferson board
  ARM: dts: aspeed: yosemite4: Add i2c-mux for ADC monitor on Spider Board
  ARM: dts: aspeed: yosemite4: Revise adc128d818 adc mode on Fan Boards
  ARM: dts: aspeed: yosemite4: Change the address of Fan IC on fan boards
  ARM: dts: aspeed: yosemite4: Revise address of i2c-mux for two fan boards
  ARM: dts: aspeed: yosemite4: correct the compatible string for max31790
  ...

Link: https://lore.kernel.org/r/CACPK8Xe8yZLXzEQPp=1D2f0TsKA7hBZG=pHHW6U51FMpp_BiRQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d6725107 3540adcc

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

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,7 @@ properties: 
      - description: AST2600 based boards

        items:

          - enum:

              - ampere,mtjefferson-bmc

              - ampere,mtmitchell-bmc

              - aspeed,ast2600-evb

              - aspeed,ast2600-evb-a1
@@ -91,6 +92,7 @@ properties: 
              - ibm,everest-bmc

              - ibm,fuji-bmc

              - ibm,rainier-bmc

              - ibm,sbp1-bmc

              - ibm,system1-bmc

              - ibm,tacoma-bmc

              - inventec,starscream-bmc

arch/arm/boot/dts/aspeed/Makefile

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

	aspeed-bmc-amd-ethanolx.dtb \

	aspeed-bmc-ampere-mtjade.dtb \

	aspeed-bmc-ampere-mtjefferson.dtb \

	aspeed-bmc-ampere-mtmitchell.dtb \

	aspeed-bmc-arm-stardragon4800-rep2.dtb \

	aspeed-bmc-asrock-e3c246d4i.dtb \
@@ -40,6 +41,7 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-ibm-rainier.dtb \

	aspeed-bmc-ibm-rainier-1s4u.dtb \

	aspeed-bmc-ibm-rainier-4u.dtb \

	aspeed-bmc-ibm-sbp1.dtb \

	aspeed-bmc-ibm-system1.dtb \

	aspeed-bmc-intel-s2600wf.dtb \

	aspeed-bmc-inspur-fp5280g2.dtb \

arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtjefferson.dts

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

// Copyright 2024 Ampere Computing LLC.



/dts-v1/;



#include "aspeed-g6.dtsi"

#include <dt-bindings/i2c/i2c.h>

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



/ {

	model = "Ampere Mt. Jefferson BMC";

	compatible = "ampere,mtjefferson-bmc", "aspeed,ast2600";



	aliases {

		i2c20 = &i2c4_bus70_chn0;

		i2c22 = &i2c4_bus70_chn2;



		/*

		 *  I2C OCP alias port

		 */

		i2c30 = &ocpslot;



		/*

		 *  I2C NVMe alias port

		 */

		i2c48 = &nvmeslot_0;

		i2c49 = &nvmeslot_1;

		i2c50 = &nvmeslot_2;

		i2c51 = &nvmeslot_3;

		i2c52 = &nvmeslot_4;

		i2c53 = &nvmeslot_5;

		i2c54 = &nvmeslot_6;

		i2c55 = &nvmeslot_7;

		i2c56 = &nvmeslot_8;

		i2c57 = &nvmeslot_9;

		i2c58 = &nvmeslot_10;

		i2c59 = &nvmeslot_11;

	};



	chosen {

		stdout-path = &uart5;

	};



	memory@80000000 {

		device_type = "memory";

		reg = <0x80000000 0x80000000>;

	};



	reserved-memory {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		gfx_memory: framebuffer {

			size = <0x01000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};



		video_engine_memory: video {

			size = <0x04000000>;

			alignment = <0x01000000>;

			compatible = "shared-dma-pool";

			reusable;

		};



		vga_memory: region@bf000000 {

			no-map;

			compatible = "shared-dma-pool";

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

		};

	};



	voltage_mon_reg: voltage-mon-regulator {

		compatible = "regulator-fixed";

		regulator-name = "ltc2497_reg";

		regulator-min-microvolt = <3300000>;

		regulator-max-microvolt = <3300000>;

		regulator-always-on;

	};



	leds {

		compatible = "gpio-leds";

		led-bmc-ready {

			gpios = <&gpio0 ASPEED_GPIO(W, 5) (GPIO_ACTIVE_HIGH | GPIO_TRANSITORY)>;

		};



		led-sw-heartbeat {

			gpios = <&gpio0 ASPEED_GPIO(N, 3) GPIO_ACTIVE_HIGH>;

		};



		led-identify {

			gpios = <&gpio0 ASPEED_GPIO(S, 3) GPIO_ACTIVE_HIGH>;

		};



		led-fault {

			gpios = <&gpio0 ASPEED_GPIO(P, 4) GPIO_ACTIVE_HIGH>;

		};

	};



	iio-hwmon {

		compatible = "iio-hwmon";

		io-channels =   <&adc0 0>, <&adc0 1>, <&adc0 2>,

				<&adc_i2c_2 0>, <&adc_i2c_2 1>,

				<&adc_i2c_2 2>, <&adc_i2c_2 3>,

				<&adc_i2c_2 4>, <&adc_i2c_2 5>,

				<&adc_i2c_2 6>, <&adc_i2c_2 7>,

				<&adc_i2c_2 8>, <&adc_i2c_2 9>,

				<&adc_i2c_2 10>, <&adc_i2c_2 11>,

				<&adc_i2c_2 12>, <&adc_i2c_2 13>,

				<&adc_i2c_2 14>, <&adc_i2c_2 15>,

				<&adc_i2c_0 0>, <&adc_i2c_0 1>,

				<&adc_i2c_0 2>, <&adc_i2c_0 3>,

				<&adc_i2c_0 4>, <&adc_i2c_0 5>,

				<&adc_i2c_0 6>, <&adc_i2c_0 7>,

				<&adc_i2c_0 8>, <&adc_i2c_0 9>,

				<&adc_i2c_0 10>, <&adc_i2c_0 11>,

				<&adc_i2c_0 12>;

	};

};



&mdio0 {

	status = "okay";



	ethphy0: ethernet-phy@0 {

		compatible = "ethernet-phy-ieee802.3-c22";

		reg = <0>;

	};

};



&mac0 {

	status = "okay";



	phy-mode = "rgmii";

	phy-handle = <&ethphy0>;



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii1_default>;

};



&mac3 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rmii4_default>;

	use-ncsi;

};



&fmc {

	status = "okay";

	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "bmc";

		spi-max-frequency = <50000000>;

#include "openbmc-flash-layout-64.dtsi"

	};



	flash@1 {

		status = "okay";

		m25p,fast-read;

		label = "alt-bmc";

		spi-max-frequency = <50000000>;

#include "openbmc-flash-layout-64-alt.dtsi"

	};

};



&spi1 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_spi1_default>;



	flash@0 {

		status = "okay";

		m25p,fast-read;

		label = "pnor";

		spi-max-frequency = <20000000>;

	};

};



&uart1 {

	status = "okay";

};



&uart2 {

	status = "okay";

};



&i2c0 {

	status = "okay";

};



&i2c1 {

	status = "okay";

};



&i2c2 {

	status = "okay";

};



&i2c3 {

	status = "okay";

	bus-frequency = <1000000>;

	multi-master;

	mctp-controller;



	mctp@10 {

		compatible = "mctp-i2c-controller";

		reg = <(0x10 | I2C_OWN_SLAVE_ADDRESS)>;

	};

};



&i2c4 {

	status = "okay";

	eeprom@50 {

		compatible = "atmel,24c64";

		reg = <0x50>;

		pagesize = <32>;

	};



	i2c-mux@70 {

		compatible = "nxp,pca9545";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;

		i2c-mux-idle-disconnect;



		i2c4_bus70_chn0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;



			eeprom@52 {

				compatible = "atmel,24c256";

				reg = <0x52>;

				pagesize = <32>;

			};

			temperature-sensor@48 {

				compatible = "ti,tmp75";

				reg = <0x48>;

			};

			temperature-sensor@49 {

				compatible = "ti,tmp75";

				reg = <0x49>;

			};

			temperature-sensor@4a{

				compatible = "ti,tmp75";

				reg = <0x4a>;

			};

			temperature-sensor@4b {

				compatible = "ti,tmp464";

				reg = <0x4b>;

				#address-cells = <1>;

				#size-cells = <0>;



				channel@0 {

					reg = <0x0>;

					status = "disabled";

				};

				channel@1 {

					reg = <0x1>;

					status = "disabled";

				};

				channel@2 {

					reg = <0x2>;

					status = "disabled";

				};

				channel@3 {

					reg = <0x3>;

					status = "disabled";

				};

				channel@4 {

					reg = <0x4>;

				};

			};

			temperature-sensor@4d {

				compatible = "ti,tmp75";

				reg = <0x4d>;

			};

			temperature-sensor@4e {

				compatible = "ti,tmp75";

				reg = <0x4e>;

			};

			temperature-sensor@4f {

				compatible = "ti,tmp75";

				reg = <0x4f>;

			};

			temperature-sensor@28 {

				compatible = "nuvoton,nct7802";

				reg = <0x28>;



				#address-cells = <1>;

				#size-cells = <0>;

				channel@1 { /* RTD1 */

					reg = <1>;

					sensor-type = "temperature";

					temperature-mode = "thermistor";

				};

			};

			adc_i2c_0: adc@14 {

				compatible = "lltc,ltc2497";

				reg = <0x14>;

				vref-supply = <&voltage_mon_reg>;

				#io-channel-cells = <1>;

			};

		};



		i2c4_bus70_chn2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x2>;



			adc_i2c_2: adc@14 {

				compatible = "lltc,ltc2497";

				reg = <0x14>;

				vref-supply = <&voltage_mon_reg>;

				#io-channel-cells = <1>;

			};

		};

	};

};



&i2c5 {

	status = "okay";

	i2c-mux@70 {

		compatible = "nxp,pca9548";

		#address-cells = <1>;

		#size-cells = <0>;

		reg = <0x70>;

		i2c-mux-idle-disconnect;



		i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0x0>;



			i2c-mux@71 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x71>;

				i2c-mux-idle-disconnect;



				nvmeslot_8: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x0>;

				};

				nvmeslot_9: i2c@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x1>;

				};

				nvmeslot_10: i2c@2 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x2>;

				};

				nvmeslot_11: i2c@3 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x3>;

				};

			};



			i2c-mux@72 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x72>;

				i2c-mux-idle-disconnect;



				nvmeslot_4: i2c@4 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x4>;

				};

				nvmeslot_5: i2c@5 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x5>;

				};

				nvmeslot_6: i2c@6 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x6>;

				};

				nvmeslot_7: i2c@7 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x7>;

				};

			};



			i2c-mux@74 {

				compatible = "nxp,pca9548";

				#address-cells = <1>;

				#size-cells = <0>;

				reg = <0x74>;

				i2c-mux-idle-disconnect;



				ocpslot: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x0>;



					ocpslot_temp: temperature-sensor@1f {

						compatible = "ti,tmp421";

						reg = <0x1f>;

						#address-cells = <1>;

						#size-cells = <0>;



						channel@0 {

							reg = <0x0>;

							status = "disabled";

						};

						channel@1 {

							reg = <0x1>;

						};

					};

				};



				nvmeslot_0: i2c@4 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x4>;

				};

				nvmeslot_1: i2c@5 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x5>;

				};

				nvmeslot_2: i2c@6 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x6>;

				};

				nvmeslot_3: i2c@7 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0x7>;

				};

			};

		};

	};

};



&i2c6 {

	status = "okay";



	rtc@51 {

		compatible = "nxp,pcf8563";

		reg = <0x51>;

	};

};



&i2c7 {

	status = "okay";



	temperature-sensor@4f {

		compatible = "ti,tmp75";

		reg = <0x4f>;

	};

};



&i2c8 {

	status = "okay";



	fan-controller@5c {

		compatible = "onnn,adt7462";

		reg = <0x5c>;

	};

};



&i2c9 {

	status = "okay";



	#address-cells = <1>;

	#size-cells = <0>;



	eeprom@50 {

		compatible = "atmel,24c02";

		reg = <0x50>;

	};



	eeprom@52 {

		compatible = "atmel,24c02";

		reg = <0x52>;

	};



	temperature-sensor@18 {

		compatible = "jedec,jc-42.4-temp";

		reg = <0x18>;

	};



	temperature-sensor@1a {

		compatible = "jedec,jc-42.4-temp";

		reg = <0x1a>;

	};

};



&i2c10 {

	status = "okay";

};



&i2c11 {

	status = "okay";

	ssif-bmc@10 {

		compatible = "ssif-bmc";

		reg = <0x10>;

	};

};



&i2c14 {

	status = "okay";

	eeprom@50 {

		compatible = "atmel,24c64";

		reg = <0x50>;

		pagesize = <32>;

	};



	bmc_ast2600_cpu: temperature-sensor@48 {

		compatible = "ti,tmp75";

		reg = <0x48>;

	};

};



&i2c15 {

	status = "okay";

	gpio_expander1: gpio-expander@22 {

		compatible = "nxp,pca9535";

		reg = <0x22>;

		gpio-controller;

		#gpio-cells = <2>;

		gpio-line-names =

			"presence-ocp1","presence-ocp2",

			"","",

			"","",

			"","",

			"","",

			"","",

			"","",

			"","";

	};

};



&adc0 {

	status = "okay";



	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_adc0_default &pinctrl_adc1_default

		&pinctrl_adc2_default>;

};



&vhub {

	status = "okay";

};



&video {

	status = "okay";

	memory-region = <&video_engine_memory>;

};



&gpio0 {

	gpio-line-names =

	/*A0-A7*/	"","","","","cpu-type-detect","i2c2-reset-n","i2c6-reset-n","i2c5-reset-n",

	/*B0-B7*/	"","","","","host0-sysreset-n","host0-pmin-n","fru-rd-complete",

			"chassis-id-sel",

	/*C0-C7*/	"s0-vrd-fault-n","","bmc-debug-mode","","cpld-3v3-irq-n","","vrd-sel",

			"spd-sel",

	/*D0-D7*/	"presence-ps0","presence-ps1","hsc-12vmain-alt2-n","ext-high-temp-n",

			"","","","",

	/*E0-E7*/	"eth-phy-rst-n","eth-phy-int-n","","","","","","",

	/*F0-F7*/	"s0-pcp-oc-warn-n","","power-chassis-control",

			"cpu-bios-recover","s0-heartbeat","hs-scout-proc-hot","s0-vr-hot-n","",

	/*G0-G7*/	"","","hsc-12vmain-alt1-n","","","bp-cpld-program-en","led-fp-sta-gr",

			"led-fp-sta-amb",

	/*H0-H7*/	"jtag-program-sel","jtag-cmpl2","wd-disable-n","power-chassis-good","","",

			"","",

	/*I0-I7*/	"","","","","","","power-button","rtc-battery-voltage-read-enable",

	/*J0-J7*/	"","","","","","","","",

	/*K0-K7*/	"","","","","","","","",

	/*L0-L7*/	"","","","","reset-button","","","",

	/*M0-M7*/	"nmi-n","s0-ddr-save","soc-spi-nor-access","presence-cpu0","s0-rtc-lock",

			"","","",

	/*N0-N7*/	"hpm-fw-recovery","hpm-stby-rst-n","jtag-sel-s0","led-sw-hb",

			"jtag-dbgr-prsnt-n","","","",

	/*O0-O7*/	"","","","","","","","",

	/*P0-P7*/	"ps0-ac-loss-n","ps1-ac-loss-n","","","led-fault","user-mode","jtag-srst-n",

			"led-bmc-hb",

	/*Q0-Q7*/	"","","","","","","","",

	/*R0-R7*/	"","","","","","","","",

	/*S0-S7*/	"","","identify-button","led-identify","","spi-nor-access","host0-ready","",

	/*T0-T7*/	"","","","","","","","",

	/*U0-U7*/	"","","","","","","","",

	/*V0-V7*/	"s0-hightemp-n","s0-fault-alert","s0-sys-auth-failure-n",

			"host0-reboot-ack-n","s0-fw-boot-ok","host0-shd-req-n",

			"host0-shd-ack-n","s0-overtemp-n",

	/*W0-W7*/	"ocp-aux-pwren","ocp-main-pwren","ocp-pgood","",

			"bmc-ok","bmc-ready","spi0-program-sel","spi0-backup-sel",

	/*X0-X7*/	"","","","","","","","",

	/*Y0-Y7*/	"","","","vrd-prg-en-n","","","","host0-special-boot",

	/*Z0-Z7*/	"","ps0-pgood","ps1-pgood","","","","","";



	ocp-aux-pwren-hog {

		gpio-hog;

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

		output-high;

		line-name = "ocp-aux-pwren";

	};



};



&gpio1 {

	gpio-line-names =

	/*18A0-18A7*/	"","","","","","","","",

	/*18B0-18B7*/	"","","","","s0-soc-pgood","vga-ft-press-n","emmc-rst-n","s01-uart1-sel",

	/*18C0-18C7*/	"uart1-mode0","uart1-mode1","uart2-mode0","uart2-mode1",

			"","","","",

	/*18D0-18D7*/	"","","","","","","","",

	/*18E0-18E3*/	"","","","";

};

arch/arm/boot/dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts

+17 −1
Original line number Diff line number Diff line
@@ -677,6 +677,12 @@ gpio@77 { 
		#size-cells = <0>;

		#gpio-cells = <2>;



		gpio-line-names =

		"ext-vref-sel","","presence-hdd-bp5-n","presence-hdd-bp6-n",

		"","bmc-riser-en-n","bmc-ocp1-en-n","bmc-ocp0-en-n",

		"","","","",

		"","","","";



		bmc-ocp0-en-hog {

			gpio-hog;

			gpios = <7 GPIO_ACTIVE_LOW>;
@@ -684,6 +690,16 @@ bmc-ocp0-en-hog { 
			line-name = "bmc-ocp0-en-n";

		};

	};



	fan-controller0@20 {

		compatible = "maxim,max31790";

		reg = <0x20>;

	};



	fan-controller1@2f {

		compatible = "maxim,max31790";

		reg = <0x2f>;

	};

};



&i2c9 {
@@ -958,7 +974,7 @@ gpio_expander1: gpio-expander@22 { 
			"fan-fault","psu-fault",

			"","",

			"","",

			"","",

			"gpi0","gpi1",

			"","",

			"","",

			"","",

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

+100 −91
Original line number Diff line number Diff line
@@ -50,14 +50,14 @@ aliases { 
		i2c45 = &i2c0mux5ch1;

		i2c46 = &i2c0mux5ch2;

		i2c47 = &i2c0mux5ch3;

		i2c48 = &i2c30mux0ch0;

		i2c49 = &i2c30mux0ch1;

		i2c50 = &i2c30mux0ch2;

		i2c51 = &i2c30mux0ch3;

		i2c52 = &i2c30mux0ch4;

		i2c53 = &i2c30mux0ch5;

		i2c54 = &i2c30mux0ch6;

		i2c55 = &i2c30mux0ch7;

		i2c48 = &i2c5mux0ch0;

		i2c49 = &i2c5mux0ch1;

		i2c50 = &i2c5mux0ch2;

		i2c51 = &i2c5mux0ch3;

		i2c52 = &i2c5mux0ch4;

		i2c53 = &i2c5mux0ch5;

		i2c54 = &i2c5mux0ch6;

		i2c55 = &i2c5mux0ch7;

	};



	chosen {
@@ -153,6 +153,13 @@ &uart5 { 
	status = "okay";

};



&mac2 {

	status = "okay";

	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_ncsi3_default>;

	use-ncsi;

};



&mac3 {

	status = "okay";

	pinctrl-names = "default";
@@ -185,6 +192,7 @@ i2c-mux@71 { 
		reg = <0x71>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux0ch0: i2c@0 {

			#address-cells = <1>;
@@ -213,6 +221,7 @@ i2c-mux@72 { 
		reg = <0x72>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux1ch0: i2c@0 {

			#address-cells = <1>;
@@ -242,79 +251,6 @@ i2c0mux1ch2: i2c@2 { 
			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

			i2c-mux@70 {

				compatible = "nxp,pca9548";

				reg = <0x70>;

				#address-cells = <1>;

				#size-cells = <0>;



				i2c30mux0ch0: i2c@0 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <0>;

				};

				i2c30mux0ch1: i2c@1 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <1>;

				};

				i2c30mux0ch2: i2c@2 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <2>;

				};

				i2c30mux0ch3: i2c@3 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <3>;

				};

				i2c30mux0ch4: i2c@4 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <4>;

				};

				i2c30mux0ch5: i2c@5 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <5>;

				};

				i2c30mux0ch6: i2c@6 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <6>;

					// HDD FRU EEPROM

					eeprom@52 {

						compatible = "atmel,24c64";

						reg = <0x52>;

					};

				};

				i2c30mux0ch7: i2c@7 {

					#address-cells = <1>;

					#size-cells = <0>;

					reg = <7>;



					power-sensor@40 {

						compatible = "ti,ina230";

						reg = <0x40>;

						shunt-resistor = <2000>;

					};

					power-sensor@41 {

						compatible = "ti,ina230";

						reg = <0x41>;

						shunt-resistor = <2000>;

					};

					power-sensor@44 {

						compatible = "ti,ina230";

						reg = <0x44>;

						shunt-resistor = <2000>;

					};

					power-sensor@45 {

						compatible = "ti,ina230";

						reg = <0x45>;

						shunt-resistor = <2000>;

					};

				};

			};

		};

		i2c0mux1ch3: i2c@3 {

			#address-cells = <1>;
@@ -328,6 +264,7 @@ i2c-mux@73 { 
		reg = <0x73>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux2ch0: i2c@0 {

			#address-cells = <1>;
@@ -356,6 +293,7 @@ i2c-mux@75 { 
		reg = <0x75>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux3ch0: i2c@0 {

			#address-cells = <1>;
@@ -384,6 +322,7 @@ i2c-mux@76 { 
		reg = <0x76>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux4ch0: i2c@0 {

			#address-cells = <1>;
@@ -426,6 +365,7 @@ i2c-mux@77 { 
		reg = <0x77>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c0mux5ch0: i2c@0 {

			#address-cells = <1>;
@@ -512,12 +452,12 @@ i2c1mux0ch4: i2c@4 { 
			power-monitor@42 {

				compatible = "lltc,ltc4287";

				reg = <0x42>;

				shunt-resistor-micro-ohms = <200>;

				shunt-resistor-micro-ohms = <100>;

			};

			power-monitor@43 {

				compatible = "lltc,ltc4287";

				reg = <0x43>;

				shunt-resistor-micro-ohms = <200>;

				shunt-resistor-micro-ohms = <100>;

			};

		};

		i2c1mux0ch5: i2c@5 {
@@ -593,8 +533,6 @@ io_expander0: gpio@20 { 
		reg = <0x20>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&gpio0>;

		interrupts = <ASPEED_GPIO(B, 4) IRQ_TYPE_LEVEL_LOW>;

	};



	// Module 1 IOEXP
@@ -603,8 +541,6 @@ io_expander1: gpio@21 { 
		reg = <0x21>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&gpio0>;

		interrupts = <ASPEED_GPIO(B, 4) IRQ_TYPE_LEVEL_LOW>;

	};



	// HMC IOEXP
@@ -613,8 +549,6 @@ io_expander2: gpio@27 { 
		reg = <0x27>;

		gpio-controller;

		#gpio-cells = <2>;

		interrupt-parent = <&gpio0>;

		interrupts = <ASPEED_GPIO(B, 4) IRQ_TYPE_LEVEL_LOW>;

	};



	// Module 0 EEPROM
@@ -640,6 +574,81 @@ &i2c4 { 


&i2c5 {

	status = "okay";



	i2c-mux@70 {

		compatible = "nxp,pca9548";

		reg = <0x70>;

		#address-cells = <1>;

		#size-cells = <0>;

		i2c-mux-idle-disconnect;



		i2c5mux0ch0: i2c@0 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0>;

		};

		i2c5mux0ch1: i2c@1 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <1>;

		};

		i2c5mux0ch2: i2c@2 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <2>;

		};

		i2c5mux0ch3: i2c@3 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <3>;

		};

		i2c5mux0ch4: i2c@4 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <4>;

		};

		i2c5mux0ch5: i2c@5 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <5>;

		};

		i2c5mux0ch6: i2c@6 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <6>;

			// HDD FRU EEPROM

			eeprom@52 {

				compatible = "atmel,24c64";

				reg = <0x52>;

			};

		};

		i2c5mux0ch7: i2c@7 {

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <7>;



			power-sensor@40 {

				compatible = "ti,ina230";

				reg = <0x40>;

				shunt-resistor = <2000>;

			};

			power-sensor@41 {

				compatible = "ti,ina230";

				reg = <0x41>;

				shunt-resistor = <2000>;

			};

			power-sensor@44 {

				compatible = "ti,ina230";

				reg = <0x44>;

				shunt-resistor = <2000>;

			};

			power-sensor@45 {

				compatible = "ti,ina230";

				reg = <0x45>;

				shunt-resistor = <2000>;

			};

		};

	};

};



&i2c6 {
@@ -834,9 +843,9 @@ temperature-sensor@1f { 
	};



	// OCP NIC1 FRU EEPROM

	eeprom@50 {

	eeprom@52 {

		compatible = "atmel,24c64";

		reg = <0x50>;

		reg = <0x52>;

	};

};