Skip to content

Rockchip/Pca95xx: Add support for PCA9554 and refactor for generic support #237

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Rockchip/Pca95xx: Add support for PCA9554 and refactor for generic support #237

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions edk2-rockchip/Platform/Firefly/AIO-3588Q/AIO-3588Q.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
DEFINE RK_RTC8563_ENABLE = TRUE

#
# PCA9555 GPIO extender support
# PCA95XX GPIO extender support
# I2C location configured by PCDs below.
#
DEFINE RK_PCA9555_ENABLE = TRUE
DEFINE RK_PCA95XX_ENABLE = TRUE

#
# RK3588-based platform
Expand Down Expand Up @@ -69,8 +69,9 @@
gRockchipTokenSpaceGuid.PcdRk860xRegulatorTags|{ $(SCMI_CLK_CPUB01), $(SCMI_CLK_CPUB23) }
gPcf8563RealTimeClockLibTokenSpaceGuid.PcdI2cSlaveAddress|0x51
gRockchipTokenSpaceGuid.PcdRtc8563Bus|0x6
gRockchipTokenSpaceGuid.PcdPca9555Address|0x21
gRockchipTokenSpaceGuid.PcdPca9555Bus|0x6
gRockchipTokenSpaceGuid.PcdPca95xxAddress|0x21
gRockchipTokenSpaceGuid.PcdPca95xxBus|0x6
gRockchipTokenSpaceGuid.PcdPca95xxType|"PCA9555"

#
# PCIe/SATA/USB Combo PIPE PHY support flags and default values
Expand Down Expand Up @@ -132,7 +133,7 @@
# Splash screen logo
$(VENDOR_DIRECTORY)/Drivers/LogoDxe/LogoDxe.inf

# Hack to enable use of PCA9555 during PCIe initialization.
# Hack to enable use of PCA95XX during PCIe initialization.
MdeModulePkg/Bus/Pci/PciHostBridgeDxe/PciHostBridgeDxe.inf {
<LibraryClasses>
RockchipPlatformLib|Platform/Firefly/AIO-3588Q/Library/RockchipPlatformLib/RockchipPlatformLibPcaDepex.inf
Expand Down
8 changes: 4 additions & 4 deletions edk2-rockchip/Platform/Firefly/AIO-3588Q/Library/RockchipPlatformLib/RockchipPlatformLib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <VarStoreData.h>
#include <Library/UefiBootServicesTableLib.h>

#include <Protocol/Pca9555.h>
#include <Protocol/Pca95xx.h>

static struct regulator_init_data rk806_init_data[] = {
/* Master PMIC */
Expand Down Expand Up @@ -49,7 +49,7 @@ static struct regulator_init_data rk806_init_data[] = {

EFI_STATUS
EFIAPI
GetPca9555Protocol (
GetPca95xxProtocol (
IN OUT PCA95XX_PROTOCOL **Pca95xxProtocl
)
{
Expand Down Expand Up @@ -277,7 +277,7 @@ UsbPortPowerEnable (
PCA95XX_PROTOCOL *Pca95xxProtocol;

/* On Firefly AIO-3588Q this is controlled via the PCA9555. */
Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "UsbPortPowerEnable failed to get PCA9555! (%d)\n", Status));
} else {
Expand Down Expand Up @@ -398,7 +398,7 @@ PciePeReset (
case PCIE_SEGMENT_PCIE20L1:
break;
case PCIE_SEGMENT_PCIE20L2:
Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "PciePeReset(L2) failed to get PCA9555! (%d)\n", Status));
} else {
Expand Down
9 changes: 5 additions & 4 deletions edk2-rockchip/Platform/Firefly/ITX-3588J/ITX-3588J.dsc.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
DEFINE RK_RTC8563_ENABLE = TRUE

#
# PCA9555 GPIO extender support
# PCA95XX GPIO extender support
# I2C location configured by PCDs below.
#
DEFINE RK_PCA9555_ENABLE = TRUE
DEFINE RK_PCA95XX_ENABLE = TRUE

#
# RK3588-based platform
Expand Down Expand Up @@ -66,8 +66,9 @@
gRockchipTokenSpaceGuid.PcdRk860xRegulatorTags|{ $(SCMI_CLK_CPUB01), $(SCMI_CLK_CPUB23) }
gPcf8563RealTimeClockLibTokenSpaceGuid.PcdI2cSlaveAddress|0x51
gRockchipTokenSpaceGuid.PcdRtc8563Bus|0x6
gRockchipTokenSpaceGuid.PcdPca9555Address|0x21
gRockchipTokenSpaceGuid.PcdPca9555Bus|0x6
gRockchipTokenSpaceGuid.PcdPca95xxAddress|0x21
gRockchipTokenSpaceGuid.PcdPca95xxBus|0x6
gRockchipTokenSpaceGuid.PcdPca95xxType|"PCA9555"

#
# PCIe/SATA/USB Combo PIPE PHY support flags and default values
Expand Down
12 changes: 6 additions & 6 deletions edk2-rockchip/Platform/Firefly/ITX-3588J/Library/RockchipPlatformLib/RockchipPlatformLib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#include <VarStoreData.h>
#include <Library/UefiBootServicesTableLib.h>

#include <Protocol/Pca9555.h>
#include <Protocol/Pca95xx.h>

static struct regulator_init_data rk806_init_data[] = {
/* Master PMIC */
Expand Down Expand Up @@ -49,7 +49,7 @@ static struct regulator_init_data rk806_init_data[] = {

EFI_STATUS
EFIAPI
GetPca9555Protocol (
GetPca95xxProtocol (
IN OUT PCA95XX_PROTOCOL **Pca95xxProtocl
)
{
Expand Down Expand Up @@ -313,7 +313,7 @@ UsbPortPowerEnable (
PCA95XX_PROTOCOL *Pca95xxProtocol;

/* On Firefly ITX-3588J this is controlled via the PCA9555. */
Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to get PCA9555! (%d)\n", Status));
} else {
Expand Down Expand Up @@ -460,7 +460,7 @@ PwmFanIoSetup (
EFI_STATUS Status = EFI_SUCCESS;
PCA95XX_PROTOCOL *Pca95xxProtocol;

Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to get PCA9555! (%d)\n", Status));
} else {
Expand All @@ -481,7 +481,7 @@ PwmFanSetSpeed (
EFI_STATUS Status = EFI_SUCCESS;
PCA95XX_PROTOCOL *Pca95xxProtocol;

Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to get PCA9555! (%d)\n", Status));
} else {
Expand Down Expand Up @@ -531,7 +531,7 @@ PlatformSetStatusLed (
PCA95XX_PROTOCOL *Pca95xxProtocol;

/* On Firefly ITX-3588J this is controlled via the PCA9555. */
Status = GetPca9555Protocol (&Pca95xxProtocol);
Status = GetPca95xxProtocol (&Pca95xxProtocol);
if (EFI_ERROR (Status)) {
DEBUG ((DEBUG_ERROR, "Failed to get PCA9555! (%d)\n", Status));
} else {
Expand Down
Loading