]> pilppa.org Git - linux-2.6-omap-h63xx.git/blobdiff - arch/arm/mach-pxa/generic.c
Merge branch 'merge-fixes' into devel
[linux-2.6-omap-h63xx.git] / arch / arm / mach-pxa / generic.c
index 5510f6fdce55e4dc8b2f55f93359e1b245da619a..331f29b2d0cd5e6e2cefeeb30d92fbed9fe4969a 100644 (file)
 #include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/delay.h>
-#include <linux/platform_device.h>
-#include <linux/ioport.h>
-#include <linux/pm.h>
-#include <linux/string.h>
-
-#include <linux/sched.h>
-#include <asm/cnt32_to_63.h>
-#include <asm/div64.h>
 
 #include <asm/hardware.h>
-#include <asm/irq.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
 #include <asm/mach/map.h>
 
 #include <asm/arch/pxa-regs.h>
-#include <asm/arch/gpio.h>
-#include <asm/arch/udc.h>
-#include <asm/arch/pxafb.h>
-#include <asm/arch/mmc.h>
-#include <asm/arch/irda.h>
-#include <asm/arch/i2c.h>
 
-#include "devices.h"
 #include "generic.h"
 
 /*
- * This is the PXA2xx sched_clock implementation. This has a resolution
- * of at least 308ns and a maximum value that depends on the value of
- * CLOCK_TICK_RATE.
- *
- * The return value is guaranteed to be monotonic in that range as
- * long as there is always less than 582 seconds between successive
- * calls to this function.
+ * Get the clock frequency as reflected by CCCR and the turbo flag.
+ * We assume these values have been applied via a fcs.
+ * If info is not 0 we also display the current settings.
  */
-unsigned long long sched_clock(void)
+unsigned int get_clk_frequency_khz(int info)
 {
-       unsigned long long v = cnt32_to_63(OSCR);
-       /* Note: top bit ov v needs cleared unless multiplier is even. */
-
-#if    CLOCK_TICK_RATE == 3686400
-       /* 1E9 / 3686400 => 78125 / 288, max value = 32025597s (370 days). */
-       /* The <<1 is used to get rid of tick.hi top bit */
-       v *= 78125<<1;
-       do_div(v, 288<<1);
-#elif  CLOCK_TICK_RATE == 3250000
-       /* 1E9 / 3250000 => 4000 / 13, max value = 709490156s (8211 days) */
-       v *= 4000;
-       do_div(v, 13);
-#elif  CLOCK_TICK_RATE == 3249600
-       /* 1E9 / 3249600 => 625000 / 2031, max value = 4541295s (52 days) */
-       v *= 625000;
-       do_div(v, 2031);
-#else
-#warning "consider fixing sched_clock for your value of CLOCK_TICK_RATE"
-       /*
-        * 96-bit math to perform tick * NSEC_PER_SEC / CLOCK_TICK_RATE for
-        * any value of CLOCK_TICK_RATE. Max value is in the 80 thousand
-        * years range and truncation to unsigned long long limits it to
-        * sched_clock's max range of ~584 years.  This is nice but with
-        * higher computation cost.
-        */
-       {
-               union {
-                       unsigned long long val;
-                       struct { unsigned long lo, hi; };
-               } x;
-               unsigned long long y;
-
-               x.val = v;
-               x.hi &= 0x7fffffff;
-               y = (unsigned long long)x.lo * NSEC_PER_SEC;
-               x.lo = y;
-               y = (y >> 32) + (unsigned long long)x.hi * NSEC_PER_SEC;
-               x.hi = do_div(y, CLOCK_TICK_RATE);
-               do_div(x.val, CLOCK_TICK_RATE);
-               x.hi += y;
-               v = x.val;
-       }
-#endif
-
-       return v;
-}
-
-/*
- * Handy function to set GPIO alternate functions
- */
-
-int pxa_gpio_mode(int gpio_mode)
-{
-       unsigned long flags;
-       int gpio = gpio_mode & GPIO_MD_MASK_NR;
-       int fn = (gpio_mode & GPIO_MD_MASK_FN) >> 8;
-       int gafr;
-
-       if (gpio > PXA_LAST_GPIO)
-               return -EINVAL;
-
-       local_irq_save(flags);
-       if (gpio_mode & GPIO_DFLT_LOW)
-               GPCR(gpio) = GPIO_bit(gpio);
-       else if (gpio_mode & GPIO_DFLT_HIGH)
-               GPSR(gpio) = GPIO_bit(gpio);
-       if (gpio_mode & GPIO_MD_MASK_DIR)
-               GPDR(gpio) |= GPIO_bit(gpio);
+       if (cpu_is_pxa21x() || cpu_is_pxa25x())
+               return pxa25x_get_clk_frequency_khz(info);
+       else if (cpu_is_pxa27x())
+               return pxa27x_get_clk_frequency_khz(info);
        else
-               GPDR(gpio) &= ~GPIO_bit(gpio);
-       gafr = GAFR(gpio) & ~(0x3 << (((gpio) & 0xf)*2));
-       GAFR(gpio) = gafr |  (fn  << (((gpio) & 0xf)*2));
-       local_irq_restore(flags);
-
-       return 0;
-}
-
-EXPORT_SYMBOL(pxa_gpio_mode);
-
-/*
- * Return GPIO level
- */
-int pxa_gpio_get_value(unsigned gpio)
-{
-       return __gpio_get_value(gpio);
+               return pxa3xx_get_clk_frequency_khz(info);
 }
-
-EXPORT_SYMBOL(pxa_gpio_get_value);
+EXPORT_SYMBOL(get_clk_frequency_khz);
 
 /*
- * Set output GPIO level
+ * Return the current memory clock frequency in units of 10kHz
  */
-void pxa_gpio_set_value(unsigned gpio, int value)
+unsigned int get_memclk_frequency_10khz(void)
 {
-       __gpio_set_value(gpio, value);
+       if (cpu_is_pxa21x() || cpu_is_pxa25x())
+               return pxa25x_get_memclk_frequency_10khz();
+       else if (cpu_is_pxa27x())
+               return pxa27x_get_memclk_frequency_10khz();
+       else
+               return pxa3xx_get_memclk_frequency_10khz();
 }
-
-EXPORT_SYMBOL(pxa_gpio_set_value);
+EXPORT_SYMBOL(get_memclk_frequency_10khz);
 
 /*
  * Routine to safely enable or disable a clock in the CKEN
  */
-void pxa_set_cken(int clock, int enable)
+void __pxa_set_cken(int clock, int enable)
 {
        unsigned long flags;
        local_irq_save(flags);
@@ -171,8 +74,7 @@ void pxa_set_cken(int clock, int enable)
 
        local_irq_restore(flags);
 }
-
-EXPORT_SYMBOL(pxa_set_cken);
+EXPORT_SYMBOL(__pxa_set_cken);
 
 /*
  * Intel PXA2xx internal register mapping.
@@ -196,7 +98,7 @@ static struct map_desc standard_io_desc[] __initdata = {
        }, {    /* Mem Ctl */
                .virtual        =  0xf6000000,
                .pfn            = __phys_to_pfn(0x48000000),
-               .length         = 0x00100000,
+               .length         = 0x00200000,
                .type           = MT_DEVICE
        }, {    /* USB host */
                .virtual        =  0xf8000000,
@@ -226,186 +128,3 @@ void __init pxa_map_io(void)
        iotable_init(standard_io_desc, ARRAY_SIZE(standard_io_desc));
        get_clk_frequency_khz(1);
 }
-
-
-static struct resource pxamci_resources[] = {
-       [0] = {
-               .start  = 0x41100000,
-               .end    = 0x41100fff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = IRQ_MMC,
-               .end    = IRQ_MMC,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static u64 pxamci_dmamask = 0xffffffffUL;
-
-struct platform_device pxa_device_mci = {
-       .name           = "pxa2xx-mci",
-       .id             = -1,
-       .dev            = {
-               .dma_mask = &pxamci_dmamask,
-               .coherent_dma_mask = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(pxamci_resources),
-       .resource       = pxamci_resources,
-};
-
-void __init pxa_set_mci_info(struct pxamci_platform_data *info)
-{
-       pxa_device_mci.dev.platform_data = info;
-}
-
-
-static struct pxa2xx_udc_mach_info pxa_udc_info;
-
-void __init pxa_set_udc_info(struct pxa2xx_udc_mach_info *info)
-{
-       memcpy(&pxa_udc_info, info, sizeof *info);
-}
-
-static struct resource pxa2xx_udc_resources[] = {
-       [0] = {
-               .start  = 0x40600000,
-               .end    = 0x4060ffff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = IRQ_USB,
-               .end    = IRQ_USB,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static u64 udc_dma_mask = ~(u32)0;
-
-struct platform_device pxa_device_udc = {
-       .name           = "pxa2xx-udc",
-       .id             = -1,
-       .resource       = pxa2xx_udc_resources,
-       .num_resources  = ARRAY_SIZE(pxa2xx_udc_resources),
-       .dev            =  {
-               .platform_data  = &pxa_udc_info,
-               .dma_mask       = &udc_dma_mask,
-       }
-};
-
-static struct resource pxafb_resources[] = {
-       [0] = {
-               .start  = 0x44000000,
-               .end    = 0x4400ffff,
-               .flags  = IORESOURCE_MEM,
-       },
-       [1] = {
-               .start  = IRQ_LCD,
-               .end    = IRQ_LCD,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-static u64 fb_dma_mask = ~(u64)0;
-
-struct platform_device pxa_device_fb = {
-       .name           = "pxa2xx-fb",
-       .id             = -1,
-       .dev            = {
-               .dma_mask       = &fb_dma_mask,
-               .coherent_dma_mask = 0xffffffff,
-       },
-       .num_resources  = ARRAY_SIZE(pxafb_resources),
-       .resource       = pxafb_resources,
-};
-
-void __init set_pxa_fb_info(struct pxafb_mach_info *info)
-{
-       pxa_device_fb.dev.platform_data = info;
-}
-
-void __init set_pxa_fb_parent(struct device *parent_dev)
-{
-       pxa_device_fb.dev.parent = parent_dev;
-}
-
-struct platform_device pxa_device_ffuart= {
-       .name           = "pxa2xx-uart",
-       .id             = 0,
-};
-struct platform_device pxa_device_btuart = {
-       .name           = "pxa2xx-uart",
-       .id             = 1,
-};
-struct platform_device pxa_device_stuart = {
-       .name           = "pxa2xx-uart",
-       .id             = 2,
-};
-struct platform_device pxa_device_hwuart = {
-       .name           = "pxa2xx-uart",
-       .id             = 3,
-};
-
-static struct resource pxai2c_resources[] = {
-       {
-               .start  = 0x40301680,
-               .end    = 0x403016a3,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_I2C,
-               .end    = IRQ_I2C,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device pxa_device_i2c = {
-       .name           = "pxa2xx-i2c",
-       .id             = 0,
-       .resource       = pxai2c_resources,
-       .num_resources  = ARRAY_SIZE(pxai2c_resources),
-};
-
-void __init pxa_set_i2c_info(struct i2c_pxa_platform_data *info)
-{
-       pxa_device_i2c.dev.platform_data = info;
-}
-
-static struct resource pxai2s_resources[] = {
-       {
-               .start  = 0x40400000,
-               .end    = 0x40400083,
-               .flags  = IORESOURCE_MEM,
-       }, {
-               .start  = IRQ_I2S,
-               .end    = IRQ_I2S,
-               .flags  = IORESOURCE_IRQ,
-       },
-};
-
-struct platform_device pxa_device_i2s = {
-       .name           = "pxa2xx-i2s",
-       .id             = -1,
-       .resource       = pxai2s_resources,
-       .num_resources  = ARRAY_SIZE(pxai2s_resources),
-};
-
-static u64 pxaficp_dmamask = ~(u32)0;
-
-struct platform_device pxa_device_ficp = {
-       .name           = "pxa2xx-ir",
-       .id             = -1,
-       .dev            = {
-               .dma_mask = &pxaficp_dmamask,
-               .coherent_dma_mask = 0xffffffff,
-       },
-};
-
-void __init pxa_set_ficp_info(struct pxaficp_platform_data *info)
-{
-       pxa_device_ficp.dev.platform_data = info;
-}
-
-struct platform_device pxa_device_rtc = {
-       .name           = "sa1100-rtc",
-       .id             = -1,
-};