Skip to content
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.

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

Silicon/RK3588: Adjust I2C for Windows driver, add DMA, and enable in boards #108

Merged
merged 1 commit into from
Dec 8, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac1.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588S", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac1.asl")
include ("Gpio.asl")
//include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
//include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac1.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Hinlink/H88K/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac0.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Khadas/Edge2/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac0.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Mekotronics/R58X/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac0.asl")
include ("Gmac1.asl")
// include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Mixtile/Blade3/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

// include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac1.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5A/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
include ("Gmac1.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
3 changes: 2 additions & 1 deletion edk2-rockchip/Platform/Radxa/ROCK5B/AcpiTables/Dsdt.asl
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,10 @@ DefinitionBlock ("Dsdt.aml", "DSDT", 2, "RKCP ", "RK3588 ", 2)

include ("Emmc.asl")
include ("Sdhc.asl")
include ("Dma.asl")
// include ("Gmac.asl")
include ("Gpio.asl")
// include ("I2c.asl")
include ("I2c.asl")
include ("Uart.asl")
// include ("Spi.asl")

Expand Down
104 changes: 104 additions & 0 deletions edk2-rockchip/Silicon/Rockchip/RK3588/AcpiTables/Dma.asl
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/** @file
*
* Copyright (c) 2022, Rockchip Electronics Co. Ltd.
*
* SPDX-License-Identifier: BSD-2-Clause-Patent
*
**/
#include "AcpiTables.h"

//
// Description: DMA
//
Device (DMA0)
{
Name (_HID, "ARMH0330")
Name (_UID, 0)
Method (_CRS, 0, Serialized)
{
Name (RBUF, ResourceTemplate ()
{
Memory32Fixed (ReadWrite,
0xFEA10000, // Address Base
0x00004000, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000076,
}
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000077,
}
})
Return (RBUF) /* \_SB_.DMA0._CRS.RBUF */
}
Name (_DSD, Package() {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package (2) {"ctlrName", "DMA0"}
}
})
}

Device (DMA1)
{
Name (_HID, "ARMH0330")
Name (_UID, 1)
Method (_CRS, 0, Serialized)
{
Name (RBUF, ResourceTemplate ()
{
Memory32Fixed (ReadWrite,
0xFEA30000, // Address Base
0x00004000, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000078,
}
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x00000079,
}
})
Return (RBUF) /* \_SB_.DMA0._CRS.RBUF */
}
Name (_DSD, Package() {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package (2) {"ctlrName", "DMA1"}
}
})
}

Device (DMA2)
{
Name (_HID, "ARMH0330")
Name (_UID, 2)
Method (_CRS, 0, Serialized)
{
Name (RBUF, ResourceTemplate ()
{
Memory32Fixed (ReadWrite,
0xFED10000, // Address Base
0x00004000, // Address Length
)
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x0000007A,
}
Interrupt (ResourceConsumer, Level, ActiveHigh, Exclusive, ,, )
{
0x0000007B,
}
})
Return (RBUF) /* \_SB_.DMA0._CRS.RBUF */
}
Name (_DSD, Package() {
ToUUID("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package (2) {"ctlrName", "DMA2"}
}
})
}
Loading