arch/blackfin/mach-bf548/boards/ezkit.c

   1 /*
   2  * File:         arch/blackfin/mach-bf548/boards/ezkit.c
   3  * Based on:     arch/blackfin/mach-bf537/boards/ezkit.c
   4  * Author:       Aidan Williams <aidan@nicta.com.au>
   5  *
   6  * Created:
   7  * Description:
   8  *
   9  * Modified:
  10  *               Copyright 2005 National ICT Australia (NICTA)
  11  *               Copyright 2004-2007 Analog Devices Inc.
  12  *
  13  * Bugs:         Enter bugs at http://blackfin.uclinux.org/
  14  *
  15  * This program is free software; you can redistribute it and/or modify
  16  * it under the terms of the GNU General Public License as published by
  17  * the Free Software Foundation; either version 2 of the License, or
  18  * (at your option) any later version.
  19  *
  20  * This program is distributed in the hope that it will be useful,
  21  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  22  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  23  * GNU General Public License for more details.
  24  *
  25  * You should have received a copy of the GNU General Public License
  26  * along with this program; if not, see the file COPYING, or write
  27  * to the Free Software Foundation, Inc.,
  28  * 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  29  */
  30
  31 #include <linux/device.h>
  32 #include <linux/platform_device.h>
  33 #include <linux/mtd/mtd.h>
  34 #include <linux/mtd/partitions.h>
  35 #include <linux/mtd/physmap.h>
  36 #include <linux/spi/spi.h>
  37 #include <linux/spi/flash.h>
  38 #include <linux/irq.h>
  39 #include <linux/interrupt.h>
  40 #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
  41 #include <linux/usb/musb.h>
  42 #endif
  43 #include <asm/bfin5xx_spi.h>
  44 #include <asm/cplb.h>
  45 #include <asm/dma.h>
  46 #include <asm/gpio.h>
  47 #include <asm/nand.h>
  48 #include <asm/portmux.h>
  49 #include <asm/mach/bf54x_keys.h>
  50 #include <linux/input.h>
  51 #include <linux/spi/ad7877.h>
  52
  53 /*
  54  * Name the Board for the /proc/cpuinfo
  55  */
  56 const char bfin_board_name[] = "ADSP-BF548-EZKIT";
  57
  58 /*
  59  *  Driver needs to know address, irq and flag pin.
  60  */
  61
  62 #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
  63
  64 #include <asm/mach/bf54x-lq043.h>
  65
  66 static struct bfin_bf54xfb_mach_info bf54x_lq043_data = {
  67         .width =        480,
  68         .height =       272,
  69         .xres =         {480, 480, 480},
  70         .yres =         {272, 272, 272},
  71         .bpp =          {24, 24, 24},
  72         .disp =         GPIO_PE3,
  73 };
  74
  75 static struct resource bf54x_lq043_resources[] = {
  76         {
  77                 .start = IRQ_EPPI0_ERR,
  78                 .end = IRQ_EPPI0_ERR,
  79                 .flags = IORESOURCE_IRQ,
  80         },
  81 };
  82
  83 static struct platform_device bf54x_lq043_device = {
  84         .name           = "bf54x-lq043",
  85         .id             = -1,
  86         .num_resources  = ARRAY_SIZE(bf54x_lq043_resources),
  87         .resource       = bf54x_lq043_resources,
  88         .dev            = {
  89                 .platform_data = &bf54x_lq043_data,
  90         },
  91 };
  92 #endif
  93
  94 #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
  95 static const unsigned int bf548_keymap[] = {
  96         KEYVAL(0, 0, KEY_ENTER),
  97         KEYVAL(0, 1, KEY_HELP),
  98         KEYVAL(0, 2, KEY_0),
  99         KEYVAL(0, 3, KEY_BACKSPACE),
 100         KEYVAL(1, 0, KEY_TAB),
 101         KEYVAL(1, 1, KEY_9),
 102         KEYVAL(1, 2, KEY_8),
 103         KEYVAL(1, 3, KEY_7),
 104         KEYVAL(2, 0, KEY_DOWN),
 105         KEYVAL(2, 1, KEY_6),
 106         KEYVAL(2, 2, KEY_5),
 107         KEYVAL(2, 3, KEY_4),
 108         KEYVAL(3, 0, KEY_UP),
 109         KEYVAL(3, 1, KEY_3),
 110         KEYVAL(3, 2, KEY_2),
 111         KEYVAL(3, 3, KEY_1),
 112 };
 113
 114 static struct bfin_kpad_platform_data bf54x_kpad_data = {
 115         .rows                   = 4,
 116         .cols                   = 4,
 117         .keymap                 = bf548_keymap,
 118         .keymapsize             = ARRAY_SIZE(bf548_keymap),
 119         .repeat                 = 0,
 120         .debounce_time          = 5000, /* ns (5ms) */
 121         .coldrive_time          = 1000, /* ns (1ms) */
 122         .keyup_test_interval    = 50, /* ms (50ms) */
 123 };
 124
 125 static struct resource bf54x_kpad_resources[] = {
 126         {
 127                 .start = IRQ_KEY,
 128                 .end = IRQ_KEY,
 129                 .flags = IORESOURCE_IRQ,
 130         },
 131 };
 132
 133 static struct platform_device bf54x_kpad_device = {
 134         .name           = "bf54x-keys",
 135         .id             = -1,
 136         .num_resources  = ARRAY_SIZE(bf54x_kpad_resources),
 137         .resource       = bf54x_kpad_resources,
 138         .dev            = {
 139                 .platform_data = &bf54x_kpad_data,
 140         },
 141 };
 142 #endif
 143
 144 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
 145 static struct platform_device rtc_device = {
 146         .name = "rtc-bfin",
 147         .id   = -1,
 148 };
 149 #endif
 150
 151 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
 152 static struct resource bfin_uart_resources[] = {
 153 #ifdef CONFIG_SERIAL_BFIN_UART0
 154         {
 155                 .start = 0xFFC00400,
 156                 .end = 0xFFC004FF,
 157                 .flags = IORESOURCE_MEM,
 158         },
 159 #endif
 160 #ifdef CONFIG_SERIAL_BFIN_UART1
 161         {
 162                 .start = 0xFFC02000,
 163                 .end = 0xFFC020FF,
 164                 .flags = IORESOURCE_MEM,
 165         },
 166 #endif
 167 #ifdef CONFIG_SERIAL_BFIN_UART2
 168         {
 169                 .start = 0xFFC02100,
 170                 .end = 0xFFC021FF,
 171                 .flags = IORESOURCE_MEM,
 172         },
 173 #endif
 174 #ifdef CONFIG_SERIAL_BFIN_UART3
 175         {
 176                 .start = 0xFFC03100,
 177                 .end = 0xFFC031FF,
 178         },
 179 #endif
 180 };
 181
 182 static struct platform_device bfin_uart_device = {
 183         .name = "bfin-uart",
 184         .id = 1,
 185         .num_resources = ARRAY_SIZE(bfin_uart_resources),
 186         .resource = bfin_uart_resources,
 187 };
 188 #endif
 189
 190 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 191 static struct resource smsc911x_resources[] = {
 192         {
 193                 .name = "smsc911x-memory",
 194                 .start = 0x24000000,
 195                 .end = 0x24000000 + 0xFF,
 196                 .flags = IORESOURCE_MEM,
 197         },
 198         {
 199                 .start = IRQ_PE8,
 200                 .end = IRQ_PE8,
 201                 .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_LOWLEVEL,
 202         },
 203 };
 204 static struct platform_device smsc911x_device = {
 205         .name = "smsc911x",
 206         .id = 0,
 207         .num_resources = ARRAY_SIZE(smsc911x_resources),
 208         .resource = smsc911x_resources,
 209 };
 210 #endif
 211
 212 #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
 213 static struct resource musb_resources[] = {
 214         [0] = {
 215                 .start  = 0xFFC03C00,
 216                 .end    = 0xFFC040FF,
 217                 .flags  = IORESOURCE_MEM,
 218         },
 219         [1] = { /* general IRQ */
 220                 .start  = IRQ_USB_INT0,
 221                 .end    = IRQ_USB_INT0,
 222                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
 223         },
 224         [2] = { /* DMA IRQ */
 225                 .start  = IRQ_USB_DMA,
 226                 .end    = IRQ_USB_DMA,
 227                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHLEVEL,
 228         },
 229 };
 230
 231 static struct musb_hdrc_platform_data musb_plat = {
 232 #if defined(CONFIG_USB_MUSB_OTG)
 233         .mode           = MUSB_OTG,
 234 #elif defined(CONFIG_USB_MUSB_HDRC_HCD)
 235         .mode           = MUSB_HOST,
 236 #elif defined(CONFIG_USB_GADGET_MUSB_HDRC)
 237         .mode           = MUSB_PERIPHERAL,
 238 #endif
 239         .multipoint     = 0,
 240 };
 241
 242 static u64 musb_dmamask = ~(u32)0;
 243
 244 static struct platform_device musb_device = {
 245         .name           = "musb_hdrc",
 246         .id             = 0,
 247         .dev = {
 248                 .dma_mask               = &musb_dmamask,
 249                 .coherent_dma_mask      = 0xffffffff,
 250                 .platform_data          = &musb_plat,
 251         },
 252         .num_resources  = ARRAY_SIZE(musb_resources),
 253         .resource       = musb_resources,
 254 };
 255 #endif
 256
 257 #if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
 258 static struct resource bfin_atapi_resources[] = {
 259         {
 260                 .start = 0xFFC03800,
 261                 .end = 0xFFC0386F,
 262                 .flags = IORESOURCE_MEM,
 263         },
 264         {
 265                 .start = IRQ_ATAPI_ERR,
 266                 .end = IRQ_ATAPI_ERR,
 267                 .flags = IORESOURCE_IRQ,
 268         },
 269 };
 270
 271 static struct platform_device bfin_atapi_device = {
 272         .name = "pata-bf54x",
 273         .id = -1,
 274         .num_resources = ARRAY_SIZE(bfin_atapi_resources),
 275         .resource = bfin_atapi_resources,
 276 };
 277 #endif
 278
 279 #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
 280 static struct mtd_partition partition_info[] = {
 281         {
 282                 .name = "Linux Kernel",
 283                 .offset = 0,
 284                 .size = 4 * SIZE_1M,
 285         },
 286         {
 287                 .name = "File System",
 288 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 289                 .offset = 4 * SIZE_1M,
 290                 .size = (256 - 4) * SIZE_1M,
 291 =======
 292                 .offset = MTDPART_OFS_APPEND,
 293                 .size = MTDPART_SIZ_FULL,
 294 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 295         },
 296 };
 297
 298 static struct bf5xx_nand_platform bf5xx_nand_platform = {
 299         .page_size = NFC_PG_SIZE_256,
 300         .data_width = NFC_NWIDTH_8,
 301         .partitions = partition_info,
 302         .nr_partitions = ARRAY_SIZE(partition_info),
 303         .rd_dly = 3,
 304         .wr_dly = 3,
 305 };
 306
 307 static struct resource bf5xx_nand_resources[] = {
 308         {
 309                 .start = 0xFFC03B00,
 310                 .end = 0xFFC03B4F,
 311                 .flags = IORESOURCE_MEM,
 312         },
 313         {
 314                 .start = CH_NFC,
 315                 .end = CH_NFC,
 316                 .flags = IORESOURCE_IRQ,
 317         },
 318 };
 319
 320 static struct platform_device bf5xx_nand_device = {
 321         .name = "bf5xx-nand",
 322         .id = 0,
 323         .num_resources = ARRAY_SIZE(bf5xx_nand_resources),
 324         .resource = bf5xx_nand_resources,
 325         .dev = {
 326                 .platform_data = &bf5xx_nand_platform,
 327         },
 328 };
 329 #endif
 330
 331 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 332 #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)
 333 =======
 334 #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
 335 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 336 static struct platform_device bf54x_sdh_device = {
 337         .name = "bfin-sdh",
 338         .id = 0,
 339 };
 340 #endif
 341
 342 static struct mtd_partition ezkit_partitions[] = {
 343         {
 344                 .name       = "Bootloader",
 345 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 346                 .size       = 0x20000,
 347 =======
 348                 .size       = 0x40000,
 349 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 350                 .offset     = 0,
 351         }, {
 352                 .name       = "Kernel",
 353                 .size       = 0xE0000,
 354                 .offset     = MTDPART_OFS_APPEND,
 355         }, {
 356                 .name       = "RootFS",
 357                 .size       = MTDPART_SIZ_FULL,
 358                 .offset     = MTDPART_OFS_APPEND,
 359         }
 360 };
 361
 362 static struct physmap_flash_data ezkit_flash_data = {
 363         .width      = 2,
 364         .parts      = ezkit_partitions,
 365         .nr_parts   = ARRAY_SIZE(ezkit_partitions),
 366 };
 367
 368 static struct resource ezkit_flash_resource = {
 369         .start = 0x20000000,
 370         .end   = 0x20ffffff,
 371         .flags = IORESOURCE_MEM,
 372 };
 373
 374 static struct platform_device ezkit_flash_device = {
 375         .name          = "physmap-flash",
 376         .id            = 0,
 377         .dev = {
 378                 .platform_data = &ezkit_flash_data,
 379         },
 380         .num_resources = 1,
 381         .resource      = &ezkit_flash_resource,
 382 };
 383
 384 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
 385 /* all SPI peripherals info goes here */
 386 #if defined(CONFIG_MTD_M25P80) \
 387         || defined(CONFIG_MTD_M25P80_MODULE)
 388 /* SPI flash chip (m25p16) */
 389 static struct mtd_partition bfin_spi_flash_partitions[] = {
 390         {
 391                 .name = "bootloader",
 392                 .size = 0x00040000,
 393                 .offset = 0,
 394                 .mask_flags = MTD_CAP_ROM
 395         }, {
 396                 .name = "linux kernel",
 397 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 398                 .size = 0x1c0000,
 399                 .offset = 0x40000
 400 =======
 401                 .size = MTDPART_SIZ_FULL,
 402                 .offset = MTDPART_OFS_APPEND,
 403 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 404         }
 405 };
 406
 407 static struct flash_platform_data bfin_spi_flash_data = {
 408         .name = "m25p80",
 409         .parts = bfin_spi_flash_partitions,
 410         .nr_parts = ARRAY_SIZE(bfin_spi_flash_partitions),
 411         .type = "m25p16",
 412 };
 413
 414 static struct bfin5xx_spi_chip spi_flash_chip_info = {
 415         .enable_dma = 0,         /* use dma transfer with this chip*/
 416         .bits_per_word = 8,
 417         .cs_change_per_word = 0,
 418 };
 419 #endif
 420
 421 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 422 static struct bfin5xx_spi_chip spi_ad7877_chip_info = {
 423         .cs_change_per_word = 0,
 424         .enable_dma = 0,
 425         .bits_per_word = 16,
 426 };
 427
 428 static const struct ad7877_platform_data bfin_ad7877_ts_info = {
 429         .model                  = 7877,
 430         .vref_delay_usecs       = 50,   /* internal, no capacitor */
 431         .x_plate_ohms           = 419,
 432         .y_plate_ohms           = 486,
 433         .pressure_max           = 1000,
 434         .pressure_min           = 0,
 435         .stopacq_polarity       = 1,
 436         .first_conversion_delay = 3,
 437         .acquisition_time       = 1,
 438         .averaging              = 1,
 439         .pen_down_acc_interval  = 1,
 440 };
 441 #endif
 442
 443 #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
 444 static struct bfin5xx_spi_chip spidev_chip_info = {
 445         .enable_dma = 0,
 446         .bits_per_word = 8,
 447 };
 448 #endif
 449
 450 static struct spi_board_info bf54x_spi_board_info[] __initdata = {
 451 #if defined(CONFIG_MTD_M25P80) \
 452         || defined(CONFIG_MTD_M25P80_MODULE)
 453         {
 454                 /* the modalias must be the same as spi device driver name */
 455                 .modalias = "m25p80", /* Name of spi_driver for this device */
 456                 .max_speed_hz = 25000000,     /* max spi clock (SCK) speed in HZ */
 457                 .bus_num = 0, /* Framework bus number */
 458                 .chip_select = 1, /* SPI_SSEL1*/
 459                 .platform_data = &bfin_spi_flash_data,
 460                 .controller_data = &spi_flash_chip_info,
 461                 .mode = SPI_MODE_3,
 462         },
 463 #endif
 464 #if defined(CONFIG_TOUCHSCREEN_AD7877) || defined(CONFIG_TOUCHSCREEN_AD7877_MODULE)
 465 {
 466         .modalias               = "ad7877",
 467         .platform_data          = &bfin_ad7877_ts_info,
 468         .irq                    = IRQ_PJ11,
 469         .max_speed_hz           = 12500000,     /* max spi clock (SCK) speed in HZ */
 470         .bus_num                = 0,
 471         .chip_select            = 2,
 472         .controller_data = &spi_ad7877_chip_info,
 473 },
 474 #endif
 475 #if defined(CONFIG_SPI_SPIDEV) || defined(CONFIG_SPI_SPIDEV_MODULE)
 476         {
 477                 .modalias = "spidev",
 478                 .max_speed_hz = 3125000,     /* max spi clock (SCK) speed in HZ */
 479                 .bus_num = 0,
 480                 .chip_select = 1,
 481                 .controller_data = &spidev_chip_info,
 482         },
 483 #endif
 484 };
 485
 486 /* SPI (0) */
 487 static struct resource bfin_spi0_resource[] = {
 488         [0] = {
 489                 .start = SPI0_REGBASE,
 490                 .end   = SPI0_REGBASE + 0xFF,
 491                 .flags = IORESOURCE_MEM,
 492         },
 493         [1] = {
 494                 .start = CH_SPI0,
 495                 .end   = CH_SPI0,
 496                 .flags = IORESOURCE_IRQ,
 497         }
 498 };
 499
 500 /* SPI (1) */
 501 static struct resource bfin_spi1_resource[] = {
 502         [0] = {
 503                 .start = SPI1_REGBASE,
 504                 .end   = SPI1_REGBASE + 0xFF,
 505                 .flags = IORESOURCE_MEM,
 506         },
 507         [1] = {
 508                 .start = CH_SPI1,
 509                 .end   = CH_SPI1,
 510                 .flags = IORESOURCE_IRQ,
 511         }
 512 };
 513
 514 /* SPI controller data */
 515 static struct bfin5xx_spi_master bf54x_spi_master_info0 = {
 516         .num_chipselect = 8,
 517         .enable_dma = 1,  /* master has the ability to do dma transfer */
 518         .pin_req = {P_SPI0_SCK, P_SPI0_MISO, P_SPI0_MOSI, 0},
 519 };
 520
 521 static struct platform_device bf54x_spi_master0 = {
 522         .name = "bfin-spi",
 523         .id = 0, /* Bus number */
 524         .num_resources = ARRAY_SIZE(bfin_spi0_resource),
 525         .resource = bfin_spi0_resource,
 526         .dev = {
 527                 .platform_data = &bf54x_spi_master_info0, /* Passed to driver */
 528                 },
 529 };
 530
 531 static struct bfin5xx_spi_master bf54x_spi_master_info1 = {
 532         .num_chipselect = 8,
 533         .enable_dma = 1,  /* master has the ability to do dma transfer */
 534         .pin_req = {P_SPI1_SCK, P_SPI1_MISO, P_SPI1_MOSI, 0},
 535 };
 536
 537 static struct platform_device bf54x_spi_master1 = {
 538         .name = "bfin-spi",
 539         .id = 1, /* Bus number */
 540         .num_resources = ARRAY_SIZE(bfin_spi1_resource),
 541         .resource = bfin_spi1_resource,
 542         .dev = {
 543                 .platform_data = &bf54x_spi_master_info1, /* Passed to driver */
 544                 },
 545 };
 546 #endif  /* spi master and devices */
 547
 548 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
 549 static struct resource bfin_twi0_resource[] = {
 550         [0] = {
 551                 .start = TWI0_REGBASE,
 552                 .end   = TWI0_REGBASE + 0xFF,
 553                 .flags = IORESOURCE_MEM,
 554         },
 555         [1] = {
 556                 .start = IRQ_TWI0,
 557                 .end   = IRQ_TWI0,
 558                 .flags = IORESOURCE_IRQ,
 559         },
 560 };
 561
 562 static struct platform_device i2c_bfin_twi0_device = {
 563         .name = "i2c-bfin-twi",
 564         .id = 0,
 565         .num_resources = ARRAY_SIZE(bfin_twi0_resource),
 566         .resource = bfin_twi0_resource,
 567 };
 568
 569 #if !defined(CONFIG_BF542)      /* The BF542 only has 1 TWI */
 570 static struct resource bfin_twi1_resource[] = {
 571         [0] = {
 572                 .start = TWI1_REGBASE,
 573                 .end   = TWI1_REGBASE + 0xFF,
 574                 .flags = IORESOURCE_MEM,
 575         },
 576         [1] = {
 577                 .start = IRQ_TWI1,
 578                 .end   = IRQ_TWI1,
 579                 .flags = IORESOURCE_IRQ,
 580         },
 581 };
 582
 583 static struct platform_device i2c_bfin_twi1_device = {
 584         .name = "i2c-bfin-twi",
 585         .id = 1,
 586         .num_resources = ARRAY_SIZE(bfin_twi1_resource),
 587         .resource = bfin_twi1_resource,
 588 };
 589 #endif
 590 #endif
 591
 592 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 593 #include <linux/gpio_keys.h>
 594
 595 static struct gpio_keys_button bfin_gpio_keys_table[] = {
 596         {BTN_0, GPIO_PB8, 1, "gpio-keys: BTN0"},
 597         {BTN_1, GPIO_PB9, 1, "gpio-keys: BTN1"},
 598         {BTN_2, GPIO_PB10, 1, "gpio-keys: BTN2"},
 599         {BTN_3, GPIO_PB11, 1, "gpio-keys: BTN3"},
 600 };
 601
 602 static struct gpio_keys_platform_data bfin_gpio_keys_data = {
 603         .buttons        = bfin_gpio_keys_table,
 604         .nbuttons       = ARRAY_SIZE(bfin_gpio_keys_table),
 605 };
 606
 607 static struct platform_device bfin_device_gpiokeys = {
 608         .name      = "gpio-keys",
 609         .dev = {
 610                 .platform_data = &bfin_gpio_keys_data,
 611         },
 612 };
 613 #endif
 614
 615 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 616 =======
 617 static struct resource bfin_gpios_resources = {
 618         .start = 0,
 619         .end   = MAX_BLACKFIN_GPIOS - 1,
 620         .flags = IORESOURCE_IRQ,
 621 };
 622
 623 static struct platform_device bfin_gpios_device = {
 624         .name = "simple-gpio",
 625         .id = -1,
 626         .num_resources = 1,
 627         .resource = &bfin_gpios_resources,
 628 };
 629
 630 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 631 static struct platform_device *ezkit_devices[] __initdata = {
 632 #if defined(CONFIG_RTC_DRV_BFIN) || defined(CONFIG_RTC_DRV_BFIN_MODULE)
 633         &rtc_device,
 634 #endif
 635
 636 #if defined(CONFIG_SERIAL_BFIN) || defined(CONFIG_SERIAL_BFIN_MODULE)
 637         &bfin_uart_device,
 638 #endif
 639
 640 #if defined(CONFIG_FB_BF54X_LQ043) || defined(CONFIG_FB_BF54X_LQ043_MODULE)
 641         &bf54x_lq043_device,
 642 #endif
 643
 644 #if defined(CONFIG_SMSC911X) || defined(CONFIG_SMSC911X_MODULE)
 645         &smsc911x_device,
 646 #endif
 647
 648 #if defined(CONFIG_USB_MUSB_HDRC) || defined(CONFIG_USB_MUSB_HDRC_MODULE)
 649         &musb_device,
 650 #endif
 651
 652 #if defined(CONFIG_PATA_BF54X) || defined(CONFIG_PATA_BF54X_MODULE)
 653         &bfin_atapi_device,
 654 #endif
 655
 656 #if defined(CONFIG_MTD_NAND_BF5XX) || defined(CONFIG_MTD_NAND_BF5XX_MODULE)
 657         &bf5xx_nand_device,
 658 #endif
 659
 660 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 661 #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN)
 662 =======
 663 #if defined(CONFIG_SDH_BFIN) || defined(CONFIG_SDH_BFIN_MODULE)
 664 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 665         &bf54x_sdh_device,
 666 #endif
 667
 668 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
 669         &bf54x_spi_master0,
 670         &bf54x_spi_master1,
 671 #endif
 672
 673 #if defined(CONFIG_KEYBOARD_BFIN) || defined(CONFIG_KEYBOARD_BFIN_MODULE)
 674         &bf54x_kpad_device,
 675 #endif
 676
 677 #if defined(CONFIG_I2C_BLACKFIN_TWI) || defined(CONFIG_I2C_BLACKFIN_TWI_MODULE)
 678         &i2c_bfin_twi0_device,
 679 #if !defined(CONFIG_BF542)
 680         &i2c_bfin_twi1_device,
 681 #endif
 682 #endif
 683
 684 #if defined(CONFIG_KEYBOARD_GPIO) || defined(CONFIG_KEYBOARD_GPIO_MODULE)
 685         &bfin_device_gpiokeys,
 686 #endif
 687 <<<<<<< HEAD:arch/blackfin/mach-bf548/boards/ezkit.c
 688 =======
 689
 690         &bfin_gpios_device,
 691 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/blackfin/mach-bf548/boards/ezkit.c
 692         &ezkit_flash_device,
 693 };
 694
 695 static int __init ezkit_init(void)
 696 {
 697         printk(KERN_INFO "%s(): registering device resources\n", __FUNCTION__);
 698         platform_add_devices(ezkit_devices, ARRAY_SIZE(ezkit_devices));
 699
 700 #if defined(CONFIG_SPI_BFIN) || defined(CONFIG_SPI_BFIN_MODULE)
 701         spi_register_board_info(bf54x_spi_board_info,
 702                         ARRAY_SIZE(bf54x_spi_board_info));
 703 #endif
 704
 705         return 0;
 706 }
 707
 708 arch_initcall(ezkit_init);