Blackfin: bf527-ezkit: video: convert from old style MMR macros
The old MMR defines are being scrubbed, so convert the driver to use the new standard helper macros. Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
parent
0049053ff3
commit
989ab87e15
@ -162,12 +162,12 @@ static int lq035q1_control(unsigned char reg, unsigned short value)
|
||||
/* enable and disable PPI functions */
|
||||
void EnablePPI(void)
|
||||
{
|
||||
*pPPI_CONTROL |= PORT_EN;
|
||||
bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() | PORT_EN);
|
||||
}
|
||||
|
||||
void DisablePPI(void)
|
||||
{
|
||||
*pPPI_CONTROL &= ~PORT_EN;
|
||||
bfin_write_PPI_CONTROL(bfin_read_PPI_CONTROL() & ~PORT_EN);
|
||||
}
|
||||
|
||||
void Init_Ports(void)
|
||||
@ -182,119 +182,123 @@ void Init_Ports(void)
|
||||
void Init_PPI(void)
|
||||
{
|
||||
|
||||
*pPPI_DELAY = H_START;
|
||||
*pPPI_COUNT = (H_ACTPIX-1);
|
||||
*pPPI_FRAME = V_LINES;
|
||||
bfin_write_PPI_DELAY(H_START);
|
||||
bfin_write_PPI_COUNT(H_ACTPIX - 1);
|
||||
bfin_write_PPI_FRAME(V_LINES);
|
||||
|
||||
/* PPI control, to be replaced with definitions */
|
||||
*pPPI_CONTROL = PPI_TX_MODE | /* output mode , PORT_DIR */
|
||||
bfin_write_PPI_CONTROL(
|
||||
PPI_TX_MODE | /* output mode , PORT_DIR */
|
||||
PPI_XFER_TYPE_11 | /* sync mode XFR_TYPE */
|
||||
PPI_PORT_CFG_01 | /* two frame sync PORT_CFG */
|
||||
PPI_PACK_EN | /* packing enabled PACK_EN */
|
||||
PPI_POLS_1; /* faling edge syncs POLS */
|
||||
PPI_POLS_1 /* faling edge syncs POLS */
|
||||
);
|
||||
}
|
||||
|
||||
void Init_DMA(void *dst)
|
||||
{
|
||||
*pDMA0_START_ADDR = dst;
|
||||
bfin_write_DMA0_START_ADDR(dst);
|
||||
|
||||
/* X count */
|
||||
*pDMA0_X_COUNT = H_ACTPIX / 2;
|
||||
*pDMA0_X_MODIFY = DMA_BUS_SIZE / 8;
|
||||
bfin_write_DMA0_X_COUNT(H_ACTPIX / 2);
|
||||
bfin_write_DMA0_X_MODIFY(DMA_BUS_SIZE / 8);
|
||||
|
||||
/* Y count */
|
||||
*pDMA0_Y_COUNT = V_LINES;
|
||||
*pDMA0_Y_MODIFY = DMA_BUS_SIZE / 8;
|
||||
bfin_write_DMA0_Y_COUNT(V_LINES);
|
||||
bfin_write_DMA0_Y_MODIFY(DMA_BUS_SIZE / 8);
|
||||
|
||||
/* DMA Config */
|
||||
*pDMA0_CONFIG =
|
||||
bfin_write_DMA0_CONFIG(
|
||||
WDSIZE_16 | /* 16 bit DMA */
|
||||
DMA2D | /* 2D DMA */
|
||||
FLOW_AUTO; /* autobuffer mode */
|
||||
FLOW_AUTO /* autobuffer mode */
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
void EnableDMA(void)
|
||||
{
|
||||
*pDMA0_CONFIG |= DMAEN;
|
||||
bfin_write_DMA0_CONFIG(bfin_read_DMA0_CONFIG() | DMAEN);
|
||||
}
|
||||
|
||||
void DisableDMA(void)
|
||||
{
|
||||
*pDMA0_CONFIG &= ~DMAEN;
|
||||
bfin_write_DMA0_CONFIG(bfin_read_DMA0_CONFIG() & ~DMAEN);
|
||||
}
|
||||
|
||||
|
||||
/* Init TIMER0 as Frame Sync 1 generator */
|
||||
void InitTIMER0(void)
|
||||
{
|
||||
*pTIMER_DISABLE |= TIMDIS0; /* disable Timer */
|
||||
bfin_write_TIMER_DISABLE(TIMDIS0); /* disable Timer */
|
||||
SSYNC();
|
||||
*pTIMER_STATUS |= TIMIL0 | TOVF_ERR0 | TRUN0; /* clear status */
|
||||
bfin_write_TIMER_STATUS(TIMIL0 | TOVF_ERR0 | TRUN0); /* clear status */
|
||||
SSYNC();
|
||||
|
||||
*pTIMER0_PERIOD = H_PERIOD;
|
||||
bfin_write_TIMER0_PERIOD(H_PERIOD);
|
||||
SSYNC();
|
||||
*pTIMER0_WIDTH = H_PULSE;
|
||||
bfin_write_TIMER0_WIDTH(H_PULSE);
|
||||
SSYNC();
|
||||
|
||||
*pTIMER0_CONFIG = PWM_OUT |
|
||||
bfin_write_TIMER0_CONFIG(
|
||||
PWM_OUT |
|
||||
PERIOD_CNT |
|
||||
TIN_SEL |
|
||||
CLK_SEL |
|
||||
EMU_RUN;
|
||||
EMU_RUN
|
||||
);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
void EnableTIMER0(void)
|
||||
{
|
||||
*pTIMER_ENABLE |= TIMEN0;
|
||||
bfin_write_TIMER_ENABLE(TIMEN0);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
void DisableTIMER0(void)
|
||||
{
|
||||
*pTIMER_DISABLE |= TIMDIS0;
|
||||
bfin_write_TIMER_DISABLE(TIMDIS0);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
|
||||
void InitTIMER1(void)
|
||||
{
|
||||
*pTIMER_DISABLE |= TIMDIS1; /* disable Timer */
|
||||
bfin_write_TIMER_DISABLE(TIMDIS1); /* disable Timer */
|
||||
SSYNC();
|
||||
*pTIMER_STATUS |= TIMIL1 | TOVF_ERR1 | TRUN1; /* clear status */
|
||||
bfin_write_TIMER_STATUS(TIMIL1 | TOVF_ERR1 | TRUN1); /* clear status */
|
||||
SSYNC();
|
||||
|
||||
|
||||
*pTIMER1_PERIOD = V_PERIOD;
|
||||
bfin_write_TIMER1_PERIOD(V_PERIOD);
|
||||
SSYNC();
|
||||
*pTIMER1_WIDTH = V_PULSE;
|
||||
bfin_write_TIMER1_WIDTH(V_PULSE);
|
||||
SSYNC();
|
||||
|
||||
*pTIMER1_CONFIG = PWM_OUT |
|
||||
bfin_write_TIMER1_CONFIG(
|
||||
PWM_OUT |
|
||||
PERIOD_CNT |
|
||||
TIN_SEL |
|
||||
CLK_SEL |
|
||||
EMU_RUN;
|
||||
EMU_RUN
|
||||
);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
void EnableTIMER1(void)
|
||||
{
|
||||
*pTIMER_ENABLE |= TIMEN1;
|
||||
bfin_write_TIMER_ENABLE(TIMEN1);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
void DisableTIMER1(void)
|
||||
{
|
||||
*pTIMER_DISABLE |= TIMDIS1;
|
||||
bfin_write_TIMER_DISABLE(TIMDIS1);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
void EnableTIMER12(void)
|
||||
{
|
||||
*pTIMER_ENABLE |= TIMEN1 | TIMEN0;
|
||||
bfin_write_TIMER_ENABLE(TIMEN1 | TIMEN0);
|
||||
SSYNC();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user