Blackfin: bf537-stamp: add adp5588 gpio resources
[safe/jmp/linux-2.6] / arch / blackfin / mach-bf537 / boards / stamp.c
index a5e8e5b..9db6b40 100644 (file)
@@ -73,13 +73,12 @@ static struct resource bfin_isp1760_resources[] = {
        [1] = {
                .start  = IRQ_PF7,
                .end    = IRQ_PF7,
-               .flags  = IORESOURCE_IRQ,
+               .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
        },
 };
 
 static struct isp1760_platform_data isp1760_priv = {
        .is_isp1761 = 0,
-       .port1_disable = 0,
        .bus_width_16 = 1,
        .port1_otg = 0,
        .analog_oc = 0,
@@ -172,6 +171,14 @@ static struct platform_device rtc_device = {
 #endif
 
 #if defined(CONFIG_SMC91X) || defined(CONFIG_SMC91X_MODULE)
+#include <linux/smc91x.h>
+
+static struct smc91x_platdata smc91x_info = {
+       .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
+       .leda = RPC_LED_100_10,
+       .ledb = RPC_LED_TX_RX,
+};
+
 static struct resource smc91x_resources[] = {
        {
                .name = "smc91x-regs",
@@ -190,6 +197,9 @@ static struct platform_device smc91x_device = {
        .id = 0,
        .num_resources = ARRAY_SIZE(smc91x_resources),
        .resource = smc91x_resources,
+       .dev    = {
+               .platform_data  = &smc91x_info,
+       },
 };
 #endif
 
@@ -197,10 +207,15 @@ static struct platform_device smc91x_device = {
 static struct resource dm9000_resources[] = {
        [0] = {
                .start  = 0x203FB800,
-               .end    = 0x203FB800 + 8,
+               .end    = 0x203FB800 + 1,
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
+               .start  = 0x203FB804,
+               .end    = 0x203FB804 + 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [2] = {
                .start  = IRQ_PF9,
                .end    = IRQ_PF9,
                .flags  = (IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE),
@@ -321,8 +336,13 @@ static struct platform_device isp1362_hcd_device = {
 #endif
 
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+static struct platform_device bfin_mii_bus = {
+       .name = "bfin_mii_bus",
+};
+
 static struct platform_device bfin_mac_device = {
        .name = "bfin_mac",
+       .dev.platform_data = &bfin_mii_bus,
 };
 #endif
 
@@ -433,11 +453,11 @@ static struct mtd_partition stamp_partitions[] = {
                .offset     = 0,
        }, {
                .name       = "linux kernel(nor)",
-               .size       = 0xE0000,
+               .size       = 0x180000,
                .offset     = MTDPART_OFS_APPEND,
        }, {
                .name       = "file system(nor)",
-               .size       = 0x400000 - 0x40000 - 0xE0000 - 0x10000,
+               .size       = 0x400000 - 0x40000 - 0x180000 - 0x10000,
                .offset     = MTDPART_OFS_APPEND,
        }, {
                .name       = "MAC Address(nor)",
@@ -480,7 +500,7 @@ static struct mtd_partition bfin_spi_flash_partitions[] = {
                .mask_flags = MTD_CAP_ROM
        }, {
                .name = "linux kernel(spi)",
-               .size = 0xe0000,
+               .size = 0x180000,
                .offset = MTDPART_OFS_APPEND,
        }, {
                .name = "file system(spi)",
@@ -503,8 +523,8 @@ static struct bfin5xx_spi_chip spi_flash_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_SPI_ADC_BF533) \
-       || defined(CONFIG_SPI_ADC_BF533_MODULE)
+#if defined(CONFIG_BFIN_SPI_ADC) \
+       || defined(CONFIG_BFIN_SPI_ADC_MODULE)
 /* SPI ADC chip */
 static struct bfin5xx_spi_chip spi_adc_chip_info = {
        .enable_dma = 1,         /* use dma transfer with this chip*/
@@ -512,25 +532,134 @@ static struct bfin5xx_spi_chip spi_adc_chip_info = {
 };
 #endif
 
-#if defined(CONFIG_SND_BLACKFIN_AD1836) \
-       || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
+       || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
 static struct bfin5xx_spi_chip ad1836_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 16,
 };
 #endif
 
-#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
-static struct bfin5xx_spi_chip ad9960_spi_chip_info = {
+#if defined(CONFIG_SND_BF5XX_SOC_AD1938) \
+       || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE)
+static struct bfin5xx_spi_chip ad1938_spi_chip_info = {
        .enable_dma = 0,
-       .bits_per_word = 16,
+       .bits_per_word = 8,
+       .cs_gpio = GPIO_PF5,
 };
 #endif
 
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
-static struct bfin5xx_spi_chip spi_mmc_chip_info = {
+#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
+#include <linux/input.h>
+#include <linux/input/ad714x.h>
+static struct bfin5xx_spi_chip ad7147_spi_chip_info = {
        .enable_dma = 0,
-       .bits_per_word = 8,
+       .bits_per_word = 16,
+};
+
+static struct ad714x_slider_plat slider_plat[] = {
+       {
+               .start_stage = 0,
+               .end_stage = 7,
+               .max_coord = 128,
+       },
+};
+
+static struct ad714x_button_plat button_plat[] = {
+       {
+               .keycode = BTN_FORWARD,
+               .l_mask = 0,
+               .h_mask = 0x600,
+       },
+       {
+               .keycode = BTN_LEFT,
+               .l_mask = 0,
+               .h_mask = 0x500,
+       },
+       {
+               .keycode = BTN_MIDDLE,
+               .l_mask = 0,
+               .h_mask = 0x800,
+       },
+       {
+               .keycode = BTN_RIGHT,
+               .l_mask = 0x100,
+               .h_mask = 0x400,
+       },
+       {
+               .keycode = BTN_BACK,
+               .l_mask = 0x200,
+               .h_mask = 0x400,
+       },
+};
+static struct ad714x_platform_data ad7147_platfrom_data = {
+       .slider_num = 1,
+       .button_num = 5,
+       .slider = slider_plat,
+       .button = button_plat,
+       .stage_cfg_reg =  {
+               {0xFBFF, 0x1FFF, 0, 0x2626, 1600, 1600, 1600, 1600},
+               {0xEFFF, 0x1FFF, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1FFE, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1FFB, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1FEF, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1FBF, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1EFF, 0, 0x2626, 1650, 1650, 1650, 1650},
+               {0xFFFF, 0x1BFF, 0, 0x2626, 1600, 1600, 1600, 1600},
+               {0xFF7B, 0x3FFF, 0x506,  0x2626, 1100, 1100, 1150, 1150},
+               {0xFDFE, 0x3FFF, 0x606,  0x2626, 1100, 1100, 1150, 1150},
+               {0xFEBA, 0x1FFF, 0x1400, 0x2626, 1200, 1200, 1300, 1300},
+               {0xFFEF, 0x1FFF, 0x0,    0x2626, 1100, 1100, 1150, 1150},
+       },
+       .sys_cfg_reg = {0x2B2, 0x0, 0x3233, 0x819, 0x832, 0xCFF, 0xCFF, 0x0},
+};
+#endif
+
+#if defined(CONFIG_INPUT_EVAL_AD7142EB)
+#include <linux/input.h>
+#include <linux/input/ad714x.h>
+static struct ad714x_button_plat button_plat[] = {
+       {
+               .keycode = BTN_1,
+               .l_mask = 0,
+               .h_mask = 0x1,
+       },
+       {
+               .keycode = BTN_2,
+               .l_mask = 0,
+               .h_mask = 0x2,
+       },
+       {
+               .keycode = BTN_3,
+               .l_mask = 0,
+               .h_mask = 0x4,
+       },
+       {
+               .keycode = BTN_4,
+               .l_mask = 0x0,
+               .h_mask = 0x8,
+       },
+};
+static struct ad714x_platform_data ad7142_platfrom_data = {
+       .button_num = 4,
+       .button = button_plat,
+       .stage_cfg_reg =  {
+               /* fixme: figure out right setting for all comoponent according
+                * to hardware feature of EVAL-AD7142EB board */
+               {0xE7FF, 0x3FFF, 0x0005, 0x2626, 0x01F4, 0x01F4, 0x028A, 0x028A},
+               {0xFDBF, 0x3FFF, 0x0001, 0x2626, 0x01F4, 0x01F4, 0x028A, 0x028A},
+               {0xFFFF, 0x2DFF, 0x0001, 0x2626, 0x01F4, 0x01F4, 0x028A, 0x028A},
+               {0xFFFF, 0x37BF, 0x0001, 0x2626, 0x01F4, 0x01F4, 0x028A, 0x028A},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+               {0xFFFF, 0x3FFF, 0x0000, 0x0606, 0x01F4, 0x01F4, 0x0320, 0x0320},
+       },
+       .sys_cfg_reg = {0x0B2, 0x0, 0x690, 0x664, 0x290F, 0xF, 0xF, 0x0},
 };
 #endif
 
@@ -558,15 +687,7 @@ static struct mmc_spi_platform_data bfin_mmc_spi_pdata = {
 static struct bfin5xx_spi_chip  mmc_spi_chip_info = {
        .enable_dma = 0,
        .bits_per_word = 8,
-};
-#endif
-
-#if defined(CONFIG_PBX)
-static struct bfin5xx_spi_chip spi_si3xxx_chip_info = {
-       .ctl_reg        = 0x4, /* send zero */
-       .enable_dma     = 0,
-       .bits_per_word  = 8,
-       .cs_change_per_word = 1,
+       .pio_interrupt = 0,
 };
 #endif
 
@@ -609,6 +730,43 @@ static const struct ad7879_platform_data bfin_ad7879_ts_info = {
 };
 #endif
 
+#if defined(CONFIG_INPUT_ADXL34X) || defined(CONFIG_INPUT_ADXL34X_MODULE)
+#include <linux/input.h>
+#include <linux/spi/adxl34x.h>
+static const struct adxl34x_platform_data adxl34x_info = {
+       .x_axis_offset = 0,
+       .y_axis_offset = 0,
+       .z_axis_offset = 0,
+       .tap_threshold = 0x31,
+       .tap_duration = 0x10,
+       .tap_latency = 0x60,
+       .tap_window = 0xF0,
+       .tap_axis_control = ADXL_TAP_X_EN | ADXL_TAP_Y_EN | ADXL_TAP_Z_EN,
+       .act_axis_control = 0xFF,
+       .activity_threshold = 5,
+       .inactivity_threshold = 3,
+       .inactivity_time = 4,
+       .free_fall_threshold = 0x7,
+       .free_fall_time = 0x20,
+       .data_rate = 0x8,
+       .data_range = ADXL_FULL_RES,
+
+       .ev_type = EV_ABS,
+       .ev_code_x = ABS_X,             /* EV_REL */
+       .ev_code_y = ABS_Y,             /* EV_REL */
+       .ev_code_z = ABS_Z,             /* EV_REL */
+
+       .ev_code_tap_x = BTN_TOUCH,             /* EV_KEY */
+       .ev_code_tap_y = BTN_TOUCH,             /* EV_KEY */
+       .ev_code_tap_z = BTN_TOUCH,             /* EV_KEY */
+
+/*     .ev_code_ff = KEY_F,*/          /* EV_KEY */
+/*     .ev_code_act_inactivity = KEY_A,*/      /* EV_KEY */
+       .power_mode = ADXL_AUTO_SLEEP | ADXL_LINK,
+       .fifo_mode = ADXL_FIFO_STREAM,
+};
+#endif
+
 #if defined(CONFIG_TOUCHSCREEN_AD7879_SPI) || defined(CONFIG_TOUCHSCREEN_AD7879_SPI_MODULE)
 static struct bfin5xx_spi_chip spi_ad7879_chip_info = {
        .enable_dma = 0,
@@ -630,6 +788,14 @@ static struct bfin5xx_spi_chip lq035q1_spi_chip_info = {
 };
 #endif
 
+#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+static struct bfin5xx_spi_chip enc28j60_spi_chip_info = {
+       .enable_dma     = 1,
+       .bits_per_word  = 8,
+       .cs_gpio = GPIO_PF10,
+};
+#endif
+
 #if defined(CONFIG_MTD_DATAFLASH) \
        || defined(CONFIG_MTD_DATAFLASH_MODULE)
 
@@ -641,7 +807,7 @@ static struct mtd_partition bfin_spi_dataflash_partitions[] = {
                .mask_flags = MTD_CAP_ROM
        }, {
                .name = "linux kernel(spi)",
-               .size = 0xe0000,
+               .size = 0x180000,
                .offset = MTDPART_OFS_APPEND,
        }, {
                .name = "file system(spi)",
@@ -689,8 +855,8 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .mode = SPI_MODE_3,
        },
 #endif
-#if defined(CONFIG_SPI_ADC_BF533) \
-       || defined(CONFIG_SPI_ADC_BF533_MODULE)
+#if defined(CONFIG_BFIN_SPI_ADC) \
+       || defined(CONFIG_BFIN_SPI_ADC_MODULE)
        {
                .modalias = "bfin_spi_adc", /* Name of spi_driver for this device */
                .max_speed_hz = 6250000,     /* max spi clock (SCK) speed in HZ */
@@ -701,45 +867,42 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
        },
 #endif
 
-#if defined(CONFIG_SND_BLACKFIN_AD1836) \
-       || defined(CONFIG_SND_BLACKFIN_AD1836_MODULE)
+#if defined(CONFIG_SND_BF5XX_SOC_AD1836) \
+       || defined(CONFIG_SND_BF5XX_SOC_AD1836_MODULE)
        {
-               .modalias = "ad1836-spi",
+               .modalias = "ad1836",
                .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-               .chip_select = CONFIG_SND_BLACKFIN_SPI_PFBIT,
+               .chip_select = 4,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
                .controller_data = &ad1836_spi_chip_info,
+               .mode = SPI_MODE_3,
        },
 #endif
-#if defined(CONFIG_AD9960) || defined(CONFIG_AD9960_MODULE)
-       {
-               .modalias = "ad9960-spi",
-               .max_speed_hz = 10000000,     /* max spi clock (SCK) speed in HZ */
-               .bus_num = 0,
-               .chip_select = 1,
-               .controller_data = &ad9960_spi_chip_info,
-       },
-#endif
-#if defined(CONFIG_SPI_MMC) || defined(CONFIG_SPI_MMC_MODULE)
+
+#if defined(CONFIG_SND_BF5XX_SOC_AD1938) || defined(CONFIG_SND_BF5XX_SOC_AD1938_MODULE)
        {
-               .modalias = "spi_mmc_dummy",
-               .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
+               .modalias = "ad1938",
+               .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
                .bus_num = 0,
-               .chip_select = 0,
-               .platform_data = NULL,
-               .controller_data = &spi_mmc_chip_info,
+               .chip_select = 0,/* CONFIG_SND_BLACKFIN_SPI_PFBIT */
+               .controller_data = &ad1938_spi_chip_info,
                .mode = SPI_MODE_3,
        },
+#endif
+
+#if defined(CONFIG_INPUT_EVAL_AD7147EBZ)
        {
-               .modalias = "spi_mmc",
-               .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
+               .modalias = "ad714x_captouch",
+               .max_speed_hz = 1000000,     /* max spi clock (SCK) speed in HZ */
+               .irq = IRQ_PF4,
                .bus_num = 0,
-               .chip_select = CONFIG_SPI_MMC_CS_CHAN,
-               .platform_data = NULL,
-               .controller_data = &spi_mmc_chip_info,
+               .chip_select = 5,
                .mode = SPI_MODE_3,
+               .platform_data = &ad7147_platfrom_data,
+               .controller_data = &ad7147_spi_chip_info,
        },
 #endif
+
 #if defined(CONFIG_MMC_SPI) || defined(CONFIG_MMC_SPI_MODULE)
        {
                .modalias = "mmc_spi",
@@ -751,24 +914,6 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .mode = SPI_MODE_3,
        },
 #endif
-#if defined(CONFIG_PBX)
-       {
-               .modalias = "fxs-spi",
-               .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-               .bus_num = 0,
-               .chip_select = 8 - CONFIG_J11_JUMPER,
-               .controller_data = &spi_si3xxx_chip_info,
-               .mode = SPI_MODE_3,
-       },
-       {
-               .modalias = "fxo-spi",
-               .max_speed_hz = 12500000,     /* max spi clock (SCK) speed in HZ */
-               .bus_num = 0,
-               .chip_select = 8 - CONFIG_J19_JUMPER,
-               .controller_data = &spi_si3xxx_chip_info,
-               .mode = SPI_MODE_3,
-       },
-#endif
 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
        {
                .modalias               = "ad7877",
@@ -811,6 +956,17 @@ static struct spi_board_info bfin_spi_board_info[] __initdata = {
                .mode = SPI_CPHA | SPI_CPOL,
        },
 #endif
+#if defined(CONFIG_ENC28J60) || defined(CONFIG_ENC28J60_MODULE)
+       {
+               .modalias = "enc28j60",
+               .max_speed_hz = 20000000,     /* max spi clock (SCK) speed in HZ */
+               .irq = IRQ_PF6,
+               .bus_num = 0,
+               .chip_select = 0,       /* GPIO controlled SSEL */
+               .controller_data = &enc28j60_spi_chip_info,
+               .mode = SPI_MODE_0,
+       },
+#endif
 };
 
 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
@@ -831,6 +987,11 @@ static struct resource bfin_spi0_resource[] = {
        [1] = {
                .start = CH_SPI,
                .end   = CH_SPI,
+               .flags = IORESOURCE_DMA,
+       },
+       [2] = {
+               .start = IRQ_SPI,
+               .end   = IRQ_SPI,
                .flags = IORESOURCE_IRQ,
        },
 };
@@ -846,6 +1007,71 @@ static struct platform_device bfin_spi0_device = {
 };
 #endif  /* spi master and devices */
 
+#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+
+/* SPORT SPI controller data */
+static struct bfin5xx_spi_master bfin_sport_spi0_info = {
+       .num_chipselect = 1, /* master only supports one device */
+       .enable_dma = 0,  /* master don't support DMA */
+       .pin_req = {P_SPORT0_DTPRI, P_SPORT0_TSCLK, P_SPORT0_DRPRI,
+               P_SPORT0_RSCLK, P_SPORT0_TFS, P_SPORT0_RFS, 0},
+};
+
+static struct resource bfin_sport_spi0_resource[] = {
+       [0] = {
+               .start = SPORT0_TCR1,
+               .end   = SPORT0_TCR1 + 0xFF,
+               .flags = IORESOURCE_MEM,
+               },
+       [1] = {
+               .start = IRQ_SPORT0_ERROR,
+               .end   = IRQ_SPORT0_ERROR,
+               .flags = IORESOURCE_IRQ,
+               },
+};
+
+static struct platform_device bfin_sport_spi0_device = {
+       .name = "bfin-sport-spi",
+       .id = 1, /* Bus number */
+       .num_resources = ARRAY_SIZE(bfin_sport_spi0_resource),
+       .resource = bfin_sport_spi0_resource,
+       .dev = {
+               .platform_data = &bfin_sport_spi0_info, /* Passed to driver */
+       },
+};
+
+static struct bfin5xx_spi_master bfin_sport_spi1_info = {
+       .num_chipselect = 1, /* master only supports one device */
+       .enable_dma = 0,  /* master don't support DMA */
+       .pin_req = {P_SPORT1_DTPRI, P_SPORT1_TSCLK, P_SPORT1_DRPRI,
+               P_SPORT1_RSCLK, P_SPORT1_TFS, P_SPORT1_RFS, 0},
+};
+
+static struct resource bfin_sport_spi1_resource[] = {
+       [0] = {
+               .start = SPORT1_TCR1,
+               .end   = SPORT1_TCR1 + 0xFF,
+               .flags = IORESOURCE_MEM,
+               },
+       [1] = {
+               .start = IRQ_SPORT1_ERROR,
+               .end   = IRQ_SPORT1_ERROR,
+               .flags = IORESOURCE_IRQ,
+               },
+};
+
+static struct platform_device bfin_sport_spi1_device = {
+       .name = "bfin-sport-spi",
+       .id = 2, /* Bus number */
+       .num_resources = ARRAY_SIZE(bfin_sport_spi1_resource),
+       .resource = bfin_sport_spi1_resource,
+       .dev = {
+               .platform_data = &bfin_sport_spi1_info, /* Passed to driver */
+       },
+};
+
+#endif  /* sport spi master and devices */
+
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
 static struct platform_device bfin_fb_device = {
        .name = "bf537-lq035",
@@ -913,30 +1139,59 @@ static struct platform_device bfin_uart_device = {
 #endif
 
 #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
-static struct resource bfin_sir_resources[] = {
 #ifdef CONFIG_BFIN_SIR0
+static struct resource bfin_sir0_resources[] = {
        {
                .start = 0xFFC00400,
                .end = 0xFFC004FF,
                .flags = IORESOURCE_MEM,
        },
+       {
+               .start = IRQ_UART0_RX,
+               .end = IRQ_UART0_RX+1,
+               .flags = IORESOURCE_IRQ,
+       },
+       {
+               .start = CH_UART0_RX,
+               .end = CH_UART0_RX+1,
+               .flags = IORESOURCE_DMA,
+       },
+};
+
+static struct platform_device bfin_sir0_device = {
+       .name = "bfin_sir",
+       .id = 0,
+       .num_resources = ARRAY_SIZE(bfin_sir0_resources),
+       .resource = bfin_sir0_resources,
+};
 #endif
 #ifdef CONFIG_BFIN_SIR1
+static struct resource bfin_sir1_resources[] = {
        {
                .start = 0xFFC02000,
                .end = 0xFFC020FF,
                .flags = IORESOURCE_MEM,
        },
-#endif
+       {
+               .start = IRQ_UART1_RX,
+               .end = IRQ_UART1_RX+1,
+               .flags = IORESOURCE_IRQ,
+       },
+       {
+               .start = CH_UART1_RX,
+               .end = CH_UART1_RX+1,
+               .flags = IORESOURCE_DMA,
+       },
 };
 
-static struct platform_device bfin_sir_device = {
+static struct platform_device bfin_sir1_device = {
        .name = "bfin_sir",
-       .id = 0,
-       .num_resources = ARRAY_SIZE(bfin_sir_resources),
-       .resource = bfin_sir_resources,
+       .id = 1,
+       .num_resources = ARRAY_SIZE(bfin_sir1_resources),
+       .resource = bfin_sir1_resources,
 };
 #endif
+#endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
 static struct resource bfin_twi0_resource[] = {
@@ -960,20 +1215,250 @@ static struct platform_device i2c_bfin_twi_device = {
 };
 #endif
 
-#ifdef CONFIG_I2C_BOARDINFO
+#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
+#include <linux/input.h>
+#include <linux/i2c/adp5588.h>
+static const unsigned short adp5588_keymap[ADP5588_KEYMAPSIZE] = {
+       [0]      = KEY_GRAVE,
+       [1]      = KEY_1,
+       [2]      = KEY_2,
+       [3]      = KEY_3,
+       [4]      = KEY_4,
+       [5]      = KEY_5,
+       [6]      = KEY_6,
+       [7]      = KEY_7,
+       [8]      = KEY_8,
+       [9]      = KEY_9,
+       [10]     = KEY_0,
+       [11]     = KEY_MINUS,
+       [12]     = KEY_EQUAL,
+       [13]     = KEY_BACKSLASH,
+       [15]     = KEY_KP0,
+       [16]     = KEY_Q,
+       [17]     = KEY_W,
+       [18]     = KEY_E,
+       [19]     = KEY_R,
+       [20]     = KEY_T,
+       [21]     = KEY_Y,
+       [22]     = KEY_U,
+       [23]     = KEY_I,
+       [24]     = KEY_O,
+       [25]     = KEY_P,
+       [26]     = KEY_LEFTBRACE,
+       [27]     = KEY_RIGHTBRACE,
+       [29]     = KEY_KP1,
+       [30]     = KEY_KP2,
+       [31]     = KEY_KP3,
+       [32]     = KEY_A,
+       [33]     = KEY_S,
+       [34]     = KEY_D,
+       [35]     = KEY_F,
+       [36]     = KEY_G,
+       [37]     = KEY_H,
+       [38]     = KEY_J,
+       [39]     = KEY_K,
+       [40]     = KEY_L,
+       [41]     = KEY_SEMICOLON,
+       [42]     = KEY_APOSTROPHE,
+       [43]     = KEY_BACKSLASH,
+       [45]     = KEY_KP4,
+       [46]     = KEY_KP5,
+       [47]     = KEY_KP6,
+       [48]     = KEY_102ND,
+       [49]     = KEY_Z,
+       [50]     = KEY_X,
+       [51]     = KEY_C,
+       [52]     = KEY_V,
+       [53]     = KEY_B,
+       [54]     = KEY_N,
+       [55]     = KEY_M,
+       [56]     = KEY_COMMA,
+       [57]     = KEY_DOT,
+       [58]     = KEY_SLASH,
+       [60]     = KEY_KPDOT,
+       [61]     = KEY_KP7,
+       [62]     = KEY_KP8,
+       [63]     = KEY_KP9,
+       [64]     = KEY_SPACE,
+       [65]     = KEY_BACKSPACE,
+       [66]     = KEY_TAB,
+       [67]     = KEY_KPENTER,
+       [68]     = KEY_ENTER,
+       [69]     = KEY_ESC,
+       [70]     = KEY_DELETE,
+       [74]     = KEY_KPMINUS,
+       [76]     = KEY_UP,
+       [77]     = KEY_DOWN,
+       [78]     = KEY_RIGHT,
+       [79]     = KEY_LEFT,
+};
+
+static struct adp5588_kpad_platform_data adp5588_kpad_data = {
+       .rows           = 8,
+       .cols           = 10,
+       .keymap         = adp5588_keymap,
+       .keymapsize     = ARRAY_SIZE(adp5588_keymap),
+       .repeat         = 0,
+};
+#endif
+
+#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+#include <linux/mfd/adp5520.h>
+
+       /*
+        *  ADP5520/5501 Backlight Data
+        */
+
+static struct adp5520_backlight_platfrom_data adp5520_backlight_data = {
+       .fade_in                = FADE_T_1200ms,
+       .fade_out               = FADE_T_1200ms,
+       .fade_led_law           = BL_LAW_LINEAR,
+       .en_ambl_sens           = 1,
+       .abml_filt              = BL_AMBL_FILT_640ms,
+       .l1_daylight_max        = BL_CUR_mA(15),
+       .l1_daylight_dim        = BL_CUR_mA(0),
+       .l2_office_max          = BL_CUR_mA(7),
+       .l2_office_dim          = BL_CUR_mA(0),
+       .l3_dark_max            = BL_CUR_mA(3),
+       .l3_dark_dim            = BL_CUR_mA(0),
+       .l2_trip                = L2_COMP_CURR_uA(700),
+       .l2_hyst                = L2_COMP_CURR_uA(50),
+       .l3_trip                = L3_COMP_CURR_uA(80),
+       .l3_hyst                = L3_COMP_CURR_uA(20),
+};
+
+       /*
+        *  ADP5520/5501 LEDs Data
+        */
+
+#include <linux/leds.h>
+
+static struct led_info adp5520_leds[] = {
+       {
+               .name = "adp5520-led1",
+               .default_trigger = "none",
+               .flags = FLAG_ID_ADP5520_LED1_ADP5501_LED0 | LED_OFFT_600ms,
+       },
+#ifdef ADP5520_EN_ALL_LEDS
+       {
+               .name = "adp5520-led2",
+               .default_trigger = "none",
+               .flags = FLAG_ID_ADP5520_LED2_ADP5501_LED1,
+       },
+       {
+               .name = "adp5520-led3",
+               .default_trigger = "none",
+               .flags = FLAG_ID_ADP5520_LED3_ADP5501_LED2,
+       },
+#endif
+};
+
+static struct adp5520_leds_platfrom_data adp5520_leds_data = {
+       .num_leds = ARRAY_SIZE(adp5520_leds),
+       .leds = adp5520_leds,
+       .fade_in = FADE_T_600ms,
+       .fade_out = FADE_T_600ms,
+       .led_on_time = LED_ONT_600ms,
+};
+
+       /*
+        *  ADP5520 GPIO Data
+        */
+
+static struct adp5520_gpio_platfrom_data adp5520_gpio_data = {
+       .gpio_start = 50,
+       .gpio_en_mask = GPIO_C1 | GPIO_C2 | GPIO_R2,
+       .gpio_pullup_mask = GPIO_C1 | GPIO_C2 | GPIO_R2,
+};
+
+       /*
+        *  ADP5520 Keypad Data
+        */
+
+#include <linux/input.h>
+static const unsigned short adp5520_keymap[ADP5520_KEYMAPSIZE] = {
+       [KEY(0, 0)]     = KEY_GRAVE,
+       [KEY(0, 1)]     = KEY_1,
+       [KEY(0, 2)]     = KEY_2,
+       [KEY(0, 3)]     = KEY_3,
+       [KEY(1, 0)]     = KEY_4,
+       [KEY(1, 1)]     = KEY_5,
+       [KEY(1, 2)]     = KEY_6,
+       [KEY(1, 3)]     = KEY_7,
+       [KEY(2, 0)]     = KEY_8,
+       [KEY(2, 1)]     = KEY_9,
+       [KEY(2, 2)]     = KEY_0,
+       [KEY(2, 3)]     = KEY_MINUS,
+       [KEY(3, 0)]     = KEY_EQUAL,
+       [KEY(3, 1)]     = KEY_BACKSLASH,
+       [KEY(3, 2)]     = KEY_BACKSPACE,
+       [KEY(3, 3)]     = KEY_ENTER,
+};
+
+static struct adp5520_keys_platfrom_data adp5520_keys_data = {
+       .rows_en_mask   = ROW_R3 | ROW_R2 | ROW_R1 | ROW_R0,
+       .cols_en_mask   = COL_C3 | COL_C2 | COL_C1 | COL_C0,
+       .keymap         = adp5520_keymap,
+       .keymapsize     = ARRAY_SIZE(adp5520_keymap),
+       .repeat         = 0,
+};
+
+       /*
+        *  ADP5520/5501 Multifuction Device Init Data
+        */
+
+static struct adp5520_subdev_info adp5520_subdevs[] = {
+       {
+               .name = "adp5520-backlight",
+               .id = ID_ADP5520,
+               .platform_data = &adp5520_backlight_data,
+       },
+       {
+               .name = "adp5520-led",
+               .id = ID_ADP5520,
+               .platform_data = &adp5520_leds_data,
+       },
+       {
+               .name = "adp5520-gpio",
+               .id = ID_ADP5520,
+               .platform_data = &adp5520_gpio_data,
+       },
+       {
+               .name = "adp5520-keys",
+               .id = ID_ADP5520,
+               .platform_data = &adp5520_keys_data,
+       },
+};
+
+static struct adp5520_platform_data adp5520_pdev_data = {
+       .num_subdevs = ARRAY_SIZE(adp5520_subdevs),
+       .subdevs = adp5520_subdevs,
+};
+
+#endif
+
+#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
+#include <linux/i2c/adp5588.h>
+static struct adp5588_gpio_platfrom_data adp5588_gpio_data = {
+       .gpio_start = 50,
+       .pullup_dis_mask = 0,
+};
+#endif
+
 static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
-#if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE)
+#if defined(CONFIG_INPUT_EVAL_AD7142EB)
        {
-               I2C_BOARD_INFO("ad7142_joystick", 0x2C),
-               .irq = IRQ_PF5,
+               I2C_BOARD_INFO("ad7142_captouch", 0x2C),
+               .irq = IRQ_PG5,
+               .platform_data = (void *)&ad7142_platfrom_data,
        },
 #endif
-#if defined(CONFIG_TWI_LCD) || defined(CONFIG_TWI_LCD_MODULE)
+#if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)
        {
                I2C_BOARD_INFO("pcf8574_lcd", 0x22),
        },
 #endif
-#if defined(CONFIG_TWI_KEYPAD) || defined(CONFIG_TWI_KEYPAD_MODULE)
+#if defined(CONFIG_INPUT_PCF8574) || defined(CONFIG_INPUT_PCF8574_MODULE)
        {
                I2C_BOARD_INFO("pcf8574_keypad", 0x27),
                .irq = IRQ_PG6,
@@ -986,8 +1471,34 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = {
                .platform_data = (void *)&bfin_ad7879_ts_info,
        },
 #endif
-};
+#if defined(CONFIG_KEYBOARD_ADP5588) || defined(CONFIG_KEYBOARD_ADP5588_MODULE)
+       {
+               I2C_BOARD_INFO("adp5588-keys", 0x34),
+               .irq = IRQ_PG0,
+               .platform_data = (void *)&adp5588_kpad_data,
+       },
 #endif
+#if defined(CONFIG_PMIC_ADP5520) || defined(CONFIG_PMIC_ADP5520_MODULE)
+       {
+               I2C_BOARD_INFO("pmic-adp5520", 0x32),
+               .irq = IRQ_PG0,
+               .platform_data = (void *)&adp5520_pdev_data,
+       },
+#endif
+#if defined(CONFIG_INPUT_ADXL34X_I2C) || defined(CONFIG_INPUT_ADXL34X_I2C_MODULE)
+       {
+               I2C_BOARD_INFO("adxl34x", 0x53),
+               .irq = IRQ_PG3,
+               .platform_data = (void *)&adxl34x_info,
+       },
+#endif
+#if defined(CONFIG_GPIO_ADP5588) || defined(CONFIG_GPIO_ADP5588_MODULE)
+       {
+               I2C_BOARD_INFO("adp5588-gpio", 0x34),
+               .platform_data = (void *)&adp5588_gpio_data,
+       },
+#endif
+};
 
 #if defined(CONFIG_SERIAL_BFIN_SPORT) || defined(CONFIG_SERIAL_BFIN_SPORT_MODULE)
 static struct platform_device bfin_sport0_uart_device = {
@@ -1002,8 +1513,11 @@ static struct platform_device bfin_sport1_uart_device = {
 #endif
 
 #if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-#define PATA_INT       IRQ_PF5
+#define CF_IDE_NAND_CARD_USE_HDD_INTERFACE
+/* #define CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE */
 
+#ifdef CF_IDE_NAND_CARD_USE_HDD_INTERFACE
+#define PATA_INT       IRQ_PF5
 static struct pata_platform_info bfin_pata_platform_data = {
        .ioport_shift = 1,
        .irq_flags = IRQF_TRIGGER_HIGH | IRQF_DISABLED,
@@ -1026,6 +1540,26 @@ static struct resource bfin_pata_resources[] = {
                .flags = IORESOURCE_IRQ,
        },
 };
+#elif defined(CF_IDE_NAND_CARD_USE_CF_IN_COMMON_MEMORY_MODE)
+static struct pata_platform_info bfin_pata_platform_data = {
+       .ioport_shift = 0,
+};
+/* CompactFlash Storage Card Memory Mapped Adressing
+ * /REG = A11 = 1
+ */
+static struct resource bfin_pata_resources[] = {
+       {
+               .start = 0x20211800,
+               .end = 0x20211807,
+               .flags = IORESOURCE_MEM,
+       },
+       {
+               .start = 0x2021180E,    /* Device Ctl */
+               .end = 0x2021180E,
+               .flags = IORESOURCE_MEM,
+       },
+};
+#endif
 
 static struct platform_device bfin_pata_device = {
        .name = "pata_platform",
@@ -1065,6 +1599,13 @@ static struct platform_device bfin_dpmc = {
        },
 };
 
+#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+static struct platform_device bfin_tdm = {
+       .name = "bfin-tdm",
+       /* TODO: add platform data here */
+};
+#endif
+
 static struct platform_device *stamp_devices[] __initdata = {
 
        &bfin_dpmc,
@@ -1102,6 +1643,7 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_BFIN_MAC) || defined(CONFIG_BFIN_MAC_MODULE)
+       &bfin_mii_bus,
        &bfin_mac_device,
 #endif
 
@@ -1113,6 +1655,11 @@ static struct platform_device *stamp_devices[] __initdata = {
        &bfin_spi0_device,
 #endif
 
+#if defined(CONFIG_SPI_BFIN_SPORT) || defined(CONFIG_SPI_BFIN_SPORT_MODULE)
+       &bfin_sport_spi0_device,
+       &bfin_sport_spi1_device,
+#endif
+
 #if defined(CONFIG_FB_BF537_LQ035) || defined(CONFIG_FB_BF537_LQ035_MODULE)
        &bfin_fb_device,
 #endif
@@ -1130,7 +1677,12 @@ static struct platform_device *stamp_devices[] __initdata = {
 #endif
 
 #if defined(CONFIG_BFIN_SIR) || defined(CONFIG_BFIN_SIR_MODULE)
-       &bfin_sir_device,
+#ifdef CONFIG_BFIN_SIR0
+       &bfin_sir0_device,
+#endif
+#ifdef CONFIG_BFIN_SIR1
+       &bfin_sir1_device,
+#endif
 #endif
 
 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
@@ -1159,25 +1711,21 @@ static struct platform_device *stamp_devices[] __initdata = {
 #if defined(CONFIG_MTD_PHYSMAP) || defined(CONFIG_MTD_PHYSMAP_MODULE)
        &stamp_flash_device,
 #endif
+
+#if defined(CONFIG_SND_BF5XX_TDM) || defined(CONFIG_SND_BF5XX_TDM_MODULE)
+       &bfin_tdm,
+#endif
 };
 
 static int __init stamp_init(void)
 {
        printk(KERN_INFO "%s(): registering device resources\n", __func__);
-
-#ifdef CONFIG_I2C_BOARDINFO
        i2c_register_board_info(0, bfin_i2c_board_info,
                                ARRAY_SIZE(bfin_i2c_board_info));
-#endif
-
        bfin_plat_nand_init();
        platform_add_devices(stamp_devices, ARRAY_SIZE(stamp_devices));
        spi_register_board_info(bfin_spi_board_info, ARRAY_SIZE(bfin_spi_board_info));
 
-#if defined(CONFIG_PATA_PLATFORM) || defined(CONFIG_PATA_PLATFORM_MODULE)
-       irq_desc[PATA_INT].status |= IRQ_NOAUTOEN;
-#endif
-
        return 0;
 }
 
@@ -1187,7 +1735,7 @@ void native_machine_restart(char *cmd)
 {
        /* workaround reboot hang when booting from SPI */
        if ((bfin_read_SYSCR() & 0x7) == 0x3)
-               bfin_gpio_reset_spi0_ssel1();
+               bfin_reset_boot_spi_cs(P_DEFAULT_BOOT_SPI_CS);
 }
 
 /*