microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

ARM: dts: aspeed: Rainier: Fix PCA9552 on bus 8 

The second presence detection PCA9552 was incorrectly added to bus 9.

Fixes: 8be44de6f2 ("ARM: dts: aspeed: Rainier: Add presence GPIOs")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
This commit is contained in:
Eddie James 2021-04-13 14:43:05 -05:00 коммит произвёл Joel Stanley
Родитель ee33e2fb3d
Коммит 9a490b28dd
1 изменённых файлов: 10 добавлений и 99 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

109
arch/arm/boot/dts/aspeed-bmc-ibm-rainier.dts
Просмотреть файл

@ -1399,7 +1399,7 @@
reg = <0x51>;
};
pca1: pca9552@61 {
pca_pres2: pca9552@61 {
compatible = "nxp,pca9552";
reg = <0x61>;
#address-cells = <1>;
@ -1407,6 +1407,15 @@
gpio-controller;
#gpio-cells = <2>;
gpio-line-names =
"SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD",
"SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD",
"SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD",
"SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N",
"SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N",
"SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N",
"", "", "", "";
gpio@0 {
reg = <0>;
type = <PCA955X_TYPE_GPIO>;
@ -1507,104 +1516,6 @@
compatible = "atmel,24c128";
reg = <0x50>;
};
pca_pres3: pca9552@61 {
compatible = "nxp,pca9552";
reg = <0x61>;
#address-cells = <1>;
#size-cells = <0>;
gpio-controller;
#gpio-cells = <2>;
gpio-line-names =
"SLOT6_PRSNT_EN_RSVD", "SLOT7_PRSNT_EN_RSVD",
"SLOT8_PRSNT_EN_RSVD", "SLOT9_PRSNT_EN_RSVD",
"SLOT10_PRSNT_EN_RSVD", "SLOT11_PRSNT_EN_RSVD",
"SLOT6_EXPANDER_PRSNT_N", "SLOT7_EXPANDER_PRSNT_N",
"SLOT8_EXPANDER_PRSNT_N", "SLOT9_EXPANDER_PRSNT_N",
"SLOT10_EXPANDER_PRSNT_N", "SLOT11_EXPANDER_PRSNT_N",
"", "", "", "";
gpio@0 {
reg = <0>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@1 {
reg = <1>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@2 {
reg = <2>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@3 {
reg = <3>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@4 {
reg = <4>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@5 {
reg = <5>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@6 {
reg = <6>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@7 {
reg = <7>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@8 {
reg = <8>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@9 {
reg = <9>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@10 {
reg = <10>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@11 {
reg = <11>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@12 {
reg = <12>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@13 {
reg = <13>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@14 {
reg = <14>;
type = <PCA955X_TYPE_GPIO>;
};
gpio@15 {
reg = <15>;
type = <PCA955X_TYPE_GPIO>;
};
};
};
&i2c10 {