Unverified Commit aa32dec6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

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

ASPEED device tree updates for 6.10

 - New and removed machines:

  * IBM System1 AST2600 BMC, a x86 server
  * ASUS X4TF AST2600 BMC, a x86 server
  * ASRock SPC621D8HM3 AST2500 BMC, a Intel Xeon system
  * ASRock E3C256D4I AST2500 BMC, a Intel Xeon system
  * Add ASRock X570D4U's AST2500 BMC, an AMD Ryzen 5000 system
  * Facebook Harma's AST2600 BMC
  * Facebook Cloudripper is removed

 - Updates to machines merged this cycle, as well as bonnell,
   yosemite4, minerva and others

* tag 'aspeed-6.10-devicetree' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc: (52 commits)
  ARM: dts: aspeed: Add ASRock E3C256D4I BMC
  dt-bindings: arm: aspeed: document ASRock E3C256D4I
  dt-bindings: trivial-devices: add isil,isl69269
  ARM: dts: aspeed: x4tf: Add dts for asus x4tf project
  dt-bindings: arm: aspeed: add ASUS X4TF board
  ARM: dts: aspeed: Remove Facebook Cloudripper dts
  ARM: dts: aspeed: drop unused ref_voltage ADC property
  ARM: dts: aspeed: harma: correct Mellanox multi-host property
  ARM: dts: aspeed: yosemitev2: correct Mellanox multi-host property
  ARM: dts: aspeed: yosemite4: correct Mellanox multi-host property
  ARM: dts: aspeed: greatlakes: correct Mellanox multi-host property
  ARM: dts: aspeed: Modify I2C bus configuration
  ARM: dts: aspeed: Disable unused ADC channels for Asrock X570D4U BMC
  ARM: dts: aspeed: Modify GPIO table for Asrock X570D4U BMC
  ARM: dts: aspeed: yosemite4: set bus13 frequency to 100k
  ARM: dts: Aspeed: Bonnell: Fix NVMe LED labels
  ARM: dts: aspeed: yosemite4: Enable ipmb device for OCP debug card
  ARM: dts: aspeed: ahe50dc: Update lm25066 regulator name
  ARM: dts: aspeed: Add vendor prefixes to lm25066 compat strings
  ARM: dts: aspeed: asrock: Use MAC address from FRU EEPROM
  ...

Link: https://lore.kernel.org/r/CACPK8Xd2Qc9MQUJ-8GuRjmyU50oMHpmmHPHLqAh9W_1Gyqi2ug@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 24ae5d24 c44211af

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

+6 −0
Original line number Diff line number Diff line
@@ -35,7 +35,10 @@ properties: 
              - ampere,mtjade-bmc

              - aspeed,ast2500-evb

              - asrock,e3c246d4i-bmc

              - asrock,e3c256d4i-bmc

              - asrock,romed8hm3-bmc

              - asrock,spc621d8hm3-bmc

              - asrock,x570d4u-bmc

              - bytedance,g220a-bmc

              - facebook,cmm-bmc

              - facebook,minipack-bmc
@@ -74,15 +77,18 @@ properties: 
              - ampere,mtmitchell-bmc

              - aspeed,ast2600-evb

              - aspeed,ast2600-evb-a1

              - asus,x4tf-bmc

              - facebook,bletchley-bmc

              - facebook,cloudripper-bmc

              - facebook,elbert-bmc

              - facebook,fuji-bmc

              - facebook,greatlakes-bmc

              - facebook,harma-bmc

              - facebook,minerva-cmc

              - facebook,yosemite4-bmc

              - ibm,everest-bmc

              - ibm,rainier-bmc

              - ibm,system1-bmc

              - ibm,tacoma-bmc

              - inventec,starscream-bmc

              - inventec,transformer-bmc

Documentation/devicetree/bindings/trivial-devices.yaml

+2 −0
Original line number Diff line number Diff line
@@ -160,6 +160,8 @@ properties: 
          - isil,isl29030

            # Intersil ISL68137 Digital Output Configurable PWM Controller

          - isil,isl68137

            # Intersil ISL69269 PMBus Voltage Regulator

          - isil,isl69269

            # Intersil ISL76682 Ambient Light Sensor

          - isil,isl76682

            # Linear Technology LTC2488

arch/arm/boot/dts/aspeed/Makefile

+7 −2
Original line number Diff line number Diff line
@@ -9,17 +9,21 @@ dtb-$(CONFIG_ARCH_ASPEED) += \ 
	aspeed-bmc-ampere-mtmitchell.dtb \

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

	aspeed-bmc-asrock-e3c246d4i.dtb \

	aspeed-bmc-asrock-e3c256d4i.dtb \

	aspeed-bmc-asrock-romed8hm3.dtb \

	aspeed-bmc-asrock-spc621d8hm3.dtb \

	aspeed-bmc-asrock-x570d4u.dtb \

	aspeed-bmc-asus-x4tf.dtb \

	aspeed-bmc-bytedance-g220a.dtb \

	aspeed-bmc-delta-ahe50dc.dtb \

	aspeed-bmc-facebook-bletchley.dtb \

	aspeed-bmc-facebook-cloudripper.dtb \

	aspeed-bmc-facebook-cmm.dtb \

	aspeed-bmc-facebook-elbert.dtb \

	aspeed-bmc-facebook-fuji.dtb \

	aspeed-bmc-facebook-galaxy100.dtb \

	aspeed-bmc-facebook-greatlakes.dtb \

	aspeed-bmc-facebook-minerva-cmc.dtb \

	aspeed-bmc-facebook-harma.dtb \

	aspeed-bmc-facebook-minerva.dtb \

	aspeed-bmc-facebook-minipack.dtb \

	aspeed-bmc-facebook-tiogapass.dtb \

	aspeed-bmc-facebook-wedge40.dtb \
@@ -33,6 +37,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-system1.dtb \

	aspeed-bmc-intel-s2600wf.dtb \

	aspeed-bmc-inspur-fp5280g2.dtb \

	aspeed-bmc-inspur-nf5280m6.dtb \

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

+0 −1
Original line number Diff line number Diff line
@@ -813,7 +813,6 @@ bmc_ast2600_cpu: temperature-sensor@35 { 
};



&adc0 {

	ref_voltage = <2500>;

	status = "okay";



	pinctrl-names = "default";

arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ &mac0 { 


	pinctrl-names = "default";

	pinctrl-0 = <&pinctrl_rgmii1_default &pinctrl_mdio1_default>;



	nvmem-cells = <&eth0_macaddress>;

	nvmem-cell-names = "mac-address";

};



&i2c1 {
@@ -103,6 +106,12 @@ eeprom@57 { 
		compatible = "st,24c128", "atmel,24c128";

		reg = <0x57>;

		pagesize = <16>;

		#address-cells = <1>;

		#size-cells = <1>;



		eth0_macaddress: macaddress@3f80 {

			reg = <0x3f80 6>;

		};

	};

};