diff options
| author | Tom Rini <trini@konsulko.com> | 2017-05-18 21:17:45 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-05-18 21:17:45 (GMT) |
| commit | a375ff8e14bea0a5cbfff99d6456aa8d9a3320ab (patch) | |
| tree | 566c9bc63d01ce843b1ea8f5e6aea8792b7e8384 /arch/arm/imx-common | |
| parent | 753a4dde970c2bc9022321f1093e544e3a150f6e (diff) | |
| parent | 5c84ad097d829bb1e6460438f33e1536b23b3c9b (diff) | |
| download | u-boot-fsl-qoriq-a375ff8e14bea0a5cbfff99d6456aa8d9a3320ab.tar.xz | |
Merge branch 'master' of git://www.denx.de/git/u-boot-imx
Diffstat (limited to 'arch/arm/imx-common')
| -rw-r--r-- | arch/arm/imx-common/rdc-sema.c | 2 | ||||
| -rw-r--r-- | arch/arm/imx-common/timer.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/imx-common/rdc-sema.c b/arch/arm/imx-common/rdc-sema.c index 5df4e02..1d97ac8 100644 --- a/arch/arm/imx-common/rdc-sema.c +++ b/arch/arm/imx-common/rdc-sema.c @@ -94,7 +94,7 @@ int imx_rdc_sema_unlock(int per_id) reg = readb(&imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]); if ((reg & RDC_SEMA_GATE_GTFSM_MASK) != RDC_SEMA_PROC_ID) - return 1; /*Not the semaphore owner */ + return -EACCES; /*Not the semaphore owner */ writeb(0x0, &imx_rdc_sema->gate[per_id % SEMA_GATES_NUM]); diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index ee6eff2..9b01114 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -105,9 +105,6 @@ int timer_init(void) #endif __raw_writel(i, &cur_gpt->control); - gd->arch.tbl = __raw_readl(&cur_gpt->counter); - gd->arch.tbu = 0; - return 0; } |