2005-07-07 Philippe Simons <loki_666@fastmail.fm>

* Makefile.am: Remove s3c2400/lcd/lcd.c
	* s3c2400/lcd/lcd.c: Remove.
	* s3c2400/clock/support.c: file "rewrote" to avoid GPL.
This commit is contained in:
Philippe Simons
2005-07-07 21:20:38 +00:00
parent 9b55ef5380
commit 1f18710404
3 changed files with 27 additions and 29 deletions

View File

@@ -1,3 +1,9 @@
2005-07-07 Philippe Simons <loki_666@fastmail.fm>
* Makefile.am: Remove s3c2400/lcd/lcd.c
* s3c2400/lcd/lcd.c: Remove.
* s3c2400/clock/support.c: file "rewrote" to avoid GPL.
2005-06-01 Philippe Simons <loki_666@fastmail.fm>
* Makefile.am: Add s3c2400/lcd/lcd.c, s3c2400/clock/support.c

View File

@@ -106,12 +106,6 @@ s3c2400_timer_rel_SOURCES = s3c2400/timer/timer.c
s3c2400_timer_rel_CPPFLAGS = $(AM_CPPFLAGS)
s3c2400_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
## s3c2400/lcd
noinst_PROGRAMS += s3c2400/lcd.rel
s3c2400_lcd_rel_SOURCES = s3c2400/lcd/lcd.c
s3c2400_lcd_rel_CPPFLAGS = $(AM_CPPLAGS)
s3c2400_lcd_rel_LDFLAGS = $(RTEMS_RELLDFLAGS)
## s3c2400/interrupt
include_HEADERS += s3c2400/irq/irq.h

View File

@@ -2,9 +2,6 @@
#include <bsp.h>
#include <s3c2400.h>
#define MPLL 0
#define UPLL 1
/* ------------------------------------------------------------------------- */
/* NOTE: This describes the proper use of this file.
*
@@ -15,17 +12,12 @@
*/
/* ------------------------------------------------------------------------- */
static uint32_t get_PLLCLK(int pllreg)
/* return FCLK frequency */
uint32_t get_FCLK(void)
{
uint32_t r, m, p, s;
if (pllreg == MPLL)
r = rMPLLCON;
else if (pllreg == UPLL)
r = rUPLLCON;
else
return 0;
m = ((r & 0xFF000) >> 12) + 8;
p = ((r & 0x003F0) >> 4) + 2;
s = r & 0x3;
@@ -33,27 +25,33 @@ static uint32_t get_PLLCLK(int pllreg)
return((BSP_OSC_FREQ * m) / (p << s));
}
/* return FCLK frequency */
uint32_t get_FCLK(void)
/* return UCLK frequency */
uint32_t get_UCLK(void)
{
return(get_PLLCLK(MPLL));
uint32_t r, m, p, s;
r = rUPLLCON;
m = ((r & 0xFF000) >> 12) + 8;
p = ((r & 0x003F0) >> 4) + 2;
s = r & 0x3;
return((BSP_OSC_FREQ * m) / (p << s));
}
/* return HCLK frequency */
uint32_t get_HCLK(void)
{
return((rCLKDIVN & 0x2) ? get_FCLK()/2 : get_FCLK());
if (rCLKDIVN & 0x2)
return get_FCLK()/2;
else
return get_FCLK();
}
/* return PCLK frequency */
uint32_t get_PCLK(void)
{
return((rCLKDIVN & 0x1) ? get_HCLK()/2 : get_HCLK());
if (rCLKDIVN & 0x1)
return get_HCLK()/2;
else
return get_HCLK();
}
/* return UCLK frequency */
uint32_t get_UCLK(void)
{
return(get_PLLCLK(UPLL));
}