aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/arm/pl011/aarch32/pl011_console.S5
-rw-r--r--drivers/arm/pl011/aarch64/pl011_console.S5
-rw-r--r--drivers/cadence/uart/aarch64/cdns_console.S5
-rw-r--r--drivers/coreboot/cbmem_console/aarch64/cbmem_console.S4
-rw-r--r--drivers/imx/usdhc/imx_usdhc.c2
-rw-r--r--drivers/ti/uart/aarch64/16550_console.S5
6 files changed, 15 insertions, 11 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S
index b7892e12e1..841ea446c7 100644
--- a/drivers/arm/pl011/aarch32/pl011_console.S
+++ b/drivers/arm/pl011/aarch32/pl011_console.S
@@ -89,8 +89,9 @@ endfunc console_pl011_core_init
.globl console_pl011_register
/* -------------------------------------------------------
- * init console_pl011_register(console_pl011_t *console,
- * uintptr_t base, uint32_t clk, uint32_t baud)
+ * int console_pl011_register(uintptr_t baseaddr,
+ * uint32_t clock, uint32_t baud,
+ * console_pl011_t *console);
* Function to initialize and register a new PL011
* console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack).
diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S
index 448501a22b..d6a2d6b899 100644
--- a/drivers/arm/pl011/aarch64/pl011_console.S
+++ b/drivers/arm/pl011/aarch64/pl011_console.S
@@ -85,8 +85,9 @@ endfunc console_pl011_core_init
.globl console_pl011_register
/* -----------------------------------------------
- * int console_pl011_register(console_pl011_t *console,
- uintptr_t base, uint32_t clk, uint32_t baud)
+ * int console_pl011_register(uintptr_t baseaddr,
+ * uint32_t clock, uint32_t baud,
+ * console_pl011_t *console);
* Function to initialize and register a new PL011
* console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack).
diff --git a/drivers/cadence/uart/aarch64/cdns_console.S b/drivers/cadence/uart/aarch64/cdns_console.S
index 6732631970..71359a6d20 100644
--- a/drivers/cadence/uart/aarch64/cdns_console.S
+++ b/drivers/cadence/uart/aarch64/cdns_console.S
@@ -54,8 +54,9 @@ endfunc console_cdns_core_init
.globl console_cdns_register
/* -----------------------------------------------
- * int console_cdns_register(console_cdns_t *console,
- uintptr_t base, uint32_t clk, uint32_t baud)
+ * int console_cdns_register(uint64_t baseaddr,
+ * uint32_t clock, uint32_t baud,
+ * console_cdns_t *console);
* Function to initialize and register a new CDNS
* console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack).
diff --git a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S
index 2fc0603349..184853d9d9 100644
--- a/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S
+++ b/drivers/coreboot/cbmem_console/aarch64/cbmem_console.S
@@ -19,8 +19,8 @@
.globl console_cbmc_flush
/* -----------------------------------------------
- * int console_cbmc_register(console_cbmc_t *console,
- * uintptr_t base)
+ * int console_cbmc_register(uintptr_t base,
+ * console_cbmc_t *console);
* Registers a new CBMEM console instance. Reads
* the size field from the buffer header structure
* and stores it in our console_cbmc_t struct, so
diff --git a/drivers/imx/usdhc/imx_usdhc.c b/drivers/imx/usdhc/imx_usdhc.c
index ea96833f5a..1f9550e172 100644
--- a/drivers/imx/usdhc/imx_usdhc.c
+++ b/drivers/imx/usdhc/imx_usdhc.c
@@ -160,7 +160,7 @@ static int imx_usdhc_send_cmd(struct mmc_cmd *cmd)
mixctl |= MIXCTRL_DMAEN;
}
- if (cmd->resp_type & MMC_RSP_48)
+ if (cmd->resp_type & MMC_RSP_48 && cmd->resp_type != MMC_RESPONSE_R2)
xfertype |= XFERTYPE_RSPTYP_48;
else if (cmd->resp_type & MMC_RSP_136)
xfertype |= XFERTYPE_RSPTYP_136;
diff --git a/drivers/ti/uart/aarch64/16550_console.S b/drivers/ti/uart/aarch64/16550_console.S
index d46fa61190..0f9a9d5764 100644
--- a/drivers/ti/uart/aarch64/16550_console.S
+++ b/drivers/ti/uart/aarch64/16550_console.S
@@ -87,8 +87,9 @@ endfunc console_16550_core_init
.globl console_16550_register
/* -----------------------------------------------
- * int console_16550_register(console_16550_t *console,
- uintptr_t base, uint32_t clk, uint32_t baud)
+ * int console_16550_register(uintptr_t baseaddr,
+ * uint32_t clock, uint32_t baud,
+ * console_16550_t *console);
* Function to initialize and register a new 16550
* console. Storage passed in for the console struct
* *must* be persistent (i.e. not from the stack).