]> pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sun, 15 Mar 2009 10:10:13 +0000 (10:10 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sun, 15 Mar 2009 10:10:13 +0000 (10:10 +0000)
arch/arm/mach-pxa/Kconfig
arch/arm/mach-pxa/Makefile
arch/arm/mach-pxa/csb701.c [new file with mode: 0644]
arch/arm/mach-pxa/csb726.c [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/csb726.h [new file with mode: 0644]
arch/arm/mach-pxa/include/mach/gpio.h
arch/arm/mach-pxa/include/mach/uncompress.h
arch/arm/mach-pxa/mioa701.c

index 33214c1e0607feba250e8904f48edb29e61b9600..d13282d773aa2d4146b952e55a3464e2d06b4db8 100644 (file)
@@ -393,6 +393,18 @@ config PCM990_DISPLAY_NONE
 
 endchoice
 
+config MACH_CSB726
+       bool "Enable Cogent CSB726 System On a Module"
+       select PXA27x
+       select IWMMXT
+       help
+         Say Y here if you intend to run this kernel on a Cogent
+         CSB726 System On Module.
+
+config CSB726_CSB701
+       bool "Enable supprot for CSB701 baseboard"
+       depends on MACH_CSB726
+
 config PXA_EZX
        bool "Motorola EZX Platform"
        select PXA27x
index 361fcfa7531a347ae82d1ddae48a01bed71cc826..8da8e63d048b30be6bfd657e7b414f98af6c0cc6 100644 (file)
@@ -75,6 +75,8 @@ obj-$(CONFIG_MACH_CM_X300)      += cm-x300.o
 obj-$(CONFIG_PXA_EZX)           += ezx.o
 
 obj-$(CONFIG_MACH_INTELMOTE2)   += imote2.o
+obj-$(CONFIG_MACH_CSB726)      += csb726.o
+obj-$(CONFIG_CSB726_CSB701)    += csb701.o
 
 # Support for blinky lights
 led-y := leds.o
diff --git a/arch/arm/mach-pxa/csb701.c b/arch/arm/mach-pxa/csb701.c
new file mode 100644 (file)
index 0000000..4a2a295
--- /dev/null
@@ -0,0 +1,61 @@
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
+#include <linux/leds.h>
+
+static struct gpio_keys_button csb701_buttons[] = {
+       {
+               .code   = 0x7,
+               .gpio   = 1,
+               .active_low = 1,
+               .desc   = "SW2",
+               .type   = EV_SW,
+               .wakeup = 1,
+       },
+};
+
+static struct gpio_keys_platform_data csb701_gpio_keys_data = {
+       .buttons = csb701_buttons,
+       .nbuttons = ARRAY_SIZE(csb701_buttons),
+};
+
+static struct gpio_led csb701_leds[] = {
+       {
+               .name   = "csb701:yellow:heartbeat",
+               .default_trigger = "heartbeat",
+               .gpio   = 11,
+               .active_low = 1,
+       },
+};
+
+static struct platform_device csb701_gpio_keys = {
+       .name           = "gpio-keys",
+       .id             = -1,
+       .dev.platform_data = &csb701_gpio_keys_data,
+};
+
+static struct gpio_led_platform_data csb701_leds_gpio_data = {
+       .leds           = csb701_leds,
+       .num_leds       = ARRAY_SIZE(csb701_leds),
+};
+
+static struct platform_device csb701_leds_gpio = {
+       .name           = "leds-gpio",
+       .id             = -1,
+       .dev.platform_data = &csb701_leds_gpio_data,
+};
+
+static struct platform_device *devices[] __initdata = {
+       &csb701_gpio_keys,
+       &csb701_leds_gpio,
+};
+
+static int __init csb701_init(void)
+{
+       return platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+module_init(csb701_init);
+
diff --git a/arch/arm/mach-pxa/csb726.c b/arch/arm/mach-pxa/csb726.c
new file mode 100644 (file)
index 0000000..2b289f8
--- /dev/null
@@ -0,0 +1,318 @@
+/*
+ *  Support for Cogent CSB726
+ *
+ *  Copyright (c) 2008 Dmitry Eremin-Solenikov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/gpio.h>
+#include <linux/platform_device.h>
+#include <linux/mtd/physmap.h>
+#include <linux/mtd/partitions.h>
+#include <linux/sm501.h>
+
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <mach/csb726.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/i2c.h>
+#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/pxa2xx-regs.h>
+
+#include "generic.h"
+#include "devices.h"
+
+/*
+ * n/a: 2, 5, 6, 7, 8, 23, 24, 25, 26, 27, 87, 88, 89,
+ * nu: 58 -- 77, 90, 91, 93, 102, 105-108, 114-116,
+ * XXX: 21,
+ * XXX: 79 CS_3 for LAN9215 or PSKTSEL on R2, R3
+ * XXX: 33 CS_5 for LAN9215 on R1
+ */
+
+static unsigned long csb726_pin_config[] = {
+       GPIO78_nCS_2, /* EXP_CS */
+       GPIO79_nCS_3, /* SMSC9215 */
+       GPIO80_nCS_4, /* SM501 */
+
+       GPIO52_GPIO, /* #SMSC9251 int */
+       GPIO53_GPIO, /* SM501 int */
+
+       GPIO1_GPIO, /* GPIO0 */
+       GPIO11_GPIO, /* GPIO1 */
+       GPIO9_GPIO, /* GPIO2 */
+       GPIO10_GPIO, /* GPIO3 */
+       GPIO16_PWM0_OUT, /* or GPIO4 */
+       GPIO17_PWM1_OUT, /* or GPIO5 */
+       GPIO94_GPIO, /* GPIO6 */
+       GPIO95_GPIO, /* GPIO7 */
+       GPIO96_GPIO, /* GPIO8 */
+       GPIO97_GPIO, /* GPIO9 */
+       GPIO15_GPIO, /* EXP_IRQ */
+       GPIO18_RDY, /* EXP_WAIT */
+
+       GPIO0_GPIO, /* PWR_INT */
+       GPIO104_GPIO, /* PWR_OFF */
+
+       GPIO12_GPIO, /* touch irq */
+
+       GPIO13_SSP2_TXD,
+       GPIO14_SSP2_SFRM,
+       MFP_CFG_OUT(GPIO19, AF1, DRIVE_LOW),/* SSP2_SYSCLK */
+       GPIO22_SSP2_SCLK,
+
+       GPIO81_SSP3_TXD,
+       GPIO82_SSP3_RXD,
+       GPIO83_SSP3_SFRM,
+       GPIO84_SSP3_SCLK,
+
+       GPIO20_GPIO, /* SDIO int */
+       GPIO32_MMC_CLK,
+       GPIO92_MMC_DAT_0,
+       GPIO109_MMC_DAT_1,
+       GPIO110_MMC_DAT_2,
+       GPIO111_MMC_DAT_3,
+       GPIO112_MMC_CMD,
+       GPIO100_GPIO, /* SD CD */
+       GPIO101_GPIO, /* SD WP */
+
+       GPIO28_AC97_BITCLK,
+       GPIO29_AC97_SDATA_IN_0,
+       GPIO30_AC97_SDATA_OUT,
+       GPIO31_AC97_SYNC,
+       GPIO113_AC97_nRESET,
+
+       GPIO34_FFUART_RXD,
+       GPIO35_FFUART_CTS,
+       GPIO36_FFUART_DCD,
+       GPIO37_FFUART_DSR,
+       GPIO38_FFUART_RI,
+       GPIO39_FFUART_TXD,
+       GPIO40_FFUART_DTR,
+       GPIO41_FFUART_RTS,
+
+       GPIO42_BTUART_RXD,
+       GPIO43_BTUART_TXD,
+       GPIO44_BTUART_CTS,
+       GPIO45_BTUART_RTS,
+
+       GPIO46_STUART_RXD,
+       GPIO47_STUART_TXD,
+
+       GPIO48_nPOE,
+       GPIO49_nPWE,
+       GPIO50_nPIOR,
+       GPIO51_nPIOW,
+       GPIO54_nPCE_2,
+       GPIO55_nPREG,
+       GPIO56_nPWAIT,
+       GPIO57_nIOIS16, /* maybe unused */
+       GPIO85_nPCE_1,
+       GPIO98_GPIO, /* CF IRQ */
+       GPIO99_GPIO, /* CF CD */
+       GPIO103_GPIO, /* Reset */
+
+       GPIO117_I2C_SCL,
+       GPIO118_I2C_SDA,
+};
+
+static struct pxamci_platform_data csb726_mci_data;
+
+static int csb726_mci_init(struct device *dev,
+               irq_handler_t detect, void *data)
+{
+       int err;
+
+       csb726_mci_data.detect_delay = msecs_to_jiffies(500);
+
+       err = gpio_request(CSB726_GPIO_MMC_DETECT, "MMC detect");
+       if (err)
+               goto err_det_req;
+
+       err = gpio_direction_input(CSB726_GPIO_MMC_DETECT);
+       if (err)
+               goto err_det_dir;
+
+       err = gpio_request(CSB726_GPIO_MMC_RO, "MMC ro");
+       if (err)
+               goto err_ro_req;
+
+       err = gpio_direction_input(CSB726_GPIO_MMC_RO);
+       if (err)
+               goto err_ro_dir;
+
+       err = request_irq(gpio_to_irq(CSB726_GPIO_MMC_DETECT), detect,
+                       IRQF_DISABLED, "MMC card detect", data);
+       if (err)
+               goto err_irq;
+
+       return 0;
+
+err_irq:
+err_ro_dir:
+       gpio_free(CSB726_GPIO_MMC_RO);
+err_ro_req:
+err_det_dir:
+       gpio_free(CSB726_GPIO_MMC_DETECT);
+err_det_req:
+       return err;
+}
+
+static int csb726_mci_get_ro(struct device *dev)
+{
+       return gpio_get_value(CSB726_GPIO_MMC_RO);
+}
+
+static void csb726_mci_exit(struct device *dev, void *data)
+{
+       free_irq(gpio_to_irq(CSB726_GPIO_MMC_DETECT), data);
+       gpio_free(CSB726_GPIO_MMC_RO);
+       gpio_free(CSB726_GPIO_MMC_DETECT);
+}
+
+static struct pxamci_platform_data csb726_mci = {
+       .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
+       .init           = csb726_mci_init,
+       .get_ro         = csb726_mci_get_ro,
+       /* FIXME setpower */
+       .exit           = csb726_mci_exit,
+};
+
+static struct pxaohci_platform_data csb726_ohci_platform_data = {
+       .port_mode      = PMM_NPS_MODE,
+       .flags          = ENABLE_PORT1 | NO_OC_PROTECTION,
+};
+
+static struct mtd_partition csb726_flash_partitions[] = {
+       {
+               .name           = "Bootloader",
+               .offset         = 0,
+               .size           = CSB726_FLASH_uMON,
+               .mask_flags     = MTD_WRITEABLE  /* force read-only */
+       },
+       {
+               .name           = "root",
+               .offset         = MTDPART_OFS_APPEND,
+               .size           = MTDPART_SIZ_FULL,
+       }
+};
+
+static struct physmap_flash_data csb726_flash_data = {
+       .width          = 2,
+       .parts          = csb726_flash_partitions,
+       .nr_parts       = ARRAY_SIZE(csb726_flash_partitions),
+};
+
+static struct resource csb726_flash_resources[] = {
+       {
+               .start          = PXA_CS0_PHYS,
+               .end            = PXA_CS0_PHYS + CSB726_FLASH_SIZE - 1 ,
+               .flags          = IORESOURCE_MEM,
+       }
+};
+
+static struct platform_device csb726_flash = {
+       .name           = "physmap-flash",
+       .dev            = {
+               .platform_data  = &csb726_flash_data,
+       },
+       .resource       = csb726_flash_resources,
+       .num_resources  = ARRAY_SIZE(csb726_flash_resources),
+};
+
+static struct resource csb726_sm501_resources[] = {
+       {
+               .start          = PXA_CS4_PHYS,
+               .end            = PXA_CS4_PHYS + SZ_8M - 1,
+               .flags          = IORESOURCE_MEM,
+               .name           = "sm501-localmem",
+       },
+       {
+               .start          = PXA_CS4_PHYS + SZ_64M - SZ_2M,
+               .end            = PXA_CS4_PHYS + SZ_64M - 1,
+               .flags          = IORESOURCE_MEM,
+               .name           = "sm501-regs",
+       },
+       {
+               .start          = CSB726_IRQ_SM501,
+               .end            = CSB726_IRQ_SM501,
+               .flags          = IORESOURCE_IRQ,
+       },
+};
+
+static struct sm501_initdata csb726_sm501_initdata = {
+/*     .devices        = SM501_USE_USB_HOST, */
+       .devices        = SM501_USE_USB_HOST | SM501_USE_UART0 | SM501_USE_UART1,
+};
+
+static struct sm501_platdata csb726_sm501_platdata = {
+       .init           = &csb726_sm501_initdata,
+};
+
+static struct platform_device csb726_sm501 = {
+       .name           = "sm501",
+       .id             = 0,
+       .num_resources  = ARRAY_SIZE(csb726_sm501_resources),
+       .resource       = csb726_sm501_resources,
+       .dev            = {
+               .platform_data = &csb726_sm501_platdata,
+       },
+};
+
+static struct resource csb726_lan_resources[] = {
+       {
+               .start  = PXA_CS3_PHYS,
+               .end    = PXA_CS3_PHYS + SZ_64K - 1,
+               .flags  = IORESOURCE_MEM,
+       },
+       {
+               .start  = CSB726_IRQ_LAN,
+               .end    = CSB726_IRQ_LAN,
+               .flags  = IORESOURCE_IRQ,
+       },
+};
+
+static struct platform_device csb726_lan = {
+       .name           = "smc911x",
+       .id             = -1,
+       .num_resources  = ARRAY_SIZE(csb726_lan_resources),
+       .resource       = csb726_lan_resources,
+};
+
+static struct platform_device *devices[] __initdata = {
+       &csb726_flash,
+       &csb726_sm501,
+       &csb726_lan,
+};
+
+static void __init csb726_init(void)
+{
+       pxa2xx_mfp_config(ARRAY_AND_SIZE(csb726_pin_config));
+/*     MSC1 = 0x7ffc3ffc; *//* LAN9215/EXP_CS */
+/*     MSC2 = 0x06697ff4; *//* none/SM501 */
+       MSC2 = (MSC2 & ~0xffff) | 0x7ff4; /* SM501 */
+
+       pxa_set_i2c_info(NULL);
+       pxa27x_set_i2c_power_info(NULL);
+       pxa_set_mci_info(&csb726_mci);
+       pxa_set_ohci_info(&csb726_ohci_platform_data);
+
+       platform_add_devices(devices, ARRAY_SIZE(devices));
+}
+
+MACHINE_START(CSB726, "Cogent CSB726")
+       .phys_io        = 0x40000000,
+       .boot_params    = 0xa0000100,
+       .io_pg_offst    = (io_p2v(0x40000000) >> 18) & 0xfffc,
+       .map_io         = pxa_map_io,
+       .init_irq       = pxa27x_init_irq,
+       .init_machine   = csb726_init,
+       .timer          = &pxa_timer,
+MACHINE_END
diff --git a/arch/arm/mach-pxa/include/mach/csb726.h b/arch/arm/mach-pxa/include/mach/csb726.h
new file mode 100644 (file)
index 0000000..747ab1a
--- /dev/null
@@ -0,0 +1,26 @@
+/*
+ *  Support for Cogent CSB726
+ *
+ *  Copyright (c) 2008 Dmitry Baryshkov
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 2 as
+ *  published by the Free Software Foundation.
+ *
+ */
+#ifndef CSB726_H
+#define CSB726_H
+
+#define CSB726_GPIO_IRQ_LAN    52
+#define CSB726_GPIO_IRQ_SM501  53
+#define CSB726_GPIO_MMC_DETECT 100
+#define CSB726_GPIO_MMC_RO     101
+
+#define CSB726_FLASH_SIZE      (64 * 1024 * 1024)
+#define CSB726_FLASH_uMON      (8 * 1024 * 1024)
+
+#define CSB726_IRQ_LAN         gpio_to_irq(CSB726_GPIO_IRQ_LAN)
+#define CSB726_IRQ_SM501       gpio_to_irq(CSB726_GPIO_IRQ_SM501)
+
+#endif
+
index 406fa102cb4099152f1a7f30f74cb00535d56185..c72c89a2285e4582c8b587bcacefac01b0831e60 100644 (file)
@@ -30,7 +30,7 @@
 
 #define GPIO_REGS_VIRT io_p2v(0x40E00000)
 
-#define BANK_OFF(n)    (((n) > 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
+#define BANK_OFF(n)    (((n) < 3) ? (n) << 2 : 0x100 + (((n) - 3) << 2))
 #define GPIO_REG(x)    (*(volatile u32 *)(GPIO_REGS_VIRT + (x)))
 
 /* GPIO Pin Level Registers */
index f4b029c039571c622a62d9e3a017480c89ce2fc2..5706cea95d1188e69a1788cb92c5422a7375badd 100644 (file)
@@ -35,7 +35,8 @@ static inline void flush(void)
 
 static inline void arch_decomp_setup(void)
 {
-       if (machine_is_littleton() || machine_is_intelmote2())
+       if (machine_is_littleton() || machine_is_intelmote2()
+                       || machine_is_csb726())
                UART = STUART;
 }
 
index e77c95ca67f0ae702ed50464dcfb70a3466f4b54..025772785d362a978fc428c7a5a5aa0c2763d63d 100644 (file)
@@ -36,6 +36,7 @@
 #include <linux/power_supply.h>
 #include <linux/wm97xx_batt.h>
 #include <linux/mtd/physmap.h>
+#include <linux/usb/gpio_vbus.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -412,21 +413,6 @@ static void gsm_exit(void)
 /*
  * USB UDC
  */
-static void udc_power_command(int cmd)
-{
-       switch (cmd) {
-       case PXA2XX_UDC_CMD_DISCONNECT:
-               gpio_set_value(GPIO22_USB_ENABLE, 0);
-               break;
-       case PXA2XX_UDC_CMD_CONNECT:
-               gpio_set_value(GPIO22_USB_ENABLE, 1);
-               break;
-       default:
-               printk(KERN_INFO "udc_control: unknown command (0x%x)!\n", cmd);
-               break;
-       }
-}
-
 static int is_usb_connected(void)
 {
        return !gpio_get_value(GPIO13_nUSB_DETECT);
@@ -434,24 +420,15 @@ static int is_usb_connected(void)
 
 static struct pxa2xx_udc_mach_info mioa701_udc_info = {
        .udc_is_connected = is_usb_connected,
-       .udc_command      = udc_power_command,
+       .gpio_pullup      = GPIO22_USB_ENABLE,
 };
 
-struct gpio_ress udc_gpios[] = {
-       MIO_GPIO_OUT(GPIO22_USB_ENABLE, 0, "USB Vbus enable")
+struct gpio_vbus_mach_info gpio_vbus_data = {
+       .gpio_vbus = GPIO13_nUSB_DETECT,
+       .gpio_vbus_inverted = 1,
+       .gpio_pullup = -1,
 };
 
-static int __init udc_init(void)
-{
-       pxa_set_udc_info(&mioa701_udc_info);
-       return mio_gpio_request(ARRAY_AND_SIZE(udc_gpios));
-}
-
-static void udc_exit(void)
-{
-       mio_gpio_free(ARRAY_AND_SIZE(udc_gpios));
-}
-
 /*
  * SDIO/MMC Card controller
  */
@@ -790,6 +767,7 @@ MIO_SIMPLE_DEV(pxa2xx_ac97,   "pxa2xx-ac97",    NULL)
 MIO_PARENT_DEV(mio_wm9713_codec,  "wm9713-codec",   &pxa2xx_ac97.dev, NULL)
 MIO_SIMPLE_DEV(mioa701_sound,    "mioa701-wm9713", NULL)
 MIO_SIMPLE_DEV(mioa701_board,    "mioa701-board",  NULL)
+MIO_SIMPLE_DEV(gpio_vbus,        "gpio-vbus",      &gpio_vbus_data);
 
 static struct platform_device *devices[] __initdata = {
        &mioa701_gpio_keys,
@@ -801,7 +779,8 @@ static struct platform_device *devices[] __initdata = {
        &mioa701_sound,
        &power_dev,
        &strataflash,
-       &mioa701_board
+       &gpio_vbus,
+       &mioa701_board,
 };
 
 static void mioa701_machine_exit(void);
@@ -838,7 +817,7 @@ static void __init mioa701_machine_init(void)
        pxa_set_mci_info(&mioa701_mci_info);
        pxa_set_keypad_info(&mioa701_keypad_info);
        wm97xx_bat_set_pdata(&mioa701_battery_data);
-       udc_init();
+       pxa_set_udc_info(&mioa701_udc_info);
        pm_power_off = mioa701_poweroff;
        arm_pm_restart = mioa701_restart;
        platform_add_devices(devices, ARRAY_SIZE(devices));
@@ -851,7 +830,6 @@ static void __init mioa701_machine_init(void)
 
 static void mioa701_machine_exit(void)
 {
-       udc_exit();
        bootstrap_exit();
        gsm_exit();
 }