[ARM] 3854/2: S3C2410 - add machine type for AML M5900 series (resubmitted)

Add the AML M5900 series to the list of supported machines in the
arch/arm/mach-s3c2410 directory. This ensures the core peripherals
are registered, and the timer source is configured. if selected in
the kernel config the framebuffer registers and mtd partition
information are set.  This version of the patch has corrected
formatting and removed the legacy procfs directory entry.

Signed-off-by: David Anders <danders@amltd.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

3 files changed, 253 insertions, 0 deletions

diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index 40bfef006c0c..458b36b2353b 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -2,6 +2,13 @@ if ARCH_S3C2410
 
 menu "S3C24XX Implementations"
 
+config MACH_AML_M5900
+        bool "AML M5900 Series"
+        select CPU_S3C2410
+        help
+           Say Y here if you are using the American Microsystems M5900 Series
+           <http://www.amltd.com>
+
 config MACH_ANUBIS
         bool "Simtec Electronics ANUBIS"
         select CPU_S3C2440
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 788f25417d69..94aef371a529 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -71,6 +71,7 @@ obj-y				+= $(obj-dma-y)
 
 # machine specific support
 
+obj-$(CONFIG_MACH_AML_M5900)    += mach-amlm5900.o
 obj-$(CONFIG_MACH_ANUBIS)       += mach-anubis.o
 obj-$(CONFIG_MACH_OSIRIS)       += mach-osiris.o
 obj-$(CONFIG_ARCH_BAST)         += mach-bast.o usb-simtec.o
diff --git a/arch/arm/mach-s3c2410/mach-amlm5900.c b/arch/arm/mach-s3c2410/mach-amlm5900.c
new file mode 100644
index 000000000000..0c9b7dafbe90
--- /dev/null
+++ b/arch/arm/mach-s3c2410/mach-amlm5900.c
@@ -0,0 +1,245 @@
+/***********************************************************************
+ *
+ * linux/arch/arm/mach-s3c2410/mach-amlm5900.c
+ *
+ * Copyright (c) 2006 American Microsystems Limited
+ *      David Anders <danders@amltd.com>
+
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ * @History:
+ * derived from linux/arch/arm/mach-s3c2410/mach-bast.c, written by
+ * Ben Dooks <ben@simtec.co.uk>
+ *
+ ***********************************************************************/
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/device.h>
+#include <linux/platform_device.h>
+#include <linux/proc_fs.h>
+
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+#include <asm/mach/flash.h>
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+#include <asm/arch/fb.h>
+
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/regs-gpio.h>
+
+#include "devs.h"
+#include "cpu.h"
+
+#ifdef CONFIG_MTD_PARTITIONS
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
+#include <linux/mtd/map.h>
+#include <linux/mtd/physmap.h>
+
+static struct resource amlm5900_nor_resource = {
+                .start = 0x00000000,
+                .end   = 0x01000000 - 1,
+                .flags = IORESOURCE_MEM,
+};
+
+
+
+static struct mtd_partition amlm5900_mtd_partitions[] = {
+        {
+                .name           = "System",
+                .size           = 0x240000,
+                .offset         = 0,
+                .mask_flags     = MTD_WRITEABLE,  /* force read-only */
+        }, {
+                .name           = "Kernel",
+                .size           = 0x100000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "Ramdisk",
+                .size           = 0x300000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "JFFS2",
+                .size           = 0x9A0000,
+                .offset         = MTDPART_OFS_APPEND,
+        }, {
+                .name           = "Settings",
+                .size           = MTDPART_SIZ_FULL,
+                .offset         = MTDPART_OFS_APPEND,
+        }
+};
+
+static struct physmap_flash_data amlm5900_flash_data = {
+        .width          = 2,
+        .parts          = amlm5900_mtd_partitions,
+        .nr_parts       = ARRAY_SIZE(amlm5900_mtd_partitions),
+};
+
+static struct platform_device amlm5900_device_nor = {
+        .name           = "physmap-flash",
+        .id             = 0,
+        .dev = {
+                        .platform_data = &amlm5900_flash_data,
+                },
+        .num_resources  = 1,
+        .resource       = &amlm5900_nor_resource,
+};
+#endif
+
+static struct map_desc amlm5900_iodesc[] __initdata = {
+        {
+                .virtual        = (u32)S3C24XX_VA_SPI,
+                .pfn            = __phys_to_pfn(S3C2410_PA_SPI),
+                .length         = SZ_1M,
+                .type           = MT_DEVICE
+        }
+};
+
+#define UCON S3C2410_UCON_DEFAULT
+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+
+static struct s3c2410_uartcfg amlm5900_uartcfgs[] = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [1] = {
+                .hwport      = 1,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        },
+        [2] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+        }
+};
+
+
+static struct platform_device *amlm5900_devices[] __initdata = {
+#ifdef CONFIG_FB_S3C2410
+        &s3c_device_lcd,
+#endif
+        &s3c_device_adc,
+        &s3c_device_wdt,
+        &s3c_device_i2c,
+        &s3c_device_usb,
+        &s3c_device_rtc,
+        &s3c_device_usbgadget,
+        &s3c_device_sdi,
+#ifdef CONFIG_MTD_PARTITIONS
+        &amlm5900_device_nor,
+#endif
+};
+
+static struct s3c24xx_board amlm5900_board __initdata = {
+        .devices       = amlm5900_devices,
+        .devices_count = ARRAY_SIZE(amlm5900_devices)
+};
+
+void __init amlm5900_map_io(void)
+{
+        s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));
+        s3c24xx_init_clocks(0);
+        s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));
+        s3c24xx_set_board(&amlm5900_board);
+}
+
+#ifdef CONFIG_FB_S3C2410
+static struct s3c2410fb_mach_info __initdata amlm5900_lcd_info = {
+        .width          = 160,
+        .height         = 160,
+
+/* commented out until stn patch is submitted
+*       .type           = S3C2410_LCDCON1_STN4,
+*/
+        .gpccon =       0xaaaaaaaa,
+        .gpccon_mask =  0xffffffff,
+        .gpcup =        0x0000ffff,
+        .gpcup_mask =   0xffffffff,
+
+        .gpdcon =       0xaaaaaaaa,
+        .gpdcon_mask =  0xffffffff,
+        .gpdup =        0x0000ffff,
+        .gpdup_mask =   0xffffffff,
+
+        .xres           = {
+                .min            = 160,
+                .max            = 160,
+                .defval         = 160,
+        },
+
+        .yres           = {
+                .min            = 160,
+                .max            = 160,
+                .defval         = 160,
+        },
+
+        .bpp            = {
+                .min            = 4,
+                .max            = 4,
+                .defval         = 4,
+        },
+
+        .regs           = {
+                .lcdcon1        = 0x00008225,
+                .lcdcon2        = 0x0027c000,
+                .lcdcon3        = 0x00182708,
+                .lcdcon4        = 0x00000002,
+                .lcdcon5        = 0x00000001,
+        }
+};
+#endif
+
+static void __init amlm5900_init(void)
+{
+
+#ifdef CONFIG_FB_S3C2410
+        s3c24xx_fb_set_platdata(&amlm5900_lcd_info);
+#endif
+
+}
+
+MACHINE_START(AML_M5900, "AML_M5900")
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = amlm5900_map_io,
+        .init_irq       = s3c24xx_init_irq,
+        .init_machine   = amlm5900_init,
+        .timer          = &s3c24xx_timer,
+MACHINE_END