diff -urpN -X linux-2.6.20-rmk-16feb2007/Documentation/dontdiff linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/Kconfig linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/Kconfig --- linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/Kconfig 2007-02-16 17:18:36.000000000 +0000 +++ linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/Kconfig 2007-02-16 19:05:57.000000000 +0000 @@ -22,6 +22,16 @@ config SMDK2440_CPU2442 depends on ARCH_S3C2440 select CPU_S3C2442 +config MACH_RX1950 + bool "HP iPAQ rx1950" + depends on ARCH_S3C2410 + select CPU_S3C2442 + select PM_H1940 + help + Say Y here if you are using the HP iPAQ rx1950. + + See for more + information on this project endmenu diff -urpN -X linux-2.6.20-rmk-16feb2007/Documentation/dontdiff linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/Makefile linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/Makefile --- linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/Makefile 2007-02-16 17:18:36.000000000 +0000 +++ linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/Makefile 2007-02-16 19:17:40.000000000 +0000 @@ -14,3 +14,4 @@ obj-$(CONFIG_CPU_S3C2442) += clock.o # Machine support +obj-$(CONFIG_MACH_RX1950) += mach-rx1950.o diff -urpN -X linux-2.6.20-rmk-16feb2007/Documentation/dontdiff linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/mach-rx1950.c linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/mach-rx1950.c --- linux-2.6.20-rmk-16feb2007/arch/arm/mach-s3c2442/mach-rx1950.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.20-rmk-16feb2007-rx1950-1/arch/arm/mach-s3c2442/mach-rx1950.c 2007-02-16 19:17:58.000000000 +0000 @@ -0,0 +1,210 @@ +/* linux/arch/arm/mach-s3c2410/mach-rx1950.c + * + * Copyright (c) 2007 Simtec Electronics + * Ben Dooks + * Denis Grigoriev and Victor Chukhantsev + * + * 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 +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include + +static struct map_desc rx1950_iodesc[] __initdata = { + /* dump ISA space somewhere unused */ + { + .virtual = (u32)S3C24XX_VA_ISA_WORD, + .pfn = __phys_to_pfn(S3C2410_CS3), + .length = SZ_1M, + .type = MT_DEVICE, + }, { + .virtual = (u32)S3C24XX_VA_ISA_BYTE, + .pfn = __phys_to_pfn(S3C2410_CS3), + .length = SZ_1M, + .type = MT_DEVICE, + }, + }; + +#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK +#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB +#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE + +static struct s3c24xx_uart_clksrc rx1950_serial_clocks[] = { + [0] = { + .name = "fclk", + .divisor = 0x0a, + .min_baud = 0, + .max_baud = 0, + } +}; + + +static struct s3c2410_uartcfg rx1950_uartcfgs[] __initdata = { + [0] = { + .hwport = 0, + .flags = 0, + .ucon = 0x3c5, + .ulcon = 0x03, + .ufcon = 0x51, + .clocks = rx1950_serial_clocks, + .clocks_size = ARRAY_SIZE(rx1950_serial_clocks), + }, + [1] = { + .hwport = 1, + .flags = 0, + .ucon = 0x245, + .ulcon = 0x03, + .ufcon = 0x00, + }, + /* IR port */ + [2] = { + .hwport = 2, + .flags = 0, + .uart_flags = UPF_CONS_FLOW, + .ucon = 0x3c5, + .ulcon = 0x43, + .ufcon = 0x51, + } +}; + +/* LCD platform data */ + +static struct s3c2410fb_mach_info rx1950_lcdcfg __initdata = { + .fixed_syncs= 1, + .regs={ + .lcdcon1= S3C2410_LCDCON1_TFT16BPP | \ + S3C2410_LCDCON1_TFT | \ + S3C2410_LCDCON1_CLKVAL(0x0C), + + .lcdcon2= S3C2410_LCDCON2_VBPD(7) | \ + S3C2410_LCDCON2_LINEVAL(319) | \ + S3C2410_LCDCON2_VFPD(6) | \ + S3C2410_LCDCON2_VSPW(0), + + .lcdcon3= S3C2410_LCDCON3_HBPD(25) | \ + S3C2410_LCDCON3_HOZVAL(239) | \ + S3C2410_LCDCON3_HFPD(25), + + .lcdcon4= S3C2410_LCDCON4_MVAL(0) | \ + S3C2410_LCDCON4_HSPW(3), + + .lcdcon5= S3C2410_LCDCON5_FRM565 | \ + S3C2410_LCDCON5_INVVLINE | \ + S3C2410_LCDCON5_HWSWP, + }, + .lpcsel= 0x02, + + .width= 240, + .height= 320, + .xres= {240,240,240}, + .yres= {320,320,320}, + .bpp= {16,16,16}, +}; + +static struct mtd_partition rx1950_nand_part[] = { + [0] = { + .name = "Whole Flash", + .offset = 0, + .size = MTDPART_SIZ_FULL, + .mask_flags = MTD_WRITEABLE, + } +}; + +static struct s3c2410_nand_set rx1950_nand_sets[] = { + [0] = { + .name = "Internal", + .nr_chips = 1, + .nr_partitions = ARRAY_SIZE(rx1950_nand_part), + .partitions = rx1950_nand_part, + }, +}; + +static struct s3c2410_platform_nand rx1950_nand_info = { + .tacls = 25, + .twrph0 = 50, + .twrph1 = 15, + .nr_sets = ARRAY_SIZE(rx1950_nand_sets), + .sets = rx1950_nand_sets, +}; + +static struct platform_device *rx1950_devices[] __initdata = { + &s3c_device_usb, + &s3c_device_lcd, + &s3c_device_wdt, + &s3c_device_i2c, + &s3c_device_iis, + &s3c_device_rtc, + &s3c_device_nand, +}; + +static struct s3c24xx_board rx1950_board __initdata = { + .devices = rx1950_devices, + .devices_count = ARRAY_SIZE(rx1950_devices) +}; + +static void __init rx1950_map_io(void) +{ + s3c24xx_init_io(rx1950_iodesc, ARRAY_SIZE(rx1950_iodesc)); + s3c24xx_init_clocks(16934000); + s3c24xx_init_uarts(rx1950_uartcfgs, ARRAY_SIZE(rx1950_uartcfgs)); + s3c24xx_set_board(&rx1950_board); +} + +static void __init rx1950_init_irq(void) +{ + s3c24xx_init_irq(); +} + +static void __init rx1950_init_machine(void) +{ + printk("rx1950 init()\n"); + + s3c24xx_fb_set_platdata(&rx1950_lcdcfg); + s3c_device_nand.dev.platform_data = &rx1950_nand_info; +} + + +MACHINE_START(RX1950, "IPAQ-RX1950") + /* Maintainer: Ben Dooks */ + .phys_io = S3C2410_PA_UART, + .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, + .boot_params = S3C2410_SDRAM_PA + 0x100, + .map_io = rx1950_map_io, + .init_irq = rx1950_init_irq, + .init_machine = rx1950_init_machine, + .timer = &s3c24xx_timer, +MACHINE_END