1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/davinci_emac.c b/drivers/net/davinci_emac.c
index 082d6ea69920..807b6bb200eb 100644
--- a/drivers/net/davinci_emac.c
+++ b/drivers/net/davinci_emac.c
@@ -94,14 +94,14 @@ MODULE_VERSION(EMAC_MODULE_VERSION);
 static const char emac_version_string[] = "TI DaVinci EMAC Linux v6.1";
 
 /* Configuration items */
-#define EMAC_DEF_PASS_CRC               (0) /* Do not pass CRC upto frames */
+#define EMAC_DEF_PASS_CRC               (0) /* Do not pass CRC up to frames */
 #define EMAC_DEF_QOS_EN                 (0) /* EMAC proprietary QoS disabled */
 #define EMAC_DEF_NO_BUFF_CHAIN          (0) /* No buffer chain */
 #define EMAC_DEF_MACCTRL_FRAME_EN       (0) /* Discard Maccontrol frames */
 #define EMAC_DEF_SHORT_FRAME_EN         (0) /* Discard short frames */
 #define EMAC_DEF_ERROR_FRAME_EN         (0) /* Discard error frames */
-#define EMAC_DEF_PROM_EN                (0) /* Promiscous disabled */
-#define EMAC_DEF_PROM_CH                (0) /* Promiscous channel is 0 */
+#define EMAC_DEF_PROM_EN                (0) /* Promiscuous disabled */
+#define EMAC_DEF_PROM_CH                (0) /* Promiscuous channel is 0 */
 #define EMAC_DEF_BCAST_EN               (1) /* Broadcast enabled */
 #define EMAC_DEF_BCAST_CH               (0) /* Broadcast channel is 0 */
 #define EMAC_DEF_MCAST_EN               (1) /* Multicast enabled */
@@ -1013,7 +1013,7 @@ static void emac_rx_handler(void *token, int len, int status)
                 return;
         }
 
-        /* recycle on recieve error */
+        /* recycle on receive error */
         if (status < 0) {
                 ndev->stats.rx_errors++;
                 goto recycle;
@@ -1854,10 +1854,13 @@ static int __devinit davinci_emac_probe(struct platform_device *pdev)
         dma_params.rxcp                 = priv->emac_base + 0x660;
         dma_params.num_chan             = EMAC_MAX_TXRX_CHANNELS;
         dma_params.min_packet_size      = EMAC_DEF_MIN_ETHPKTSIZE;
-        dma_params.desc_mem_phys        = hw_ram_addr;
+        dma_params.desc_hw_addr         = hw_ram_addr;
         dma_params.desc_mem_size        = pdata->ctrl_ram_size;
         dma_params.desc_align           = 16;
 
+        dma_params.desc_mem_phys = pdata->no_bd_ram ? 0 :
+                        (u32 __force)res->start + pdata->ctrl_ram_offset;
+
         priv->dma = cpdma_ctlr_create(&dma_params);
         if (!priv->dma) {
                 dev_err(emac_dev, "DaVinci EMAC: Error initializing DMA\n");