Skip to content

GitLab

Commit 79fa0edf authored by Manish Pandey's avatar Manish Pandey Committed by TrustedFirmware Code Review
Browse files

Merge "marvell: drivers: mochi: specify stream ID for SD/MMC" into integration

parents 34a66d80 2d1d2f05
Hide whitespace changes
Inline Side-by-side
drivers/marvell/mochi/cp110_setup.c
View file @ 79fa0edf
/* /*
* Copyright (C) 2018 Marvell International Ltd. * Copyright (C) 2018-2020 Marvell International Ltd.
* *
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
* https://spdx.org/licenses * https://spdx.org/licenses
...@@ -130,6 +130,7 @@ enum axi_attr { ...@@ -130,6 +130,7 @@ enum axi_attr {
#define USB3H_1_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x10) #define USB3H_1_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x10)
#define SATA_0_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x14) #define SATA_0_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x14)
#define SATA_1_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x18) #define SATA_1_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x18)
#define SDIO_0_STREAM_ID_REG (RFU_STREAM_ID_BASE + 0x28)
#define CP_DMA_0_STREAM_ID_REG (0x6B0010) #define CP_DMA_0_STREAM_ID_REG (0x6B0010)
#define CP_DMA_1_STREAM_ID_REG (0x6D0010) #define CP_DMA_1_STREAM_ID_REG (0x6D0010)
...@@ -144,6 +145,7 @@ uintptr_t stream_id_reg[] = { ...@@ -144,6 +145,7 @@ uintptr_t stream_id_reg[] = {
CP_DMA_1_STREAM_ID_REG, CP_DMA_1_STREAM_ID_REG,
SATA_0_STREAM_ID_REG, SATA_0_STREAM_ID_REG,
SATA_1_STREAM_ID_REG, SATA_1_STREAM_ID_REG,
SDIO_0_STREAM_ID_REG,
0 0
}; };
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment