leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: remove prototype for udelay_masked

Browse Source 
The interruption support had be removed for ARM architecture and
the function udelay_masked() is no more used except in some timer.c
files  and have the same content than udelay() or __udelay().

This patch update each timer.c implementing this function and
remove the associated prototype in u-boot-arm.h.

Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
This commit is contained in:
Patrick Delaunay 2018-10-05 11:33:51 +02:00 committed by Tom Rini
parent aad5b4a351
commit aa33fe8695
7 changed files with 3 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/cpu/arm920t/imx/timer.c
View File

@ -46,7 +46,7 @@ ulong get_timer_masked (void)
return TCN1; return TCN1;
} }
void udelay_masked (unsigned long usec) void __udelay (unsigned long usec)
{ {
ulong endtime = get_timer_masked() + usec; ulong endtime = get_timer_masked() + usec;
signed long diff; signed long diff;
@ -57,11 +57,6 @@ void udelay_masked (unsigned long usec)
} while (diff >= 0); } while (diff >= 0);
} }
void __udelay (unsigned long usec)
{
udelay_masked(usec);
}
/* /*
* This function is derived from PowerPC code (read timebase as long long). * This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value. * On ARM it just returns the timer value.

5
arch/arm/cpu/arm926ejs/spear/timer.c
View File

@ -98,11 +98,6 @@ ulong get_timer_masked(void)
return timestamp; return timestamp;
} }
void udelay_masked(unsigned long usec)
{
return udelay(usec);
}
/* /*
* This function is derived from PowerPC code (read timebase as long long). * This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value. * On ARM it just returns the timer value.

5
arch/arm/cpu/armv7/stv0991/timer.c
View File

@ -89,11 +89,6 @@ ulong get_timer_masked(void)
return timestamp; return timestamp;
} }
void udelay_masked(unsigned long usec)
{
return udelay(usec);
}
/* /*
* This function is derived from PowerPC code (read timebase as long long). * This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value. * On ARM it just returns the timer value.

7
arch/arm/cpu/sa1100/timer.c
View File

@ -17,17 +17,12 @@ ulong get_timer (ulong base)
return get_timer_masked (); return get_timer_masked ();
} }
void __udelay (unsigned long usec)
{
udelay_masked (usec);
}
ulong get_timer_masked (void) ulong get_timer_masked (void)
{ {
return OSCR; return OSCR;
} }
void udelay_masked (unsigned long usec) void __udelay (unsigned long usec)
{ {
ulong tmo; ulong tmo;
ulong endtime; ulong endtime;

1
arch/arm/include/asm/u-boot-arm.h
View File

@ -40,7 +40,6 @@ int board_init(void);
/* cpu/.../interrupt.c */ /* cpu/.../interrupt.c */
ulong get_timer_masked (void); ulong get_timer_masked (void);
void udelay_masked (unsigned long usec);
/* calls to c from vectors.S */ /* calls to c from vectors.S */
struct pt_regs; struct pt_regs;

7
arch/arm/mach-at91/arm920t/timer.c
View File

@ -58,11 +58,6 @@ ulong get_timer(ulong base)
return get_timer_masked() - base; return get_timer_masked() - base;
} }
void __udelay(unsigned long usec)
{
udelay_masked(usec);
}
ulong get_timer_raw(void) ulong get_timer_raw(void)
{ {
at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC; at91_tc_t *tc = (at91_tc_t *) ATMEL_BASE_TC;
@ -87,7 +82,7 @@ ulong get_timer_masked(void)
return get_timer_raw()/TIMER_LOAD_VAL; return get_timer_raw()/TIMER_LOAD_VAL;
} }
void udelay_masked(unsigned long usec) void __udelay(unsigned long usec)
{ {
u32 tmo; u32 tmo;
u32 endtime; u32 endtime;

6
board/armltd/integrator/timer.c
View File

@ -138,12 +138,6 @@ ulong get_timer_masked (void)
return timestamp; return timestamp;
} }
/* waits specified delay value and resets timestamp */
void udelay_masked (unsigned long usec)
{
udelay(usec);
}
/* /*
* This function is derived from PowerPC code (read timebase as long long). * This function is derived from PowerPC code (read timebase as long long).
* On ARM it just returns the timer value. * On ARM it just returns the timer value.