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
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEE+nHMAt9PCBDH63wBa3ZZB4FHcJ4FAmDdRHAACgkQa3ZZB4FH
 cJ7e9g//Va+grcEuWCCZpLHaWD7QjW1CF1pxaSuBrmVA7J3kxyww6AhVZaWbsVoJ
 jiyYRSc6ZZVbgS1y8KNZyvD1n2waukVwb4JFb6u2DWqDkp3IKaMvaFjE336FhACr
 fccgkggiL1xO/phsavv2mgUhDlYDD1jZlHBmLzHmPPF7DPSR0hi9lkCBZhL3Ivx0
 +1A9SkloWL23cGBwNYVr/zsDkVpVPcceOLD8IU61DG2gd7HkO+XGO90xUy1trqqP
 A6l+fDj86uJ7D7WogQ2NMMiw7w0bLLEzmC1iUzdrDg/73C8tCnibbLqmbvcIUVq+
 oPwePeSre+WwCoZUr0Hj5AhA1XkBU1b1y7SLsikIJBwK/9mHwkTLdoD1OcDNGBdQ
 U9y9CukoDzMiqc9r3GiE3pnmfz/NrumaKqSmlXUXsgTDzzP8Uo0BW+7G3qMwleGy
 HrcNj/af26SjIP47PQtEOVfyTJCmoyWKN1tfa7Q5JyJza8WMwoCMFocbXWaq8kX/
 1yIsamhF05dQ5k+lten9ZpNylqJhcrMAkYcWhDN+OFzelCVz97kXrP7siFsoRNFS
 bZZcJS3gTftzQLatmQP4rTHp7SFdQg0yXi64ho2g7l2hCknOAwQCN2fczYZUbdNY
 lSGR+ORAZujBb7Ovav0KLHFrFwivWcFUcoeuudub6AXvCD6oe5M=
 =xgux
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmDx9E4ACgkQmmx57+YA
 GNnwTw/7BHxBASU1bI5AXRUyem7lja7/mL4TRDn0bpxPk19m88JyLOS/ri+pRqLo
 o/VGn+WxE07c8cCWpdOXljY3WscP3JVc1/8uhLGH8ty2YEasveufjJRS8kvqqCOI
 3E9d8hxvTQ//UWSy2YvuEvZcJnSlEyhn1Mo9oGX1Ry+EzJiZogr+BLqlWp5bUyg0
 n6zKqfP0QTTSLPYyZ/jWTFGK8E0Og35wmDgY2mKLxeHNsHFw/sY1uXB3YIizVte8
 rlDS9IjnTZuN1hNWzDSe7IRvR5oPP170E5hZitcvnMJsgLWf+gK3Ox4Ktt79hkff
 Q11G0aAumIoXJH1PSca83p68I1ch1Z5XlijIYxcaOg0/JQ+m3KCUwDHbBWtyPqMk
 +weuPGVRld5foHX2elPsFL5FNw7c8rLw1WiLM9zBTbtnCfL6kmOaIXEjckjais4J
 pkavYoTNbShjzp9CmrxYB9ApuWndMGY1vvJ366tZNkUIGx/2W2eYqridHybNbKev
 MGMXolssptYG92OkEZNrUBmA/Uc/vp+oiQ1tluR0ilWi0Fz89kbYbHpYNPgaT41f
 Z5i7SyKPyByet9SgW8REyQyjoUJjAxQmiplOV5kMis/jrs5ZOoDS76PmQBCjbDQL
 HSRihqVYH5jZEGbzaiBmn9KmWI2MuZzyZmbiSIGpqfheKxHyAtQ=
 =0K5o
 -----END PGP SIGNATURE-----

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: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2021-07-16 23:04:13 +02:00
Родитель ab37a7a890 ab4a49d360
Коммит 8825f2744d
4 изменённых файлов: 12 добавлений и 14 удалений

Просмотреть файл

@ -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 {

Просмотреть файл

@ -406,15 +406,15 @@
reg = <0x69>;
};
power-supply@6a {
compatible = "ibm,cffps";
reg = <0x6a>;
};
power-supply@6b {
compatible = "ibm,cffps";
reg = <0x6b>;
};
power-supply@6d {
compatible = "ibm,cffps";
reg = <0x6d>;
};
};
&i2c4 {
@ -2832,6 +2832,7 @@
&emmc {
status = "okay";
clk-phase-mmc-hs200 = <180>, <180>;
};
&fsim0 {

Просмотреть файл

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

Просмотреть файл

@ -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 {