Merge branch 'master' of /home/sam/kernel/linux-2.6/
[pandora-kernel.git] / arch / arm / mach-pxa / lubbock.c
index 9c6e77f..6a9a669 100644 (file)
 #include <linux/major.h>
 #include <linux/fb.h>
 #include <linux/interrupt.h>
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+
+#include <linux/spi/spi.h>
+#include <linux/spi/ads7846.h>
+#include <asm/arch/pxa2xx_spi.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
 #include <asm/mach-types.h>
 #include <asm/hardware.h>
 #include <asm/irq.h>
+#include <asm/sizes.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
 
 #include <asm/hardware/sa1111.h>
 
@@ -192,6 +200,78 @@ static struct resource smc91x_resources[] = {
        },
 };
 
+/* ADS7846 is connected through SSP ... and if your board has J5 populated,
+ * you can select it to replace the ucb1400 by switching the touchscreen cable
+ * (to J5) and poking board registers (as done below).  Else it's only useful
+ * for the temperature sensors.
+ */
+static struct resource pxa_ssp_resources[] = {
+       [0] = {
+               .start  = __PREG(SSCR0_P(1)),
+               .end    = __PREG(SSCR0_P(1)) + 0x14,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = IRQ_SSP,
+               .end    = IRQ_SSP,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct pxa2xx_spi_master pxa_ssp_master_info = {
+       .ssp_type       = PXA25x_SSP,
+       .clock_enable   = CKEN3_SSP,
+       .num_chipselect = 0,
+};
+
+static struct platform_device pxa_ssp = {
+       .name           = "pxa2xx-spi",
+       .id             = 1,
+       .resource       = pxa_ssp_resources,
+       .num_resources  = ARRAY_SIZE(pxa_ssp_resources),
+       .dev = {
+               .platform_data  = &pxa_ssp_master_info,
+       },
+};
+
+static int lubbock_ads7846_pendown_state(void)
+{
+       /* TS_BUSY is bit 8 in LUB_MISC_RD, but pendown is irq-only */
+       return 0;
+}
+
+static struct ads7846_platform_data ads_info = {
+       .model                  = 7846,
+       .vref_delay_usecs       = 100,          /* internal, no cap */
+       .get_pendown_state      = lubbock_ads7846_pendown_state,
+       // .x_plate_ohms                = 500,  /* GUESS! */
+       // .y_plate_ohms                = 500,  /* GUESS! */
+};
+
+static void ads7846_cs(u32 command)
+{
+       static const unsigned   TS_nCS = 1 << 11;
+       lubbock_set_misc_wr(TS_nCS, (command == PXA2XX_CS_ASSERT) ? 0 : TS_nCS);
+}
+
+static struct pxa2xx_spi_chip ads_hw = {
+       .tx_threshold           = 1,
+       .rx_threshold           = 2,
+       .cs_control             = ads7846_cs,
+};
+
+static struct spi_board_info spi_board_info[] __initdata = { {
+       .modalias       = "ads7846",
+       .platform_data  = &ads_info,
+       .controller_data = &ads_hw,
+       .irq            = LUBBOCK_BB_IRQ,
+       .max_speed_hz   = 120000 /* max sample rate at 3V */
+                               * 26 /* command + data + overhead */,
+       .bus_num        = 1,
+       .chip_select    = 0,
+},
+};
+
 static struct platform_device smc91x_device = {
        .name           = "smc91x",
        .id             = -1,
@@ -199,10 +279,76 @@ static struct platform_device smc91x_device = {
        .resource       = smc91x_resources,
 };
 
+static struct resource flash_resources[] = {
+       [0] = {
+               .start  = 0x00000000,
+               .end    = SZ_64M - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       [1] = {
+               .start  = 0x04000000,
+               .end    = 0x04000000 + SZ_64M - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+};
+
+static struct mtd_partition lubbock_partitions[] = {
+       {
+               .name =         "Bootloader",
+               .size =         0x00040000,
+               .offset =       0,
+               .mask_flags =   MTD_WRITEABLE  /* force read-only */
+       },{
+               .name =         "Kernel",
+               .size =         0x00100000,
+               .offset =       0x00040000,
+       },{
+               .name =         "Filesystem",
+               .size =         MTDPART_SIZ_FULL,
+               .offset =       0x00140000
+       }
+};
+
+static struct flash_platform_data lubbock_flash_data[2] = {
+       {
+               .map_name       = "cfi_probe",
+               .parts          = lubbock_partitions,
+               .nr_parts       = ARRAY_SIZE(lubbock_partitions),
+       }, {
+               .map_name       = "cfi_probe",
+               .parts          = NULL,
+               .nr_parts       = 0,
+       }
+};
+
+static struct platform_device lubbock_flash_device[2] = {
+       {
+               .name           = "pxa2xx-flash",
+               .id             = 0,
+               .dev = {
+                       .platform_data = &lubbock_flash_data[0],
+               },
+               .resource = &flash_resources[0],
+               .num_resources = 1,
+       },
+       {
+               .name           = "pxa2xx-flash",
+               .id             = 1,
+               .dev = {
+                       .platform_data = &lubbock_flash_data[1],
+               },
+               .resource = &flash_resources[1],
+               .num_resources = 1,
+       },
+};
+
 static struct platform_device *devices[] __initdata = {
        &sa1111_device,
        &lub_audio_device,
        &smc91x_device,
+       &lubbock_flash_device[0],
+       &lubbock_flash_device[1],
+       &pxa_ssp,
 };
 
 static struct pxafb_mach_info sharp_lm8v31 __initdata = {
@@ -273,7 +419,7 @@ static int lubbock_mci_init(struct device *dev,
        init_timer(&mmc_timer);
        mmc_timer.data = (unsigned long) data;
        return request_irq(LUBBOCK_SD_IRQ, lubbock_detect_int,
-                       SA_SAMPLE_RANDOM, "lubbock-sd-detect", data);
+                       IRQF_SAMPLE_RANDOM, "lubbock-sd-detect", data);
 }
 
 static int lubbock_mci_get_ro(struct device *dev)
@@ -315,11 +461,24 @@ static struct pxaficp_platform_data lubbock_ficp_platform_data = {
 
 static void __init lubbock_init(void)
 {
+       int flashboot = (LUB_CONF_SWITCHES & 1);
+
        pxa_set_udc_info(&udc_info);
        set_pxa_fb_info(&sharp_lm8v31);
        pxa_set_mci_info(&lubbock_mci_platform_data);
        pxa_set_ficp_info(&lubbock_ficp_platform_data);
+
+       lubbock_flash_data[0].width = lubbock_flash_data[1].width =
+               (BOOT_DEF & 1) ? 2 : 4;
+       /* Compensate for the nROMBT switch which swaps the flash banks */
+       printk(KERN_NOTICE "Lubbock configured to boot from %s (bank %d)\n",
+              flashboot?"Flash":"ROM", flashboot);
+
+       lubbock_flash_data[flashboot^1].name = "application-flash";
+       lubbock_flash_data[flashboot].name = "boot-rom";
        (void) platform_add_devices(devices, ARRAY_SIZE(devices));
+
+       spi_register_board_info(spi_board_info, ARRAY_SIZE(spi_board_info));
 }
 
 static struct map_desc lubbock_io_desc[] __initdata = {
@@ -336,6 +495,11 @@ static void __init lubbock_map_io(void)
        pxa_map_io();
        iotable_init(lubbock_io_desc, ARRAY_SIZE(lubbock_io_desc));
 
+       /* SSP data pins */
+       pxa_gpio_mode(GPIO23_SCLK_MD);
+       pxa_gpio_mode(GPIO25_STXD_MD);
+       pxa_gpio_mode(GPIO26_SRXD_MD);
+
        /* This enables the BTUART */
        pxa_gpio_mode(GPIO42_BTRXD_MD);
        pxa_gpio_mode(GPIO43_BTTXD_MD);
@@ -357,7 +521,6 @@ static void __init lubbock_map_io(void)
 
 MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
        /* Maintainer: MontaVista Software Inc. */
-       .phys_ram       = 0xa0000000,
        .phys_io        = 0x40000000,
        .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
        .map_io         = lubbock_map_io,