Unverified Commit 8825f274 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'aspeed-5.14-devicetree-2' of... 

Merge tag 'aspeed-5.14-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc into arm/fixes

ASPEED device tree fixes for 5.14

 - eMMC phase corrections so Tacoma and Everest can boot

 - VUART irq polarity fix for e3c246d4i, using new bindings

 - I2C address fix for Rainier power supply

 - GPIO line name fixes

* tag 'aspeed-5.14-devicetree-2' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc:
  ARM: dts: aspeed: everest: PSU #3 address change
  ARM: dts: everest: Add phase corrections for eMMC
  ARM: dts: tacoma: Add phase corrections for eMMC
  ARM: dts: aspeed: Update e3c246d4i vuart properties
  ARM: dts: aspeed: Fix AST2600 machines line names

Link: https://lore.kernel.org/r/CACPK8XefdPzeOUDnDgk9cHQEs-9wF_ZSPdYQRzuNOpGZTyGUKQ@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents ab37a7a8 ab4a49d3

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

+3 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
#include "aspeed-g5.dtsi"

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

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

#include <dt-bindings/interrupt-controller/irq.h>



/{

	model = "ASRock E3C246D4I BMC";
@@ -73,7 +74,8 @@ 


&vuart {

	status = "okay";

	aspeed,sirq-active-high;

	aspeed,lpc-io-reg = <0x2f8>;

	aspeed,lpc-interrupts = <3 IRQ_TYPE_LEVEL_HIGH>;

};



&mac0 {

arch/arm/boot/dts/aspeed-bmc-ibm-everest.dts

+5 −4
Original line number Diff line number Diff line
@@ -406,14 +406,14 @@ 
		reg = <0x69>;

	};



	power-supply@6a {

	power-supply@6b {

		compatible = "ibm,cffps";

		reg = <0x6a>;

		reg = <0x6b>;

	};



	power-supply@6b {

	power-supply@6d {

		compatible = "ibm,cffps";

		reg = <0x6b>;

		reg = <0x6d>;

	};

};
@@ -2832,6 +2832,7 @@ 


&emmc {

	status = "okay";

	clk-phase-mmc-hs200 = <180>, <180>;

};



&fsim0 {

arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts

+1 −4
Original line number Diff line number Diff line
@@ -280,10 +280,7 @@ 
	/*W0-W7*/	"","","","","","","","",

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

	/*Y0-Y7*/	"","","","","","","","",

	/*Z0-Z7*/	"","","","","","","","",

	/*AA0-AA7*/	"","","","","","","","",

	/*AB0-AB7*/	"","","","","","","","",

	/*AC0-AC7*/	"","","","","","","","";

	/*Z0-Z7*/	"","","","","","","","";



	pin_mclr_vpp {

		gpio-hog;

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

+2 −4
Original line number Diff line number Diff line
@@ -136,10 +136,7 @@ 
	/*W0-W7*/	"","","","","","","","",

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

	/*Y0-Y7*/	"","","","","","","","",

	/*Z0-Z7*/	"","","","","","","","",

	/*AA0-AA7*/	"","","","","","","","",

	/*AB0-AB7*/	"","","","","","","","",

	/*AC0-AC7*/	"","","","","","","","";

	/*Z0-Z7*/	"","","","","","","","";

};



&fmc {
@@ -189,6 +186,7 @@ 


&emmc {

	status = "okay";

	clk-phase-mmc-hs200 = <36>, <270>;

};



&fsim0 {