diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mvf/board-twr-vf700.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-mvf/mvf_fec.c | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-mvf/board-twr-vf700.c b/arch/arm/mach-mvf/board-twr-vf700.c index 3c19b1c70ec9..576233588dde 100644 --- a/arch/arm/mach-mvf/board-twr-vf700.c +++ b/arch/arm/mach-mvf/board-twr-vf700.c @@ -249,13 +249,13 @@ static struct platform_device mvf_twr_audio_device = { }; static struct imxuart_platform_data mvf_uart1_pdata = { - .flags = IMXUART_FIFO | IMXUART_EDMA, + .flags = IMXUART_FIFO, .dma_req_rx = DMA_MUX03_UART1_RX, .dma_req_tx = DMA_MUX03_UART1_TX, }; static struct imxuart_platform_data mvf_uart0_pdata = { - .flags = IMXUART_FIFO | IMXUART_EDMA, + .flags = IMXUART_FIFO, .dma_req_rx = DMA_MUX03_UART0_RX, .dma_req_tx = DMA_MUX03_UART0_TX, }; diff --git a/arch/arm/mach-mvf/mvf_fec.c b/arch/arm/mach-mvf/mvf_fec.c index 5cbed27ba9aa..0ded64ebed13 100644 --- a/arch/arm/mach-mvf/mvf_fec.c +++ b/arch/arm/mach-mvf/mvf_fec.c @@ -35,13 +35,13 @@ static int fec_get_mac_addr(unsigned char *mac) unsigned int value; value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PALR); - mac[2] = value & 0xff; - mac[3] = (value >> 8) & 0xff; - mac[4] = (value >> 16) & 0xff; - mac[5] = (value >> 24) & 0xff; + mac[3] = value & 0xff; + mac[2] = (value >> 8) & 0xff; + mac[1] = (value >> 16) & 0xff; + mac[0] = (value >> 24) & 0xff; value = readl(MVF_IO_ADDRESS(MVF_FEC_BASE_ADDR) + ENET_PAUR); - mac[0] = (value >> 16) & 0xff; - mac[1] = (value >> 24) & 0xff; + mac[5] = (value >> 16) & 0xff; + mac[4] = (value >> 24) & 0xff; return 0; } |