Merge remote branch 'alsa/devel' into topic/misc

[pandora-kernel.git] / arch / arm / mach-pxa / vpac270.c

diff --git a/arch/arm/mach-pxa/vpac270.c b/arch/arm/mach-pxa/vpac270.c
index 9884fa9..c9b747c 100644 (file)
--- a/arch/arm/mach-pxa/vpac270.c
+++ b/arch/arm/mach-pxa/vpac270.c
@@ -25,6 +25,7 @@
 #include <linux/dm9000.h>
 #include <linux/ucb1400.h>
 #include <linux/ata_platform.h>
+#include <linux/regulator/max1586.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -37,6 +38,7 @@
 #include <mach/ohci.h>
 #include <mach/pxa27x-udc.h>
 #include <mach/udc.h>
+#include <mach/pata_pxa.h>
 
 #include <plat/i2c.h>
 
@@ -464,7 +466,6 @@ static struct i2c_board_info __initdata vpac270_i2c_devs[] = {
 
 static void __init vpac270_rtc_init(void)
 {
-       pxa_set_i2c_info(NULL);
        i2c_register_board_info(0, ARRAY_AND_SIZE(vpac270_i2c_devs));
 }
 #else
@@ -492,7 +493,55 @@ static struct pxafb_mode_info vpac270_lcd_modes[] = {
        .vsync_len      = 2,
 
        .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-},
+}, {   /* CRT 640x480 */
+       .pixclock       = 35000,
+       .xres           = 640,
+       .yres           = 480,
+       .bpp            = 16,
+       .depth          = 16,
+
+       .left_margin    = 96,
+       .right_margin   = 48,
+       .upper_margin   = 33,
+       .lower_margin   = 10,
+
+       .hsync_len      = 48,
+       .vsync_len      = 1,
+
+       .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+}, {   /* CRT 800x600 H=30kHz V=48HZ */
+       .pixclock       = 25000,
+       .xres           = 800,
+       .yres           = 600,
+       .bpp            = 16,
+       .depth          = 16,
+
+       .left_margin    = 50,
+       .right_margin   = 1,
+       .upper_margin   = 21,
+       .lower_margin   = 12,
+
+       .hsync_len      = 8,
+       .vsync_len      = 1,
+
+       .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+}, {   /* CRT 1024x768 H=40kHz V=50Hz */
+       .pixclock       = 15000,
+       .xres           = 1024,
+       .yres           = 768,
+       .bpp            = 16,
+       .depth          = 16,
+
+       .left_margin    = 220,
+       .right_margin   = 8,
+       .upper_margin   = 33,
+       .lower_margin   = 2,
+
+       .hsync_len      = 48,
+       .vsync_len      = 1,
+
+       .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+}
 };
 
 static struct pxafb_mach_info vpac270_lcd_screen = {
@@ -538,9 +587,10 @@ static inline void vpac270_lcd_init(void) {}
 /******************************************************************************
  * PATA IDE
  ******************************************************************************/
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-static struct pata_platform_info vpac270_pata_pdata = {
-       .ioport_shift   = 1,
+#if defined(CONFIG_PATA_PXA) || defined(CONFIG_PATA_PXA_MODULE)
+static struct pata_pxa_pdata vpac270_pata_pdata = {
+       .reg_shift      = 1,
+       .dma_dreq       = 1,
        .irq_flags      = IRQF_TRIGGER_RISING,
 };
 
@@ -555,7 +605,12 @@ static struct resource vpac270_ide_resources[] = {
               .end     = PXA_CS3_PHYS + 0x15f,
               .flags   = IORESOURCE_MEM
        },
-       [2] = { /* IDE IRQ pin */
+       [2] = { /* DMA Base address */
+              .start   = PXA_CS3_PHYS + 0x20,
+              .end     = PXA_CS3_PHYS + 0x2f,
+              .flags   = IORESOURCE_DMA
+       },
+       [3] = { /* IDE IRQ pin */
               .start   = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
               .end     = gpio_to_irq(GPIO36_VPAC270_IDE_IRQ),
               .flags   = IORESOURCE_IRQ
@@ -563,11 +618,12 @@ static struct resource vpac270_ide_resources[] = {
 };
 
 static struct platform_device vpac270_ide_device = {
-       .name           = "pata_platform",
+       .name           = "pata_pxa",
        .num_resources  = ARRAY_SIZE(vpac270_ide_resources),
        .resource       = vpac270_ide_resources,
        .dev            = {
                .platform_data  = &vpac270_pata_pdata,
+               .coherent_dma_mask      = 0xffffffff,
        }
 };
 
@@ -579,6 +635,59 @@ static void __init vpac270_ide_init(void)
 static inline void vpac270_ide_init(void) {}
 #endif
 
+/******************************************************************************
+ * Core power regulator
+ ******************************************************************************/
+#if defined(CONFIG_REGULATOR_MAX1586) || \
+    defined(CONFIG_REGULATOR_MAX1586_MODULE)
+static struct regulator_consumer_supply vpac270_max1587a_consumers[] = {
+       {
+               .supply = "vcc_core",
+       }
+};
+
+static struct regulator_init_data vpac270_max1587a_v3_info = {
+       .constraints = {
+               .name           = "vcc_core range",
+               .min_uV         = 900000,
+               .max_uV         = 1705000,
+               .always_on      = 1,
+               .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE,
+       },
+       .consumer_supplies      = vpac270_max1587a_consumers,
+       .num_consumer_supplies  = ARRAY_SIZE(vpac270_max1587a_consumers),
+};
+
+static struct max1586_subdev_data vpac270_max1587a_subdevs[] = {
+       {
+               .name           = "vcc_core",
+               .id             = MAX1586_V3,
+               .platform_data  = &vpac270_max1587a_v3_info,
+       }
+};
+
+static struct max1586_platform_data vpac270_max1587a_info = {
+       .subdevs     = vpac270_max1587a_subdevs,
+       .num_subdevs = ARRAY_SIZE(vpac270_max1587a_subdevs),
+       .v3_gain     = MAX1586_GAIN_R24_3k32, /* 730..1550 mV */
+};
+
+static struct i2c_board_info __initdata vpac270_pi2c_board_info[] = {
+       {
+               I2C_BOARD_INFO("max1586", 0x14),
+               .platform_data  = &vpac270_max1587a_info,
+       },
+};
+
+static void __init vpac270_pmic_init(void)
+{
+       i2c_register_board_info(1, ARRAY_AND_SIZE(vpac270_pi2c_board_info));
+}
+#else
+static inline void vpac270_pmic_init(void) {}
+#endif
+
+
 /******************************************************************************
  * Machine init
  ******************************************************************************/
@@ -589,7 +698,10 @@ static void __init vpac270_init(void)
        pxa_set_ffuart_info(NULL);
        pxa_set_btuart_info(NULL);
        pxa_set_stuart_info(NULL);
+       pxa_set_i2c_info(NULL);
+       pxa27x_set_i2c_power_info(NULL);
 
+       vpac270_pmic_init();
        vpac270_lcd_init();
        vpac270_mmc_init();
        vpac270_nor_init();