1 files changed, 62 insertions, 234 deletions

diff --git a/arch/arm/mach-sa1100/assabet.c b/arch/arm/mach-sa1100/assabet.c
index 9a23739f702..26257df19b6 100644
--- a/arch/arm/mach-sa1100/assabet.c
+++ b/arch/arm/mach-sa1100/assabet.c
@@ -14,20 +14,15 @@
 #include <linux/module.h>
 #include <linux/errno.h>
 #include <linux/ioport.h>
-#include <linux/platform_data/sa11x0-serial.h>
 #include <linux/serial_core.h>
-#include <linux/mfd/ucb1x00.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/delay.h>
 #include <linux/mm.h>
-#include <linux/leds.h>
-#include <linux/slab.h>
-
-#include <video/sa1100fb.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
+#include <asm/irq.h>
 #include <asm/setup.h>
 #include <asm/page.h>
 #include <asm/pgtable-hwdef.h>
@@ -38,20 +33,20 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/irda.h>
 #include <asm/mach/map.h>
+#include <asm/mach/serial_sa1100.h>
 #include <mach/assabet.h>
-#include <linux/platform_data/mfd-mcp-sa11x0.h>
-#include <mach/irqs.h>
+#include <mach/mcp.h>
 
 #include "generic.h"
 
 #define ASSABET_BCR_DB1110 \
-        (ASSABET_BCR_SPK_OFF    | \
+        (ASSABET_BCR_SPK_OFF    | ASSABET_BCR_QMUTE     | \
          ASSABET_BCR_LED_GREEN  | ASSABET_BCR_LED_RED   | \
          ASSABET_BCR_RS232EN    | ASSABET_BCR_LCD_12RGB | \
          ASSABET_BCR_IRDA_MD0)
 
 #define ASSABET_BCR_DB1111 \
-        (ASSABET_BCR_SPK_OFF    | \
+        (ASSABET_BCR_SPK_OFF    | ASSABET_BCR_QMUTE     | \
          ASSABET_BCR_LED_GREEN  | ASSABET_BCR_LED_RED   | \
          ASSABET_BCR_RS232EN    | ASSABET_BCR_LCD_12RGB | \
          ASSABET_BCR_CF_BUS_OFF | ASSABET_BCR_STEREO_LB | \
@@ -74,10 +69,31 @@ void ASSABET_BCR_frob(unsigned int mask, unsigned int val)
 
 EXPORT_SYMBOL(ASSABET_BCR_frob);
 
-static void assabet_ucb1x00_reset(enum ucb1x00_reset state)
+static void assabet_backlight_power(int on)
 {
-        if (state == UCB_RST_PROBE)
-                ASSABET_BCR_set(ASSABET_BCR_CODEC_RST);
+#ifndef ASSABET_PAL_VIDEO
+        if (on)
+                ASSABET_BCR_set(ASSABET_BCR_LIGHT_ON);
+        else
+#endif
+                ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);
+}
+
+/*
+ * Turn on/off the backlight.  When turning the backlight on,
+ * we wait 500us after turning it on so we don't cause the
+ * supplies to droop when we enable the LCD controller (and
+ * cause a hard reset.)
+ */
+static void assabet_lcd_power(int on)
+{
+#ifndef ASSABET_PAL_VIDEO
+        if (on) {
+                ASSABET_BCR_set(ASSABET_BCR_LCD_ON);
+                udelay(500);
+        } else
+#endif
+                ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);
 }
 
 
@@ -136,8 +152,15 @@ static struct flash_platform_data assabet_flash_data = {
 };
 
 static struct resource assabet_flash_resources[] = {
-        DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_32M),
-        DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_32M),
+        {
+                .start  = SA1100_CS0_PHYS,
+                .end    = SA1100_CS0_PHYS + SZ_32M - 1,
+                .flags  = IORESOURCE_MEM,
+        }, {
+                .start  = SA1100_CS1_PHYS,
+                .end    = SA1100_CS1_PHYS + SZ_32M - 1,
+                .flags  = IORESOURCE_MEM,
+        }
 };
 
 
@@ -176,126 +199,18 @@ static struct irda_platform_data assabet_irda_data = {
         .set_speed      = assabet_irda_set_speed,
 };
 
-static struct ucb1x00_plat_data assabet_ucb1x00_data = {
-        .reset          = assabet_ucb1x00_reset,
-        .gpio_base      = -1,
-};
-
 static struct mcp_plat_data assabet_mcp_data = {
         .mccr0          = MCCR0_ADM,
         .sclk_rate      = 11981000,
-        .codec_pdata    = &assabet_ucb1x00_data,
 };
 
-static void assabet_lcd_set_visual(u32 visual)
-{
-        u_int is_true_color = visual == FB_VISUAL_TRUECOLOR;
-
-        if (machine_is_assabet()) {
-#if 1           // phase 4 or newer Assabet's
-                if (is_true_color)
-                        ASSABET_BCR_set(ASSABET_BCR_LCD_12RGB);
-                else
-                        ASSABET_BCR_clear(ASSABET_BCR_LCD_12RGB);
-#else
-                // older Assabet's
-                if (is_true_color)
-                        ASSABET_BCR_clear(ASSABET_BCR_LCD_12RGB);
-                else
-                        ASSABET_BCR_set(ASSABET_BCR_LCD_12RGB);
-#endif
-        }
-}
-
-#ifndef ASSABET_PAL_VIDEO
-static void assabet_lcd_backlight_power(int on)
-{
-        if (on)
-                ASSABET_BCR_set(ASSABET_BCR_LIGHT_ON);
-        else
-                ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);
-}
-
-/*
- * Turn on/off the backlight.  When turning the backlight on, we wait
- * 500us after turning it on so we don't cause the supplies to droop
- * when we enable the LCD controller (and cause a hard reset.)
- */
-static void assabet_lcd_power(int on)
-{
-        if (on) {
-                ASSABET_BCR_set(ASSABET_BCR_LCD_ON);
-                udelay(500);
-        } else
-                ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);
-}
-
-/*
- * The assabet uses a sharp LQ039Q2DS54 LCD module.  It is actually
- * takes an RGB666 signal, but we provide it with an RGB565 signal
- * instead (def_rgb_16).
- */
-static struct sa1100fb_mach_info lq039q2ds54_info = {
-        .pixclock       = 171521,       .bpp            = 16,
-        .xres           = 320,          .yres           = 240,
-
-        .hsync_len      = 5,            .vsync_len      = 1,
-        .left_margin    = 61,           .upper_margin   = 3,
-        .right_margin   = 9,            .lower_margin   = 0,
-
-        .sync           = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
-
-        .lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
-        .lccr3          = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(2),
-
-        .backlight_power = assabet_lcd_backlight_power,
-        .lcd_power = assabet_lcd_power,
-        .set_visual = assabet_lcd_set_visual,
-};
-#else
-static void assabet_pal_backlight_power(int on)
-{
-        ASSABET_BCR_clear(ASSABET_BCR_LIGHT_ON);
-}
-
-static void assabet_pal_power(int on)
-{
-        ASSABET_BCR_clear(ASSABET_BCR_LCD_ON);
-}
-
-static struct sa1100fb_mach_info pal_info = {
-        .pixclock       = 67797,        .bpp            = 16,
-        .xres           = 640,          .yres           = 512,
-
-        .hsync_len      = 64,           .vsync_len      = 6,
-        .left_margin    = 125,          .upper_margin   = 70,
-        .right_margin   = 115,          .lower_margin   = 36,
-
-        .lccr0          = LCCR0_Color | LCCR0_Sngl | LCCR0_Act,
-        .lccr3          = LCCR3_OutEnH | LCCR3_PixRsEdg | LCCR3_ACBsDiv(512),
-
-        .backlight_power = assabet_pal_backlight_power,
-        .lcd_power = assabet_pal_power,
-        .set_visual = assabet_lcd_set_visual,
-};
-#endif
-
-#ifdef CONFIG_ASSABET_NEPONSET
-static struct resource neponset_resources[] = {
-        DEFINE_RES_MEM(0x10000000, 0x08000000),
-        DEFINE_RES_MEM(0x18000000, 0x04000000),
-        DEFINE_RES_MEM(0x40000000, SZ_8K),
-        DEFINE_RES_IRQ(IRQ_GPIO25),
-};
-#endif
-
 static void __init assabet_init(void)
 {
         /*
          * Ensure that the power supply is in "high power" mode.
          */
-        GPSR = GPIO_GPIO16;
         GPDR |= GPIO_GPIO16;
+        GPSR = GPIO_GPIO16;
 
         /*
          * Ensure that these pins are set as outputs and are driving
@@ -303,16 +218,8 @@ static void __init assabet_init(void)
          * the WS latch in the CPLD, and we don't float causing
          * excessive power drain.  --rmk
          */
-        GPCR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM;
         GPDR |= GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM;
-
-        /*
-         * Also set GPIO27 as an output; this is used to clock UART3
-         * via the FPGA and as otherwise has no pullups or pulldowns,
-         * so stop it floating.
-         */
-        GPCR = GPIO_GPIO27;
-        GPDR |= GPIO_GPIO27;
+        GPCR = GPIO_SSP_TXD | GPIO_SSP_SCLK | GPIO_SSP_SFRM;
 
         /*
          * Set up registers for sleep mode.
@@ -324,7 +231,8 @@ static void __init assabet_init(void)
         PPDR |= PPC_TXD3 | PPC_TXD1;
         PPSR |= PPC_TXD3 | PPC_TXD1;
 
-        sa11x0_ppc_configure_mcp();
+        sa1100fb_lcd_power = assabet_lcd_power;
+        sa1100fb_backlight_power = assabet_backlight_power;
 
         if (machine_has_neponset()) {
                 /*
@@ -338,17 +246,9 @@ static void __init assabet_init(void)
 #ifndef CONFIG_ASSABET_NEPONSET
                 printk( "Warning: Neponset detected but full support "
                         "hasn't been configured in the kernel\n" );
-#else
-                platform_device_register_simple("neponset", 0,
-                        neponset_resources, ARRAY_SIZE(neponset_resources));
 #endif
         }
 
-#ifndef ASSABET_PAL_VIDEO
-        sa11x0_register_lcd(&lq039q2ds54_info);
-#else
-        sa11x0_register_lcd(&pal_video);
-#endif
         sa11x0_register_mtd(&assabet_flash_data, assabet_flash_resources,
                             ARRAY_SIZE(assabet_flash_resources));
         sa11x0_register_irda(&assabet_irda_data);
@@ -364,11 +264,11 @@ static void __init assabet_init(void)
 static void __init map_sa1100_gpio_regs( void )
 {
         unsigned long phys = __PREG(GPLR) & PMD_MASK;
-        unsigned long virt = (unsigned long)io_p2v(phys);
+        unsigned long virt = io_p2v(phys);
         int prot = PMD_TYPE_SECT | PMD_SECT_AP_WRITE | PMD_DOMAIN(DOMAIN_IO);
         pmd_t *pmd;
 
-        pmd = pmd_offset(pud_offset(pgd_offset_k(virt), virt), virt);
+        pmd = pmd_offset(pgd_offset_k(virt), virt);
         *pmd = __pmd(phys | prot);
         flush_pmd_entry(pmd);
 }
@@ -388,7 +288,7 @@ static void __init map_sa1100_gpio_regs( void )
  */
 static void __init get_assabet_scr(void)
 {
-        unsigned long uninitialized_var(scr), i;
+        unsigned long scr, i;
 
         GPDR |= 0x3fc;                  /* Configure GPIO 9:2 as outputs */
         GPSR = 0x3fc;                   /* Write 0xFF to GPIO 9:2 */
@@ -401,7 +301,8 @@ static void __init get_assabet_scr(void)
 }
 
 static void __init
-fixup_assabet(struct tag *tags, char **cmdline, struct meminfo *mi)
+fixup_assabet(struct machine_desc *desc, struct tag *tags,
+              char **cmdline, struct meminfo *mi)
 {
         /* This must be done before any call to machine_has_neponset() */
         map_sa1100_gpio_regs();
@@ -512,8 +413,21 @@ static void __init assabet_map_io(void)
          */
         Ser1SDCR0 |= SDCR0_SUS;
 
-        if (!machine_has_neponset())
+        if (machine_has_neponset()) {
+#ifdef CONFIG_ASSABET_NEPONSET
+                extern void neponset_map_io(void);
+
+                /*
+                 * We map Neponset registers even if it isn't present since
+                 * many drivers will try to probe their stuff (and fail).
+                 * This is still more friendly than a kernel paging request
+                 * crash.
+                 */
+                neponset_map_io();
+#endif
+        } else {
                 sa1100_register_uart_fns(&assabet_port_fns);
+        }
 
         /*
          * When Neponset is attached, the first UART should be
@@ -531,101 +445,15 @@ static void __init assabet_map_io(void)
         sa1100_register_uart(2, 3);
 }
 
-/* LEDs */
-#if defined(CONFIG_NEW_LEDS) && defined(CONFIG_LEDS_CLASS)
-struct assabet_led {
-        struct led_classdev cdev;
-        u32 mask;
-};
-
-/*
- * The triggers lines up below will only be used if the
- * LED triggers are compiled in.
- */
-static const struct {
-        const char *name;
-        const char *trigger;
-} assabet_leds[] = {
-        { "assabet:red", "cpu0",},
-        { "assabet:green", "heartbeat", },
-};
-
-/*
- * The LED control in Assabet is reversed:
- *  - setting bit means turn off LED
- *  - clearing bit means turn on LED
- */
-static void assabet_led_set(struct led_classdev *cdev,
-                enum led_brightness b)
-{
-        struct assabet_led *led = container_of(cdev,
-                        struct assabet_led, cdev);
-
-        if (b != LED_OFF)
-                ASSABET_BCR_clear(led->mask);
-        else
-                ASSABET_BCR_set(led->mask);
-}
-
-static enum led_brightness assabet_led_get(struct led_classdev *cdev)
-{
-        struct assabet_led *led = container_of(cdev,
-                        struct assabet_led, cdev);
-
-        return (ASSABET_BCR & led->mask) ? LED_OFF : LED_FULL;
-}
-
-static int __init assabet_leds_init(void)
-{
-        int i;
-
-        if (!machine_is_assabet())
-                return -ENODEV;
-
-        for (i = 0; i < ARRAY_SIZE(assabet_leds); i++) {
-                struct assabet_led *led;
-
-                led = kzalloc(sizeof(*led), GFP_KERNEL);
-                if (!led)
-                        break;
-
-                led->cdev.name = assabet_leds[i].name;
-                led->cdev.brightness_set = assabet_led_set;
-                led->cdev.brightness_get = assabet_led_get;
-                led->cdev.default_trigger = assabet_leds[i].trigger;
-
-                if (!i)
-                        led->mask = ASSABET_BCR_LED_RED;
-                else
-                        led->mask = ASSABET_BCR_LED_GREEN;
-
-                if (led_classdev_register(NULL, &led->cdev) < 0) {
-                        kfree(led);
-                        break;
-                }
-        }
-
-        return 0;
-}
-
-/*
- * Since we may have triggers on any subsystem, defer registration
- * until after subsystem_init.
- */
-fs_initcall(assabet_leds_init);
-#endif
 
 MACHINE_START(ASSABET, "Intel-Assabet")
-        .atag_offset    = 0x100,
+        .boot_params    = 0xc0000100,
         .fixup          = fixup_assabet,
         .map_io         = assabet_map_io,
-        .nr_irqs        = SA1100_NR_IRQS,
         .init_irq       = sa1100_init_irq,
         .timer          = &sa1100_timer,
         .init_machine   = assabet_init,
-        .init_late      = sa11x0_init_late,
 #ifdef CONFIG_SA1111
         .dma_zone_size  = SZ_1M,
 #endif
-        .restart        = sa11x0_restart,
 MACHINE_END