1 files changed, 70 insertions, 31 deletions

diff --git a/arch/arm/mach-pxa/magician.c b/arch/arm/mach-pxa/magician.c
index 21b821e1a60d..d46b36746be2 100644
--- a/arch/arm/mach-pxa/magician.c
+++ b/arch/arm/mach-pxa/magician.c
@@ -25,14 +25,14 @@
 #include <linux/mtd/physmap.h>
 #include <linux/pda_power.h>
 #include <linux/pwm_backlight.h>
+#include <linux/usb/gpio_vbus.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+
+#include <mach/pxa27x.h>
 #include <mach/magician.h>
-#include <mach/mfp-pxa27x.h>
-#include <mach/pxa-regs.h>
-#include <mach/pxa2xx-regs.h>
 #include <mach/pxafb.h>
 #include <mach/i2c.h>
 #include <mach/mmc.h>
@@ -66,6 +66,11 @@ static unsigned long magician_pin_config[] __initdata = {
         GPIO31_I2S_SYNC,
         GPIO113_I2S_SYSCLK,
 
+        /* SSP 1 */
+        GPIO23_SSP1_SCLK,
+        GPIO24_SSP1_SFRM,
+        GPIO25_SSP1_TXD,
+
         /* SSP 2 */
         GPIO19_SSP2_SCLK,
         GPIO14_SSP2_SFRM,
@@ -148,22 +153,31 @@ static struct pxaficp_platform_data magician_ficp_info = {
  * GPIO Keys
  */
 
+#define INIT_KEY(_code, _gpio, _desc)   \
+        {                               \
+                .code   = KEY_##_code,  \
+                .gpio   = _gpio,        \
+                .desc   = _desc,        \
+                .type   = EV_KEY,       \
+                .wakeup = 1,            \
+        }
+
 static struct gpio_keys_button magician_button_table[] = {
-        {KEY_POWER,      GPIO0_MAGICIAN_KEY_POWER,      0, "Power button"},
-        {KEY_ESC,        GPIO37_MAGICIAN_KEY_HANGUP,    0, "Hangup button"},
-        {KEY_F10,        GPIO38_MAGICIAN_KEY_CONTACTS,  0, "Contacts button"},
-        {KEY_CALENDAR,   GPIO90_MAGICIAN_KEY_CALENDAR,  0, "Calendar button"},
-        {KEY_CAMERA,     GPIO91_MAGICIAN_KEY_CAMERA,    0, "Camera button"},
-        {KEY_UP,         GPIO93_MAGICIAN_KEY_UP,        0, "Up button"},
-        {KEY_DOWN,       GPIO94_MAGICIAN_KEY_DOWN,      0, "Down button"},
-        {KEY_LEFT,       GPIO95_MAGICIAN_KEY_LEFT,      0, "Left button"},
-        {KEY_RIGHT,      GPIO96_MAGICIAN_KEY_RIGHT,     0, "Right button"},
-        {KEY_KPENTER,    GPIO97_MAGICIAN_KEY_ENTER,     0, "Action button"},
-        {KEY_RECORD,     GPIO98_MAGICIAN_KEY_RECORD,    0, "Record button"},
-        {KEY_VOLUMEUP,   GPIO100_MAGICIAN_KEY_VOL_UP,   0, "Volume up"},
-        {KEY_VOLUMEDOWN, GPIO101_MAGICIAN_KEY_VOL_DOWN, 0, "Volume down"},
-        {KEY_PHONE,      GPIO102_MAGICIAN_KEY_PHONE,    0, "Phone button"},
-        {KEY_PLAY,       GPIO99_MAGICIAN_HEADPHONE_IN,  0, "Headset button"},
+        INIT_KEY(POWER,      GPIO0_MAGICIAN_KEY_POWER,      "Power button"),
+        INIT_KEY(ESC,        GPIO37_MAGICIAN_KEY_HANGUP,    "Hangup button"),
+        INIT_KEY(F10,        GPIO38_MAGICIAN_KEY_CONTACTS,  "Contacts button"),
+        INIT_KEY(CALENDAR,   GPIO90_MAGICIAN_KEY_CALENDAR,  "Calendar button"),
+        INIT_KEY(CAMERA,     GPIO91_MAGICIAN_KEY_CAMERA,    "Camera button"),
+        INIT_KEY(UP,         GPIO93_MAGICIAN_KEY_UP,        "Up button"),
+        INIT_KEY(DOWN,       GPIO94_MAGICIAN_KEY_DOWN,      "Down button"),
+        INIT_KEY(LEFT,       GPIO95_MAGICIAN_KEY_LEFT,      "Left button"),
+        INIT_KEY(RIGHT,      GPIO96_MAGICIAN_KEY_RIGHT,     "Right button"),
+        INIT_KEY(KPENTER,    GPIO97_MAGICIAN_KEY_ENTER,     "Action button"),
+        INIT_KEY(RECORD,     GPIO98_MAGICIAN_KEY_RECORD,    "Record button"),
+        INIT_KEY(VOLUMEUP,   GPIO100_MAGICIAN_KEY_VOL_UP,   "Volume up"),
+        INIT_KEY(VOLUMEDOWN, GPIO101_MAGICIAN_KEY_VOL_DOWN, "Volume down"),
+        INIT_KEY(PHONE,      GPIO102_MAGICIAN_KEY_PHONE,    "Phone button"),
+        INIT_KEY(PLAY,       GPIO99_MAGICIAN_HEADPHONE_IN,  "Headset button"),
 };
 
 static struct gpio_keys_platform_data gpio_keys_data = {
@@ -189,7 +203,7 @@ static struct platform_device gpio_keys = {
 static struct resource egpio_resources[] = {
         [0] = {
                 .start = PXA_CS3_PHYS,
-                .end   = PXA_CS3_PHYS + 0x20,
+                .end   = PXA_CS3_PHYS + 0x20 - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -420,7 +434,7 @@ static struct gpio_led gpio_leds[] = {
         },
         {
                 .name = "magician::phone_bl",
-                .default_trigger = "none",
+                .default_trigger = "backlight",
                 .gpio = GPIO103_MAGICIAN_LED_KP,
         },
 };
@@ -468,8 +482,6 @@ static struct pasic3_led pasic3_leds[] = {
         },
 };
 
-static struct platform_device pasic3;
-
 static struct pasic3_leds_machinfo pasic3_leds_info = {
         .num_leds   = ARRAY_SIZE(pasic3_leds),
         .power_gpio = EGPIO_MAGICIAN_LED_POWER,
@@ -511,6 +523,31 @@ static struct platform_device pasic3 = {
 };
 
 /*
+ * USB "Transceiver"
+ */
+
+static struct resource gpio_vbus_resource = {
+        .flags = IORESOURCE_IRQ,
+        .start = IRQ_MAGICIAN_VBUS,
+        .end   = IRQ_MAGICIAN_VBUS,
+};
+
+static struct gpio_vbus_mach_info gpio_vbus_info = {
+        .gpio_pullup = GPIO27_MAGICIAN_USBC_PUEN,
+        .gpio_vbus   = EGPIO_MAGICIAN_CABLE_STATE_USB,
+};
+
+static struct platform_device gpio_vbus = {
+        .name          = "gpio-vbus",
+        .id            = -1,
+        .num_resources = 1,
+        .resource      = &gpio_vbus_resource,
+        .dev = {
+                .platform_data = &gpio_vbus_info,
+        },
+};
+
+/*
  * External power
  */
 
@@ -586,15 +623,17 @@ static struct pda_power_pdata power_supply_info = {
 static struct resource power_supply_resources[] = {
         [0] = {
                 .name  = "ac",
-                .flags = IORESOURCE_IRQ,
-                .start = IRQ_MAGICIAN_AC,
-                .end   = IRQ_MAGICIAN_AC,
+                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
+                         IORESOURCE_IRQ_LOWEDGE,
+                .start = IRQ_MAGICIAN_VBUS,
+                .end   = IRQ_MAGICIAN_VBUS,
         },
         [1] = {
                 .name  = "usb",
-                .flags = IORESOURCE_IRQ,
-                .start = IRQ_MAGICIAN_AC,
-                .end   = IRQ_MAGICIAN_AC,
+                .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE |
+                         IORESOURCE_IRQ_LOWEDGE,
+                .start = IRQ_MAGICIAN_VBUS,
+                .end   = IRQ_MAGICIAN_VBUS,
         },
 };
 
@@ -688,11 +727,9 @@ static void magician_set_vpp(struct map_info *map, int vpp)
         gpio_set_value(EGPIO_MAGICIAN_FLASH_VPP, vpp);
 }
 
-#define PXA_CS_SIZE             0x04000000
-
 static struct resource strataflash_resource = {
         .start = PXA_CS0_PHYS,
-        .end   = PXA_CS0_PHYS + PXA_CS_SIZE - 1,
+        .end   = PXA_CS0_PHYS + SZ_64M - 1,
         .flags = IORESOURCE_MEM,
 };
 
@@ -720,6 +757,7 @@ static struct platform_device *devices[] __initdata = {
         &egpio,
         &backlight,
         &pasic3,
+        &gpio_vbus,
         &power_supply,
         &strataflash,
         &leds_gpio,
@@ -743,6 +781,7 @@ static void __init magician_init(void)
                 gpio_direction_output(GPIO83_MAGICIAN_nIR_EN, 1);
                 pxa_set_ficp_info(&magician_ficp_info);
         }
+        pxa27x_set_i2c_power_info(NULL);
         pxa_set_i2c_info(NULL);
         pxa_set_mci_info(&magician_mci_info);
         pxa_set_ohci_info(&magician_ohci_info);