7 files changed, 5 insertions, 74 deletions

diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 3d8cf8cbd98a..df1f4091a8ae 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -18,6 +18,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c/pcf857x.h>
 #include <linux/platform_data/at24.h>
+#include <linux/mfd/da8xx-cfgchip.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/spi/spi.h>
@@ -116,7 +117,7 @@ static __init void da830_evm_usb_init(void)
         cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
 
         /* USB2.0 PHY reference clock is 24 MHz */
-        cfgchip2 &= ~CFGCHIP2_REFFREQ;
+        cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK;
         cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;
 
         /*
@@ -133,7 +134,7 @@ static __init void da830_evm_usb_init(void)
          * controller won't be able to drive VBUS thinking that it's a B-device.
          * Otherwise, we want to use the OTG mode and enable VBUS comparators.
          */
-        cfgchip2 &= ~CFGCHIP2_OTGMODE;
+        cfgchip2 &= ~CFGCHIP2_OTGMODE_MASK;
 #ifdef  CONFIG_USB_MUSB_HOST
         cfgchip2 |=  CFGCHIP2_FORCE_HOST;
 #else
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index ee624861ca66..e1efa1066c1e 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/console.h>
 #include <linux/gpio.h>
+#include <linux/mfd/da8xx-cfgchip.h>
 #include <linux/platform_data/gpio-davinci.h>
 
 #include <asm/mach-types.h>
@@ -254,7 +255,7 @@ static __init void omapl138_hawk_usb_init(void)
         /* Setup the Ref. clock frequency for the HAWK at 24 MHz. */
 
         cfgchip2 = __raw_readl(DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
-        cfgchip2 &= ~CFGCHIP2_REFFREQ;
+        cfgchip2 &= ~CFGCHIP2_REFFREQ_MASK;
         cfgchip2 |=  CFGCHIP2_REFFREQ_24MHZ;
         __raw_writel(cfgchip2, DA8XX_SYSCFG0_VIRT(DA8XX_CFGCHIP2_REG));
 
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index add3771d38f6..dbdfe02b4174 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -57,15 +57,6 @@
 #define DA8XX_EMAC_RAM_OFFSET           0x0000
 #define DA8XX_EMAC_CTRL_RAM_SIZE        SZ_8K
 
-#define DA8XX_DMA_SPI0_RX       EDMA_CTLR_CHAN(0, 14)
-#define DA8XX_DMA_SPI0_TX       EDMA_CTLR_CHAN(0, 15)
-#define DA8XX_DMA_MMCSD0_RX     EDMA_CTLR_CHAN(0, 16)
-#define DA8XX_DMA_MMCSD0_TX     EDMA_CTLR_CHAN(0, 17)
-#define DA8XX_DMA_SPI1_RX       EDMA_CTLR_CHAN(0, 18)
-#define DA8XX_DMA_SPI1_TX       EDMA_CTLR_CHAN(0, 19)
-#define DA850_DMA_MMCSD1_RX     EDMA_CTLR_CHAN(1, 28)
-#define DA850_DMA_MMCSD1_TX     EDMA_CTLR_CHAN(1, 29)
-
 void __iomem *da8xx_syscfg0_base;
 void __iomem *da8xx_syscfg1_base;
 
@@ -964,16 +955,6 @@ static struct resource da8xx_spi0_resources[] = {
                 .end    = IRQ_DA8XX_SPINT0,
                 .flags  = IORESOURCE_IRQ,
         },
-        [2] = {
-                .start  = DA8XX_DMA_SPI0_RX,
-                .end    = DA8XX_DMA_SPI0_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = DA8XX_DMA_SPI0_TX,
-                .end    = DA8XX_DMA_SPI0_TX,
-                .flags  = IORESOURCE_DMA,
-        },
 };
 
 static struct resource da8xx_spi1_resources[] = {
@@ -987,16 +968,6 @@ static struct resource da8xx_spi1_resources[] = {
                 .end    = IRQ_DA8XX_SPINT1,
                 .flags  = IORESOURCE_IRQ,
         },
-        [2] = {
-                .start  = DA8XX_DMA_SPI1_RX,
-                .end    = DA8XX_DMA_SPI1_RX,
-                .flags  = IORESOURCE_DMA,
-        },
-        [3] = {
-                .start  = DA8XX_DMA_SPI1_TX,
-                .end    = DA8XX_DMA_SPI1_TX,
-                .flags  = IORESOURCE_DMA,
-        },
 };
 
 static struct davinci_spi_platform_data da8xx_spi_pdata[] = {
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c
index 67d26c5bda0b..3ae70f2909b0 100644
--- a/arch/arm/mach-davinci/devices.c
+++ b/arch/arm/mach-davinci/devices.c
@@ -36,9 +36,6 @@
 #define DM365_MMCSD0_BASE            0x01D11000
 #define DM365_MMCSD1_BASE            0x01D00000
 
-#define DAVINCI_DMA_MMCRXEVT    26
-#define DAVINCI_DMA_MMCTXEVT    27
-
 void __iomem  *davinci_sysmod_base;
 
 void davinci_map_sysmod(void)
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index d33322ddedab..bd50367f654e 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -397,14 +397,6 @@ static struct resource dm355_spi0_resources[] = {
                 .start = IRQ_DM355_SPINT0_0,
                 .flags = IORESOURCE_IRQ,
         },
-        {
-                .start = 17,
-                .flags = IORESOURCE_DMA,
-        },
-        {
-                .start = 16,
-                .flags = IORESOURCE_DMA,
-        },
 };
 
 static struct davinci_spi_platform_data dm355_spi0_pdata = {
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index ef3add999263..8be04ec95adf 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -660,14 +660,6 @@ static struct resource dm365_spi0_resources[] = {
                 .start = IRQ_DM365_SPIINT0_0,
                 .flags = IORESOURCE_IRQ,
         },
-        {
-                .start = 17,
-                .flags = IORESOURCE_DMA,
-        },
-        {
-                .start = 16,
-                .flags = IORESOURCE_DMA,
-        },
 };
 
 static struct platform_device dm365_spi0_device = {
diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h
index e0bc4abe69c2..0926e99f2e8f 100644
--- a/include/linux/platform_data/usb-davinci.h
+++ b/include/linux/platform_data/usb-davinci.h
@@ -11,29 +11,6 @@
 #ifndef __ASM_ARCH_USB_H
 #define __ASM_ARCH_USB_H
 
-/* DA8xx CFGCHIP2 (USB 2.0 PHY Control) register bits */
-#define CFGCHIP2_PHYCLKGD       (1 << 17)
-#define CFGCHIP2_VBUSSENSE      (1 << 16)
-#define CFGCHIP2_RESET          (1 << 15)
-#define CFGCHIP2_OTGMODE        (3 << 13)
-#define CFGCHIP2_NO_OVERRIDE    (0 << 13)
-#define CFGCHIP2_FORCE_HOST     (1 << 13)
-#define CFGCHIP2_FORCE_DEVICE   (2 << 13)
-#define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13)
-#define CFGCHIP2_USB1PHYCLKMUX  (1 << 12)
-#define CFGCHIP2_USB2PHYCLKMUX  (1 << 11)
-#define CFGCHIP2_PHYPWRDN       (1 << 10)
-#define CFGCHIP2_OTGPWRDN       (1 << 9)
-#define CFGCHIP2_DATPOL         (1 << 8)
-#define CFGCHIP2_USB1SUSPENDM   (1 << 7)
-#define CFGCHIP2_PHY_PLLON      (1 << 6)        /* override PLL suspend */
-#define CFGCHIP2_SESENDEN       (1 << 5)        /* Vsess_end comparator */
-#define CFGCHIP2_VBDTCTEN       (1 << 4)        /* Vbus comparator */
-#define CFGCHIP2_REFFREQ        (0xf << 0)
-#define CFGCHIP2_REFFREQ_12MHZ  (1 << 0)
-#define CFGCHIP2_REFFREQ_24MHZ  (2 << 0)
-#define CFGCHIP2_REFFREQ_48MHZ  (3 << 0)
-
 struct  da8xx_ohci_root_hub;
 
 typedef void (*da8xx_ocic_handler_t)(struct da8xx_ohci_root_hub *hub,