Skip to content

Commit

Permalink
[Review OP-TEE#2] Minor fixes
Browse files Browse the repository at this point in the history
Signed-off-by: Clement Faure <[email protected]>
  • Loading branch information
clementfaure committed Aug 13, 2019
1 parent a5496ac commit aff7581
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion core/arch/arm/plat-imx/imx-common.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static uint32_t imx_soc_rev_major(void)
if (imx_soc_revision < 0)
imx_digproc();

return (imx_soc_revision >> 4);
return imx_soc_revision >> 4;
}

static uint32_t imx_soc_type(void)
Expand Down
1 change: 0 additions & 1 deletion core/arch/arm/plat-imx/registers/imx7ulp.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: BSD-2-Clause */
/*
* Copyright 2017-2019 NXP
*
*/

#ifndef __IMX7ULP_H__
Expand Down
5 changes: 2 additions & 3 deletions core/drivers/imx_lpuart.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// SPDX-License-Identifier: BSD-2-Clause
/*
* Copyright 2017-2019 NXP
*
*/

#include <assert.h>
Expand Down Expand Up @@ -36,7 +35,7 @@ static int imx_lpuart_getchar(struct serial_chip *chip)
while (io_read32(base + STAT) & STAT_RDRF)
;

ch = (io_read32(base + DATA) & 0x3ff);
ch = io_read32(base + DATA) & 0x3ff;

if (io_read32(base + STAT) & STAT_OR)
io_write32(base + STAT, STAT_OR);
Expand Down Expand Up @@ -66,7 +65,7 @@ void imx_uart_init(struct imx_uart_data *pd, paddr_t base)
pd->chip.ops = &imx_lpuart_ops;

/*
* Do nothing, debug uart(sc lpuart) share with normal world,
* Do nothing, debug uart(sc lpuart) shared with normal world,
* everything for uart initialization is done in bootloader.
*/
}
4 changes: 2 additions & 2 deletions core/include/drivers/imx_wdog.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,11 @@

#define REFRESH_SEQ0 0xA602
#define REFRESH_SEQ1 0xB480
#define REFRESH ((REFRESH_SEQ1 << 16) | (REFRESH_SEQ0))
#define REFRESH ((REFRESH_SEQ1 << 16) | REFRESH_SEQ0)

#define UNLOCK_SEQ0 0xC520
#define UNLOCK_SEQ1 0xD928
#define UNLOCK ((UNLOCK_SEQ1 << 16) | (UNLOCK_SEQ0))
#define UNLOCK ((UNLOCK_SEQ1 << 16) | UNLOCK_SEQ0)

#define WDOG_CS 0x0
#define WDOG_CS_CMD32EN BIT(13)
Expand Down

0 comments on commit aff7581

Please sign in to comment.