diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/Documentation/arm/Samsung-S3C24XX/Overview.txt linux-2.6.17-rc1-s3c2442-3/Documentation/arm/Samsung-S3C24XX/Overview.txt --- linux-2.6.17-rc1-uartupd2/Documentation/arm/Samsung-S3C24XX/Overview.txt 2006-04-03 13:03:29.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/Documentation/arm/Samsung-S3C24XX/Overview.txt 2006-04-11 01:49:39.000000000 +0100 @@ -12,6 +12,17 @@ Introduction Support for the S3C2400 series is in progress. + The S3C2442 range of CPUs are also being included into the port + for full release soon. + + +Overview +-------- + + Given the number of CPUs in the S3C24XX family, the architecture + name of S3C2410 is now being used to cover the entire range as well + as specific support for the S3C2410 itself. + Configuration ------------- @@ -45,7 +56,11 @@ Machines Samsung/Meritech SMDK2440 - The S3C2440 compatible version of the SMDK2440 + The S3C2440 compatible version of the SMDK2410 + + Samsung/Meritech SMDK2442 + + The S3C2442 compatible version of the SMDK2440 Thorcom VR1000 @@ -227,7 +242,7 @@ Document Changes 09 Sep 2005 - BJD - Added section on platform data 11 Feb 2006 - BJD - Added I2C, RTC and Watchdog sections 11 Feb 2006 - BJD - Added Osiris machine, and S3C2400 information - + 11 Apr 2006 - BJD - Added S3C2442, and overview Document Author --------------- diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/Documentation/arm/Samsung-S3C24XX/SMDK2442.txt linux-2.6.17-rc1-s3c2442-3/Documentation/arm/Samsung-S3C24XX/SMDK2442.txt --- linux-2.6.17-rc1-uartupd2/Documentation/arm/Samsung-S3C24XX/SMDK2442.txt 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/Documentation/arm/Samsung-S3C24XX/SMDK2442.txt 2006-04-11 01:46:28.000000000 +0100 @@ -0,0 +1,33 @@ + Samsung/Meritech SMDK2442 + ========================= + +Introduction +------------ + + The SMDK2442 is a two part evaluation board for the Samsung S3C2442 + processor, consiting of an S3C2442 mezzanine board, and an SMDK2440 + basedboard. + + It includes support for LCD, SmartMedia, Audio, SD and 10MBit Ethernet, + and expansion headers for various signals, including the camera and + GPIO. + + +Support +------- + + This board is close to the SMDK2440. For more information, see the + Docuentation/arm/Samsung/SMDK2440.txt + + +Maintainers +----------- + + This board is being maintained by Ben Dooks, for more info, see + http://www.fluff.org/ben/smdk2440/ + + Many thanks to Steven Ryu of Samsung for the loan of the SMDK2442, + and to Simtec Electronics for allowing me time to work on this. + + +(c) 2006 Ben Dooks \ No newline at end of file diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/Kconfig linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/Kconfig --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/Kconfig 2006-04-03 13:03:30.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/Kconfig 2006-04-18 18:13:29.000000000 +0100 @@ -70,6 +70,17 @@ config ARCH_S3C2440 help Say Y here if you are using the SMDK2440. +config SMDK2440_CPU2440 + bool "SMDK2440 with S3C2440 cpu module" + depends on ARCH_S3C2440 + select CPU_S3C2440 + +config SMDK2440_CPU2442 + bool "SMDM2440 with S3C2442 cpu module" + depends on ARCH_S3C2440 + select CPU_S3C2442 + + config MACH_VR1000 bool "Thorcom VR1000" select CPU_S3C2410 @@ -109,12 +120,26 @@ config CPU_S3C2410 Support for S3C2410 and S3C2410A family from the S3C24XX line of Samsung Mobile CPUs. +config CPU_S3C244X + bool + depends on ARCH_S3C2410 && (CPU_S3C2440 || CPU_S3C2442) + help + Support for S3C2440 and S3C2442 Samsung Mobile CPU based systems. + config CPU_S3C2440 bool depends on ARCH_S3C2410 + select CPU_S3C244X help Support for S3C2440 Samsung Mobile CPU based systems. +config CPU_S3C2442 + bool + depends on ARCH_S3C2420 + select CPU_S3C244X + help + Support for S3C2442 Samsung Mobile CPU based systems. + comment "S3C2410 Boot" config S3C2410_BOOT_WATCHDOG diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/Makefile linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/Makefile --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/Makefile 2006-04-03 13:03:30.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/Makefile 2006-04-11 00:16:14.000000000 +0100 @@ -24,6 +24,11 @@ obj-$(CONFIG_S3C2410_DMA) += dma.o obj-$(CONFIG_PM) += pm.o sleep.o obj-$(CONFIG_PM_SIMTEC) += pm-simtec.o +# S3C244X support + +obj-$(CONFIG_CPU_S3C244X) += s3c244x.o +obj-$(CONFIG_CPU_S3C244X) += s3c244x-irq.o + # S3C2440 support obj-$(CONFIG_CPU_S3C2440) += s3c2440.o s3c2440-dsc.o @@ -31,6 +36,11 @@ obj-$(CONFIG_CPU_S3C2440) += s3c2440-ir obj-$(CONFIG_CPU_S3C2440) += s3c2440-clock.o obj-$(CONFIG_CPU_S3C2440) += s3c2410-gpio.o +# S3C2442 support + +obj-$(CONFIG_CPU_S3C2442) += s3c2442.o +obj-$(CONFIG_CPU_S3C2442) += s3c2442-clock.o + # bast extras obj-$(CONFIG_BAST_PC104_IRQ) += bast-irq.o diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/clock.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/clock.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/clock.c 2006-04-03 13:03:30.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/clock.c 2006-04-11 01:21:38.000000000 +0100 @@ -70,7 +70,7 @@ void inline s3c24xx_clk_enable(unsigned clkcon &= ~clocks; /* ensure none of the special function bits set */ - clkcon &= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER); + clkcon &= ~(S3C2410_CLKCON_IDLE|S3C2410_CLKCON_POWER | 3); __raw_writel(clkcon, S3C2410_CLKCON); } diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/common-smdk.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/common-smdk.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/common-smdk.c 2006-04-03 13:03:30.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/common-smdk.c 2006-04-12 08:07:32.000000000 +0100 @@ -34,12 +34,73 @@ #include #include +#include #include #include "devs.h" #include "pm.h" +/* LED devices */ + +static struct s3c24xx_led_platdata smdk_pdata_led4 = { + .gpio = S3C2410_GPF4, + .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, + .name = "led4", + .def_trigger = "timer", +}; + +static struct s3c24xx_led_platdata smdk_pdata_led5 = { + .gpio = S3C2410_GPF5, + .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, + .name = "led5", + .def_trigger = "nand-disk", +}; + +static struct s3c24xx_led_platdata smdk_pdata_led6 = { + .gpio = S3C2410_GPF6, + .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, + .name = "led6", +}; + +static struct s3c24xx_led_platdata smdk_pdata_led7 = { + .gpio = S3C2410_GPF7, + .flags = S3C24XX_LEDF_ACTLOW | S3C24XX_LEDF_TRISTATE, + .name = "led7", +}; + +static struct platform_device smdk_led4 = { + .name = "s3c24xx_led", + .id = 0, + .dev = { + .platform_data = &smdk_pdata_led4, + }, +}; + +static struct platform_device smdk_led5 = { + .name = "s3c24xx_led", + .id = 1, + .dev = { + .platform_data = &smdk_pdata_led5, + }, +}; + +static struct platform_device smdk_led6 = { + .name = "s3c24xx_led", + .id = 2, + .dev = { + .platform_data = &smdk_pdata_led6, + }, +}; + +static struct platform_device smdk_led7 = { + .name = "s3c24xx_led", + .id = 3, + .dev = { + .platform_data = &smdk_pdata_led7, + }, +}; + /* NAND parititon from 2.4.18-swl5 */ static struct mtd_partition smdk_default_nand_part[] = { @@ -106,10 +167,12 @@ static struct s3c2410_platform_nand smdk .sets = smdk_nand_sets, }; -/* devices we initialise */ - static struct platform_device __initdata *smdk_devs[] = { &s3c_device_nand, + &smdk_led4, + &smdk_led5, + &smdk_led6, + &smdk_led7, }; void __init smdk_machine_init(void) diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/cpu.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/cpu.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/cpu.c 2006-04-12 07:44:40.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/cpu.c 2006-04-11 01:31:03.000000000 +0100 @@ -44,7 +44,9 @@ #include "clock.h" #include "s3c2400.h" #include "s3c2410.h" +#include "s3c244x.h" #include "s3c2440.h" +#include "s3c2442.h" struct cpu_table { unsigned long idcode; @@ -61,6 +63,7 @@ struct cpu_table { static const char name_s3c2400[] = "S3C2400"; static const char name_s3c2410[] = "S3C2410"; static const char name_s3c2440[] = "S3C2440"; +static const char name_s3c2442[] = "S3C2442"; static const char name_s3c2410a[] = "S3C2410A"; static const char name_s3c2440a[] = "S3C2440A"; @@ -86,22 +89,31 @@ static struct cpu_table cpu_ids[] __init { .idcode = 0x32440000, .idmask = 0xffffffff, - .map_io = s3c2440_map_io, - .init_clocks = s3c2440_init_clocks, - .init_uarts = s3c2440_init_uarts, + .map_io = s3c244x_map_io, + .init_clocks = s3c244x_init_clocks, + .init_uarts = s3c244x_init_uarts, .init = s3c2440_init, .name = name_s3c2440 }, { .idcode = 0x32440001, .idmask = 0xffffffff, - .map_io = s3c2440_map_io, - .init_clocks = s3c2440_init_clocks, - .init_uarts = s3c2440_init_uarts, + .map_io = s3c244x_map_io, + .init_clocks = s3c244x_init_clocks, + .init_uarts = s3c244x_init_uarts, .init = s3c2440_init, .name = name_s3c2440a }, { + .idcode = 0x32440aaa, + .idmask = 0xffffffff, + .map_io = s3c244x_map_io, + .init_clocks = s3c244x_init_clocks, + .init_uarts = s3c244x_init_uarts, + .init = s3c2442_init, + .name = name_s3c2442 + }, + { .idcode = 0x0, /* S3C2400 doesn't have an idcode */ .idmask = 0xffffffff, .map_io = s3c2400_map_io, diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/cpu.h linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/cpu.h --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/cpu.h 2006-04-10 23:13:36.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/cpu.h 2006-04-10 23:37:57.000000000 +0100 @@ -74,3 +74,4 @@ extern struct sys_timer s3c24xx_timer; /* system device classes */ extern struct sysdev_class s3c2440_sysclass; +extern struct sysdev_class s3c2442_sysclass; diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/mach-smdk2440.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/mach-smdk2440.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/mach-smdk2440.c 2006-04-10 14:43:48.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/mach-smdk2440.c 2006-04-12 07:56:59.000000000 +0100 @@ -36,6 +36,7 @@ #include #include +#include #include #include #include @@ -203,12 +204,26 @@ static void __init smdk2440_machine_init smdk_machine_init(); } +static void __init smdk2440_fixup(struct machine_desc *desc, + struct tag *tags, char **cmdline, + struct meminfo *mi) +{ + if (tags != phys_to_virt(S3C2410_SDRAM_PA + 0x100)) { + mi->nr_banks=1; + mi->bank[0].start = 0x30000000; + mi->bank[0].size = SZ_64M; + mi->bank[0].node = 0; + } +} + + MACHINE_START(S3C2440, "SMDK2440") /* Maintainer: Ben Dooks */ .phys_io = S3C2410_PA_UART, .io_pg_offst = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc, .boot_params = S3C2410_SDRAM_PA + 0x100, - + + .fixup = smdk2440_fixup, .init_irq = s3c24xx_init_irq, .map_io = smdk2440_map_io, .init_machine = smdk2440_machine_init, diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440-clock.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440-clock.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440-clock.c 2006-04-03 13:03:30.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440-clock.c 2006-04-11 01:23:09.000000000 +0100 @@ -139,7 +139,7 @@ static int s3c2440_clk_add(struct sys_de clkdivn = __raw_readl(S3C2410_CLKDIVN); clkdivn |= S3C2440_CLKDIVN_UCLK; - __raw_writel(camdivn, S3C2410_CLKDIVN); + __raw_writel(clkdivn, S3C2410_CLKDIVN); mutex_unlock(&clocks_mutex); } diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440-irq.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440-irq.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440-irq.c 2006-03-20 05:53:29.000000000 +0000 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440-irq.c 2006-04-11 00:58:20.000000000 +0100 @@ -100,73 +100,12 @@ static struct irqchip s3c_irq_wdtac97 = .ack = s3c_irq_wdtac97_ack, }; -/* camera irq */ - -static void s3c_irq_demux_cam(unsigned int irq, - struct irqdesc *desc, - struct pt_regs *regs) -{ - unsigned int subsrc, submsk; - struct irqdesc *mydesc; - - /* read the current pending interrupts, and the mask - * for what it is available */ - - subsrc = __raw_readl(S3C2410_SUBSRCPND); - submsk = __raw_readl(S3C2410_INTSUBMSK); - - subsrc &= ~submsk; - subsrc >>= 11; - subsrc &= 3; - - if (subsrc != 0) { - if (subsrc & 1) { - mydesc = irq_desc + IRQ_S3C2440_CAM_C; - desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs); - } - if (subsrc & 2) { - mydesc = irq_desc + IRQ_S3C2440_CAM_P; - desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs); - } - } -} - -#define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0)) - -static void -s3c_irq_cam_mask(unsigned int irqno) -{ - s3c_irqsub_mask(irqno, INTMSK_CAM, 3<<11); -} - -static void -s3c_irq_cam_unmask(unsigned int irqno) -{ - s3c_irqsub_unmask(irqno, INTMSK_CAM); -} - -static void -s3c_irq_cam_ack(unsigned int irqno) -{ - s3c_irqsub_maskack(irqno, INTMSK_CAM, 3<<11); -} - -static struct irqchip s3c_irq_cam = { - .mask = s3c_irq_cam_mask, - .unmask = s3c_irq_cam_unmask, - .ack = s3c_irq_cam_ack, -}; - static int s3c2440_irq_add(struct sys_device *sysdev) { unsigned int irqno; printk("S3C2440: IRQ Support\n"); - set_irq_chip(IRQ_NFCON, &s3c_irq_level_chip); - set_irq_handler(IRQ_NFCON, do_level_IRQ); - set_irq_flags(IRQ_NFCON, IRQF_VALID); - /* add new chained handler for wdt, ac7 */ set_irq_chip(IRQ_WDT, &s3c_irq_level_chip); @@ -179,18 +118,6 @@ static int s3c2440_irq_add(struct sys_de set_irq_flags(irqno, IRQF_VALID); } - /* add chained handler for camera */ - - set_irq_chip(IRQ_CAM, &s3c_irq_level_chip); - set_irq_handler(IRQ_CAM, do_level_IRQ); - set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam); - - for (irqno = IRQ_S3C2440_CAM_C; irqno <= IRQ_S3C2440_CAM_P; irqno++) { - set_irq_chip(irqno, &s3c_irq_cam); - set_irq_handler(irqno, do_level_IRQ); - set_irq_flags(irqno, IRQF_VALID); - } - return 0; } @@ -198,10 +125,11 @@ static struct sysdev_driver s3c2440_irq_ .add = s3c2440_irq_add, }; -static int s3c24xx_irq_driver(void) +static int s3c2440_irq_init(void) { - return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver); + //return sysdev_driver_register(&s3c2440_sysclass, &s3c2440_irq_driver); + return 0; } -arch_initcall(s3c24xx_irq_driver); +arch_initcall(s3c2440_irq_init); diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2440.c 2006-04-10 23:19:14.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2440.c 2006-04-10 23:46:35.000000000 +0100 @@ -1,6 +1,6 @@ /* linux/arch/arm/mach-s3c2410/s3c2440.c * - * Copyright (c) 2004-2005 Simtec Electronics + * Copyright (c) 2004-2006 Simtec Electronics * Ben Dooks * * Samsung S3C2440 Mobile CPU support @@ -8,16 +8,6 @@ * 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. - * - * Modifications: - * 24-Aug-2004 BJD Start of s3c2440 support - * 12-Oct-2004 BJD Moved clock info out to clock.c - * 01-Nov-2004 BJD Fixed clock build code - * 09-Nov-2004 BJD Added sysdev for power management - * 04-Nov-2004 BJD New serial registration - * 15-Nov-2004 BJD Rename the i2c device for the s3c2440 - * 14-Jan-2005 BJD Moved clock init code into seperate function - * 14-Jan-2005 BJD Removed un-used clock bits */ #include @@ -50,144 +40,20 @@ #include "cpu.h" #include "pm.h" - -static struct map_desc s3c2440_iodesc[] __initdata = { - IODESC_ENT(USBHOST), - IODESC_ENT(CLKPWR), - IODESC_ENT(LCD), - IODESC_ENT(TIMER), - IODESC_ENT(ADC), - IODESC_ENT(WATCHDOG), -}; - -/* uart initialisation */ - -void __init s3c2440_init_uarts(struct s3c2410_uartcfg *cfg, int no) -{ - s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no); -} - -#ifdef CONFIG_PM - -static struct sleep_save s3c2440_sleep[] = { - SAVE_ITEM(S3C2440_DSC0), - SAVE_ITEM(S3C2440_DSC1), - SAVE_ITEM(S3C2440_GPJDAT), - SAVE_ITEM(S3C2440_GPJCON), - SAVE_ITEM(S3C2440_GPJUP) -}; - -static int s3c2440_suspend(struct sys_device *dev, pm_message_t state) -{ - s3c2410_pm_do_save(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep)); - return 0; -} - -static int s3c2440_resume(struct sys_device *dev) -{ - s3c2410_pm_do_restore(s3c2440_sleep, ARRAY_SIZE(s3c2440_sleep)); - return 0; -} - -#else -#define s3c2440_suspend NULL -#define s3c2440_resume NULL -#endif - -struct sysdev_class s3c2440_sysclass = { - set_kset_name("s3c2440-core"), - .suspend = s3c2440_suspend, - .resume = s3c2440_resume -}; - static struct sys_device s3c2440_sysdev = { .cls = &s3c2440_sysclass, }; -void __init s3c2440_map_io(struct map_desc *mach_desc, int size) +int __init s3c2440_init(void) { - /* register our io-tables */ - - iotable_init(s3c2440_iodesc, ARRAY_SIZE(s3c2440_iodesc)); - iotable_init(mach_desc, size); - - /* rename any peripherals used differing from the s3c2410 */ - - s3c_device_i2c.name = "s3c2440-i2c"; - s3c_device_nand.name = "s3c2440-nand"; + printk("S3C2440: Initialising architecture\n"); /* change irq for watchdog */ s3c_device_wdt.resource[1].start = IRQ_S3C2440_WDT; s3c_device_wdt.resource[1].end = IRQ_S3C2440_WDT; -} -void __init s3c2440_init_clocks(int xtal) -{ - unsigned long clkdiv; - unsigned long camdiv; - unsigned long hclk, fclk, pclk; - int hdiv = 1; - - /* now we've got our machine bits initialised, work out what - * clocks we've got */ - - fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON), xtal) * 2; - - clkdiv = __raw_readl(S3C2410_CLKDIVN); - camdiv = __raw_readl(S3C2440_CAMDIVN); - - /* work out clock scalings */ - - switch (clkdiv & S3C2440_CLKDIVN_HDIVN_MASK) { - case S3C2440_CLKDIVN_HDIVN_1: - hdiv = 1; - break; - - case S3C2440_CLKDIVN_HDIVN_2: - hdiv = 2; - break; - - case S3C2440_CLKDIVN_HDIVN_4_8: - hdiv = (camdiv & S3C2440_CAMDIVN_HCLK4_HALF) ? 8 : 4; - break; - - case S3C2440_CLKDIVN_HDIVN_3_6: - hdiv = (camdiv & S3C2440_CAMDIVN_HCLK3_HALF) ? 6 : 3; - break; - } - - hclk = fclk / hdiv; - pclk = hclk / ((clkdiv & S3C2440_CLKDIVN_PDIVN)? 2:1); - - /* print brief summary of clocks, etc */ - - printk("S3C2440: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n", - print_mhz(fclk), print_mhz(hclk), print_mhz(pclk)); - - /* initialise the clocks here, to allow other things like the - * console to use them, and to add new ones after the initialisation - */ - - s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); -} - -/* need to register class before we actually register the device, and - * we also need to ensure that it has been initialised before any of the - * drivers even try to use it (even if not on an s3c2440 based system) - * as a driver which may support both 2410 and 2440 may try and use it. -*/ - -static int __init s3c2440_core_init(void) -{ - return sysdev_class_register(&s3c2440_sysclass); -} - -core_initcall(s3c2440_core_init); - -int __init s3c2440_init(void) -{ - printk("S3C2440: Initialising architecture\n"); + /* register our system device for everything else */ return sysdev_register(&s3c2440_sysdev); } diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442-clock.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442-clock.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442-clock.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442-clock.c 2006-04-11 01:29:33.000000000 +0100 @@ -0,0 +1,171 @@ +/* linux/arch/arm/mach-s3c2410/s3c2442-clock.c + * + * Copyright (c) 2004-2005 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks + * + * S3C2442 Clock support + * + * 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 +*/ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include "clock.h" +#include "cpu.h" + +/* S3C2442 extended clock support */ + +static unsigned long s3c2442_camif_upll_round(struct clk *clk, + unsigned long rate) +{ + unsigned long parent_rate = clk_get_rate(clk->parent); + int div; + + if (rate > parent_rate) + return parent_rate; + + div = parent_rate / rate; + + if (div == 3) + return parent_rate / 3; + + /* note, we remove the +/- 1 calculations for the divisor */ + + div /= 2; + + if (div < 1) + div = 1; + else if (div > 16) + div = 16; + + return parent_rate / (div * 2); +} + +static int s3c2442_camif_upll_setrate(struct clk *clk, unsigned long rate) +{ + unsigned long parent_rate = clk_get_rate(clk->parent); + unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); + + rate = s3c2442_camif_upll_round(clk, rate); + + camdivn &= ~S3C2442_CAMDIVN_CAMCLK_DIV3; + + if (rate == parent_rate) { + camdivn &= ~S3C2440_CAMDIVN_CAMCLK_SEL; + } else if ((parent_rate / rate) == 3) { + camdivn |= S3C2440_CAMDIVN_CAMCLK_SEL; + camdivn |= S3C2442_CAMDIVN_CAMCLK_DIV3; + } else { + camdivn &= ~S3C2440_CAMDIVN_CAMCLK_MASK; + camdivn |= S3C2440_CAMDIVN_CAMCLK_SEL; + camdivn |= (((parent_rate / rate) / 2) - 1); + } + + __raw_writel(camdivn, S3C2440_CAMDIVN); + + return 0; +} + +/* Extra S3C2442 clocks */ + +static struct clk s3c2442_clk_cam = { + .name = "camif", + .id = -1, + .enable = s3c24xx_clkcon_enable, + .ctrlbit = S3C2440_CLKCON_CAMERA, +}; + +static struct clk s3c2442_clk_cam_upll = { + .name = "camif-upll", + .id = -1, + .set_rate = s3c2442_camif_upll_setrate, + .round_rate = s3c2442_camif_upll_round, +}; + +static int s3c2442_clk_add(struct sys_device *sysdev) +{ + unsigned long camdivn = __raw_readl(S3C2440_CAMDIVN); + unsigned long clkdivn; + struct clk *clk_h; + struct clk *clk_p; + struct clk *clk_upll; + + printk("S3C2442: Clock Support, DVS %s\n", + (camdivn & S3C2440_CAMDIVN_DVSEN) ? "on" : "off"); + + clk_p = clk_get(NULL, "pclk"); + clk_h = clk_get(NULL, "hclk"); + clk_upll = clk_get(NULL, "upll"); + + if (IS_ERR(clk_p) || IS_ERR(clk_h) || IS_ERR(clk_upll)) { + printk(KERN_ERR "S3C2442: Failed to get parent clocks\n"); + return -EINVAL; + } + + /* check rate of UPLL, and if it is near 96MHz, then change + * to using half the UPLL rate for the system */ + + if (clk_get_rate(clk_upll) > (94 * MHZ)) { + clk_usb_bus.rate = clk_get_rate(clk_upll) / 2; + + mutex_lock(&clocks_mutex); + + clkdivn = __raw_readl(S3C2410_CLKDIVN); + clkdivn |= S3C2440_CLKDIVN_UCLK; + __raw_writel(clkdivn, S3C2410_CLKDIVN); + + mutex_unlock(&clocks_mutex); + } + + s3c2442_clk_cam.parent = clk_h; + s3c2442_clk_cam_upll.parent = clk_upll; + + s3c24xx_register_clock(&s3c2442_clk_cam); + s3c24xx_register_clock(&s3c2442_clk_cam_upll); + + clk_disable(&s3c2442_clk_cam); + + return 0; +} + +static struct sysdev_driver s3c2442_clk_driver = { + .add = s3c2442_clk_add, +}; + +static __init int s3c2442_clk_init(void) +{ + return sysdev_driver_register(&s3c2442_sysclass, &s3c2442_clk_driver); +} + +arch_initcall(s3c2442_clk_init); diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442.c 2006-04-10 23:46:29.000000000 +0100 @@ -0,0 +1,52 @@ +/* linux/arch/arm/mach-s3c2410/s3c2440.c + * + * Copyright (c) 2006 Simtec Electronics + * Ben Dooks + * + * Samsung S3C2442 Mobile CPU support + * + * 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 "s3c2442.h" +#include "clock.h" +#include "devs.h" +#include "cpu.h" +#include "pm.h" + +static struct sys_device s3c2442_sysdev = { + .cls = &s3c2442_sysclass, +}; + +int __init s3c2442_init(void) +{ + printk("S3C2442: Initialising architecture\n"); + + return sysdev_register(&s3c2442_sysdev); +} diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442.h linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442.h --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c2442.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c2442.h 2006-04-10 12:28:45.000000000 +0100 @@ -0,0 +1,17 @@ +/* arch/arm/mach-s3c2410/s3c2442.h + * + * Copyright (c) 2006 Simtec Electronics + * Ben Dooks + * + * Header file for s3c2442 cpu support + * + * 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. +*/ + +#ifdef CONFIG_CPU_S3C2442 +extern int s3c2442_init(void); +#else +#define s3c2442_init NULL +#endif diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x-irq.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x-irq.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x-irq.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x-irq.c 2006-04-11 01:01:01.000000000 +0100 @@ -0,0 +1,142 @@ +/* linux/arch/arm/mach-s3c2410/s3c2440-irq.c + * + * Copyright (c) 2003,2004 Simtec Electronics + * Ben Dooks + * + * 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 + * + * Changelog: + * 25-Jul-2005 BJD Split from irq.c + * +*/ + +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + +#include +#include + +#include "cpu.h" +#include "pm.h" +#include "irq.h" + +/* camera irq */ + +static void s3c_irq_demux_cam(unsigned int irq, + struct irqdesc *desc, + struct pt_regs *regs) +{ + unsigned int subsrc, submsk; + struct irqdesc *mydesc; + + /* read the current pending interrupts, and the mask + * for what it is available */ + + subsrc = __raw_readl(S3C2410_SUBSRCPND); + submsk = __raw_readl(S3C2410_INTSUBMSK); + + subsrc &= ~submsk; + subsrc >>= 11; + subsrc &= 3; + + if (subsrc != 0) { + if (subsrc & 1) { + mydesc = irq_desc + IRQ_S3C2440_CAM_C; + desc_handle_irq(IRQ_S3C2440_CAM_C, mydesc, regs); + } + if (subsrc & 2) { + mydesc = irq_desc + IRQ_S3C2440_CAM_P; + desc_handle_irq(IRQ_S3C2440_CAM_P, mydesc, regs); + } + } +} + +#define INTMSK_CAM (1UL << (IRQ_CAM - IRQ_EINT0)) + +static void +s3c_irq_cam_mask(unsigned int irqno) +{ + s3c_irqsub_mask(irqno, INTMSK_CAM, 3<<11); +} + +static void +s3c_irq_cam_unmask(unsigned int irqno) +{ + s3c_irqsub_unmask(irqno, INTMSK_CAM); +} + +static void +s3c_irq_cam_ack(unsigned int irqno) +{ + s3c_irqsub_maskack(irqno, INTMSK_CAM, 3<<11); +} + +static struct irqchip s3c_irq_cam = { + .mask = s3c_irq_cam_mask, + .unmask = s3c_irq_cam_unmask, + .ack = s3c_irq_cam_ack, +}; + +static int s3c244x_irq_add(struct sys_device *sysdev) +{ + unsigned int irqno; + + set_irq_chip(IRQ_NFCON, &s3c_irq_level_chip); + set_irq_handler(IRQ_NFCON, do_level_IRQ); + set_irq_flags(IRQ_NFCON, IRQF_VALID); + + /* add chained handler for camera */ + + set_irq_chip(IRQ_CAM, &s3c_irq_level_chip); + set_irq_handler(IRQ_CAM, do_level_IRQ); + set_irq_chained_handler(IRQ_CAM, s3c_irq_demux_cam); + + for (irqno = IRQ_S3C2440_CAM_C; irqno <= IRQ_S3C2440_CAM_P; irqno++) { + set_irq_chip(irqno, &s3c_irq_cam); + set_irq_handler(irqno, do_level_IRQ); + set_irq_flags(irqno, IRQF_VALID); + } + + return 0; +} + +static struct sysdev_driver s3c244x_irq_driver = { + .add = s3c244x_irq_add, +}; + +static int s3c2440_irq_init(void) +{ + return sysdev_driver_register(&s3c2440_sysclass, &s3c244x_irq_driver); +} + +arch_initcall(s3c2440_irq_init); + + +static int s3c2442_irq_init(void) +{ + return sysdev_driver_register(&s3c2442_sysclass, &s3c244x_irq_driver); +} + +arch_initcall(s3c2442_irq_init); diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x.c linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x.c --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x.c 2006-04-11 00:54:01.000000000 +0100 @@ -0,0 +1,182 @@ +/* linux/arch/arm/mach-s3c2410/s3c244x.c + * + * Copyright (c) 2004-2006 Simtec Electronics + * Ben Dooks + * + * Samsung S3C2440 and S3C2442 Mobile CPU support + * + * 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 "s3c2440.h" +#include "s3c244x.h" +#include "clock.h" +#include "devs.h" +#include "cpu.h" +#include "pm.h" + +static struct map_desc s3c244x_iodesc[] __initdata = { + IODESC_ENT(CLKPWR), + IODESC_ENT(TIMER), + IODESC_ENT(WATCHDOG), + IODESC_ENT(LCD), + IODESC_ENT(ADC), + IODESC_ENT(USBHOST), +}; + +/* uart initialisation */ + +void __init s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no) +{ + s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no); +} + +void __init s3c244x_map_io(struct map_desc *mach_desc, int size) +{ + /* register our io-tables */ + + iotable_init(s3c244x_iodesc, ARRAY_SIZE(s3c244x_iodesc)); + iotable_init(mach_desc, size); + + /* rename any peripherals used differing from the s3c2410 */ + + s3c_device_i2c.name = "s3c2440-i2c"; + s3c_device_nand.name = "s3c2440-nand"; +} + +void __init s3c244x_init_clocks(int xtal) +{ + unsigned long clkdiv; + unsigned long camdiv; + unsigned long hclk, fclk, pclk; + int hdiv = 1; + + /* now we've got our machine bits initialised, work out what + * clocks we've got */ + + fclk = s3c2410_get_pll(__raw_readl(S3C2410_MPLLCON), xtal) * 2; + + clkdiv = __raw_readl(S3C2410_CLKDIVN); + camdiv = __raw_readl(S3C2440_CAMDIVN); + + /* work out clock scalings */ + + switch (clkdiv & S3C2440_CLKDIVN_HDIVN_MASK) { + case S3C2440_CLKDIVN_HDIVN_1: + hdiv = 1; + break; + + case S3C2440_CLKDIVN_HDIVN_2: + hdiv = 2; + break; + + case S3C2440_CLKDIVN_HDIVN_4_8: + hdiv = (camdiv & S3C2440_CAMDIVN_HCLK4_HALF) ? 8 : 4; + break; + + case S3C2440_CLKDIVN_HDIVN_3_6: + hdiv = (camdiv & S3C2440_CAMDIVN_HCLK3_HALF) ? 6 : 3; + break; + } + + hclk = fclk / hdiv; + pclk = hclk / ((clkdiv & S3C2440_CLKDIVN_PDIVN)? 2:1); + + /* print brief summary of clocks, etc */ + + printk("S3C244X: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n", + print_mhz(fclk), print_mhz(hclk), print_mhz(pclk)); + + /* initialise the clocks here, to allow other things like the + * console to use them, and to add new ones after the initialisation + */ + + s3c24xx_setup_clocks(xtal, fclk, hclk, pclk); +} + +#ifdef CONFIG_PM + +static struct sleep_save s3c244x_sleep[] = { + SAVE_ITEM(S3C2440_DSC0), + SAVE_ITEM(S3C2440_DSC1), + SAVE_ITEM(S3C2440_GPJDAT), + SAVE_ITEM(S3C2440_GPJCON), + SAVE_ITEM(S3C2440_GPJUP) +}; + +static int s3c244x_suspend(struct sys_device *dev, pm_message_t state) +{ + s3c2410_pm_do_save(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); + return 0; +} + +static int s3c244x_resume(struct sys_device *dev) +{ + s3c2410_pm_do_restore(s3c244x_sleep, ARRAY_SIZE(s3c244x_sleep)); + return 0; +} + +#else +#define s3c244x_suspend NULL +#define s3c244x_resume NULL +#endif + +/* Since the S3C2442 and S3C2440 share items, put both sysclasses here */ + +struct sysdev_class s3c2440_sysclass = { + set_kset_name("s3c2440-core"), + .suspend = s3c244x_suspend, + .resume = s3c244x_resume +}; + +struct sysdev_class s3c2442_sysclass = { + set_kset_name("s3c2442-core"), + .suspend = s3c244x_suspend, + .resume = s3c244x_resume +}; + +/* need to register class before we actually register the device, and + * we also need to ensure that it has been initialised before any of the + * drivers even try to use it (even if not on an s3c2440 based system) + * as a driver which may support both 2410 and 2440 may try and use it. +*/ + +static int __init s3c2440_core_init(void) +{ + return sysdev_class_register(&s3c2440_sysclass); +} + +core_initcall(s3c2440_core_init); + +static int __init s3c2442_core_init(void) +{ + return sysdev_class_register(&s3c2442_sysclass); +} + +core_initcall(s3c2442_core_init); diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x.h linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x.h --- linux-2.6.17-rc1-uartupd2/arch/arm/mach-s3c2410/s3c244x.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/arch/arm/mach-s3c2410/s3c244x.h 2006-04-10 12:42:07.000000000 +0100 @@ -0,0 +1,25 @@ +/* arch/arm/mach-s3c2410/s3c2440.h + * + * Copyright (c) 2004-2005 Simtec Electronics + * Ben Dooks + * + * Header file for S3C2440 and S3C2442 cpu support + * + * 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. +*/ + +#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442) + +extern void s3c244x_map_io(struct map_desc *mach_desc, int size); + +extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no); + +extern void s3c244x_init_clocks(int xtal); + +#else +#define s3c244x_init_clocks NULL +#define s3c244x_init_uarts NULL +#define s3c244x_map_io NULL +#endif diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/char/watchdog/s3c2410_wdt.c linux-2.6.17-rc1-s3c2442-3/drivers/char/watchdog/s3c2410_wdt.c --- linux-2.6.17-rc1-uartupd2/drivers/char/watchdog/s3c2410_wdt.c 2006-03-20 05:53:29.000000000 +0000 +++ linux-2.6.17-rc1-s3c2442-3/drivers/char/watchdog/s3c2410_wdt.c 2006-04-12 07:47:50.000000000 +0100 @@ -423,6 +423,12 @@ static int s3c2410wdt_probe(struct platf if (tmr_atboot && started == 0) { printk(KERN_INFO PFX "Starting Watchdog Timer\n"); s3c2410wdt_start(); + } else if (!tmr_atboot) { + /* if we're not enabling the watchdog, then ensure it is + * disabled if it has been left running from the bootloader + * or other source */ + + s3c2410wdt_stop(); } return 0; diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/leds/Kconfig linux-2.6.17-rc1-s3c2442-3/drivers/leds/Kconfig --- linux-2.6.17-rc1-uartupd2/drivers/leds/Kconfig 2006-04-03 13:03:33.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/drivers/leds/Kconfig 2006-04-12 08:09:28.000000000 +0100 @@ -14,13 +14,7 @@ config LEDS_CLASS This option enables the led sysfs class in /sys/class/leds. You'll need this to do anything useful with LEDs. If unsure, say N. -config LEDS_TRIGGERS - bool "LED Trigger support" - depends NEW_LEDS - help - This option enables trigger support for the leds class. - These triggers allow kernel events to drive the LEDs and can - be configured via sysfs. If unsure, say Y. +comment "LED drivers" config LEDS_CORGI tristate "LED Support for the Sharp SL-C7x0 series" @@ -59,6 +53,23 @@ config LEDS_TOSA This option enables support for the LEDs on Sharp Zaurus SL-6000 series. +config LEDS_S3C24XX + tristate "LED Support for Samsung S3C24XX GPIO LEDs" + depends on LEDS_CLASS && ARCH_S3C2410 + help + This option enables support for LEDs connected to GPIO lines + on Samsung S3C24XX series CPUs, such as the S3C2410 and S3C2440. + +comment "LED Triggers" + +config LEDS_TRIGGERS + bool "LED Trigger support" + depends NEW_LEDS + help + This option enables trigger support for the leds class. + These triggers allow kernel events to drive the LEDs and can + be configured via sysfs. If unsure, say Y. + config LEDS_TRIGGER_TIMER tristate "LED Timer Trigger" depends LEDS_TRIGGERS diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/leds/Makefile linux-2.6.17-rc1-s3c2442-3/drivers/leds/Makefile --- linux-2.6.17-rc1-uartupd2/drivers/leds/Makefile 2006-04-03 13:03:33.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/drivers/leds/Makefile 2006-04-12 08:08:13.000000000 +0100 @@ -10,6 +10,7 @@ obj-$(CONFIG_LEDS_LOCOMO) += leds-locom obj-$(CONFIG_LEDS_SPITZ) += leds-spitz.o obj-$(CONFIG_LEDS_IXP4XX) += leds-ixp4xx-gpio.o obj-$(CONFIG_LEDS_TOSA) += leds-tosa.o +obj-$(CONFIG_LEDS_S3C24XX) += leds-s3c24xx.o # LED Triggers obj-$(CONFIG_LEDS_TRIGGER_TIMER) += ledtrig-timer.o diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/leds/leds-s3c24xx.c linux-2.6.17-rc1-s3c2442-3/drivers/leds/leds-s3c24xx.c --- linux-2.6.17-rc1-uartupd2/drivers/leds/leds-s3c24xx.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/drivers/leds/leds-s3c24xx.c 2006-04-12 08:08:13.000000000 +0100 @@ -0,0 +1,163 @@ +/* drivers/leds/leds-s3c24xx.c + * + * (c) 2006 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks + * + * S3C24XX - LEDs GPIO driver + * + * 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 + +/* our context */ + +struct s3c24xx_gpio_led { + struct led_classdev cdev; + struct s3c24xx_led_platdata *pdata; +}; + +static inline struct s3c24xx_gpio_led *pdev_to_gpio(struct platform_device *dev) +{ + return (struct s3c24xx_gpio_led *)platform_get_drvdata(dev); +} + +static inline struct s3c24xx_gpio_led *to_gpio(struct led_classdev *led_cdev) +{ + return container_of(led_cdev, struct s3c24xx_gpio_led, cdev); +} + +static void s3c24xx_led_set(struct led_classdev *led_cdev, + enum led_brightness value) +{ + struct s3c24xx_gpio_led *led = to_gpio(led_cdev); + struct s3c24xx_led_platdata *pd = led->pdata; + + /* there will be a sort delay between setting the output and + * going from output to input when using tristate. */ + + s3c2410_gpio_setpin(pd->gpio, (value ? 1 : 0) ^ + (pd->flags & S3C24XX_LEDF_ACTLOW)); + + if (pd->flags & S3C24XX_LEDF_TRISTATE) + s3c2410_gpio_cfgpin(pd->gpio, + value ? S3C2410_GPIO_OUTPUT : S3C2410_GPIO_INPUT); + +} + +static int s3c24xx_led_remove(struct platform_device *dev) +{ + struct s3c24xx_gpio_led *led = pdev_to_gpio(dev); + + led_classdev_unregister(&led->cdev); + kfree(led); + + return 0; +} + +static int s3c24xx_led_probe(struct platform_device *dev) +{ + struct s3c24xx_led_platdata *pdata = dev->dev.platform_data; + struct s3c24xx_gpio_led *led; + int ret; + + led = kzalloc(sizeof(struct s3c24xx_gpio_led), GFP_KERNEL); + if (led == NULL) { + dev_err(&dev->dev, "No memory for device\n"); + return -ENOMEM; + } + + platform_set_drvdata(dev, led); + + led->cdev.brightness_set = s3c24xx_led_set; + led->cdev.default_trigger = pdata->def_trigger; + led->cdev.name = pdata->name; + + led->pdata = pdata; + + /* no point in having a pull-up if we are always driving */ + + if (pdata->flags & S3C24XX_LEDF_TRISTATE) { + s3c2410_gpio_setpin(pdata->gpio, 0); + s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_INPUT); + } else { + s3c2410_gpio_pullup(pdata->gpio, 0); + s3c2410_gpio_setpin(pdata->gpio, 0); + s3c2410_gpio_cfgpin(pdata->gpio, S3C2410_GPIO_OUTPUT); + } + + /* register our new led device */ + + ret = led_classdev_register(&dev->dev, &led->cdev); + if (ret < 0) { + dev_err(&dev->dev, "led_classdev_register failed\n"); + goto exit_err1; + } + + return 0; + + exit_err1: + kfree(led); + return ret; +} + + +#ifdef CONFIG_PM +static int s3c24xx_led_suspend(struct platform_device *dev, pm_message_t state) +{ + struct s3c24xx_gpio_led *led = pdev_to_gpio(dev); + + led_classdev_suspend(&led->cdev); + return 0; +} + +static int s3c24xx_led_resume(struct platform_device *dev) +{ + struct s3c24xx_gpio_led *led = pdev_to_gpio(dev); + + led_classdev_resume(&led->cdev); + return 0; +} +#else +#define s3c24xx_led_suspend NULL +#define s3c24xx_led_resume NULL +#endif + +static struct platform_driver s3c24xx_led_driver = { + .probe = s3c24xx_led_probe, + .remove = s3c24xx_led_remove, + .suspend = s3c24xx_led_suspend, + .resume = s3c24xx_led_resume, + .driver = { + .name = "s3c24xx_led", + .owner = THIS_MODULE, + }, +}; + +static int __init s3c24xx_led_init(void) +{ + return platform_driver_register(&s3c24xx_led_driver); +} + +static void __exit s3c24xx_led_exit(void) +{ + platform_driver_unregister(&s3c24xx_led_driver); +} + +module_init(s3c24xx_led_init); +module_exit(s3c24xx_led_exit); + +MODULE_AUTHOR("Ben Dooks "); +MODULE_DESCRIPTION("S3C24XX LED driver"); +MODULE_LICENSE("GPL"); diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/drivers/serial/s3c2410.c linux-2.6.17-rc1-s3c2442-3/drivers/serial/s3c2410.c --- linux-2.6.17-rc1-uartupd2/drivers/serial/s3c2410.c 2006-04-03 13:03:39.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/drivers/serial/s3c2410.c 2006-04-11 01:14:02.000000000 +0100 @@ -1365,7 +1365,7 @@ static inline void s3c2410_serial_exit(v #endif /* CONFIG_CPU_S3C2410 */ -#ifdef CONFIG_CPU_S3C2440 +#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442) static int s3c2440_serial_setsource(struct uart_port *port, struct s3c24xx_uart_clksrc *clk) diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/leds-gpio.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/leds-gpio.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/leds-gpio.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/leds-gpio.h 2006-04-12 08:08:13.000000000 +0100 @@ -0,0 +1,28 @@ +/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h + * + * (c) 2006 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks + * + * S3C24XX - LEDs GPIO connector + * + * 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 __ASM_ARCH_LEDSGPIO_H +#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h" + +#define S3C24XX_LEDF_ACTLOW (1<<0) /* LED is on when GPIO low */ +#define S3C24XX_LEDF_TRISTATE (1<<1) /* tristate to turn off */ + +struct s3c24xx_led_platdata { + unsigned int gpio; + unsigned int flags; + + char *name; + char *def_trigger; +}; + +#endif /* __ASM_ARCH_LEDSGPIO_H */ diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/regs-clock.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/regs-clock.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/regs-clock.h 2006-03-20 05:53:29.000000000 +0000 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/regs-clock.h 2006-04-10 11:37:31.000000000 +0100 @@ -114,7 +114,7 @@ s3c2410_get_pll(unsigned int pllval, uns #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_CPU_S3C2440 +#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442) /* extra registers */ #define S3C2440_CAMDIVN S3C2410_CLKREG(0x18) @@ -136,7 +136,9 @@ s3c2410_get_pll(unsigned int pllval, uns #define S3C2440_CAMDIVN_HCLK4_HALF (1<<9) #define S3C2440_CAMDIVN_DVSEN (1<<12) -#endif /* CONFIG_CPU_S3C2440 */ +#define S3C2442_CAMDIVN_CAMCLK_DIV3 (1<<5) + +#endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */ #endif /* __ASM_ARM_REGS_CLOCK */ diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/regs-gpio.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/regs-gpio.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/regs-gpio.h 2006-04-03 13:03:44.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/regs-gpio.h 2006-04-10 10:23:49.000000000 +0100 @@ -450,12 +450,14 @@ #define S3C2410_GPD0_OUTP (0x01 << 0) #define S3C2410_GPD0_VD8 (0x02 << 0) #define S3C2400_GPD0_VFRAME (0x02 << 0) +#define S3C2442_GPD0_nSPICS1 (0x03 << 0) #define S3C2410_GPD1 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 1) #define S3C2410_GPD1_INP (0x00 << 2) #define S3C2410_GPD1_OUTP (0x01 << 2) #define S3C2410_GPD1_VD9 (0x02 << 2) #define S3C2400_GPD1_VM (0x02 << 2) +#define S3C2442_GPD1_SPICLK1 (0x03 << 2) #define S3C2410_GPD2 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 2) #define S3C2410_GPD2_INP (0x00 << 4) @@ -858,6 +860,7 @@ #define S3C2410_GPG12_OUTP (0x01 << 24) #define S3C2410_GPG12_EINT20 (0x02 << 24) #define S3C2410_GPG12_XMON (0x03 << 24) +#define S3C2442_GPG12_nSPICS0 (0x03 << 24) #define S3C2410_GPG13 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 13) #define S3C2410_GPG13_INP (0x00 << 26) @@ -943,6 +946,7 @@ #define S3C2410_GPH9_INP (0x00 << 18) #define S3C2410_GPH9_OUTP (0x01 << 18) #define S3C2410_GPH9_CLKOUT0 (0x02 << 18) +#define S3C2442_GPH9_nSPICS0 (0x03 << 18) #define S3C2410_GPH10 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 10) #define S3C2410_GPH10_INP (0x00 << 20) @@ -1051,6 +1055,7 @@ #define S3C2410_GSTATUS1_IDMASK (0xffff0000) #define S3C2410_GSTATUS1_2410 (0x32410000) #define S3C2410_GSTATUS1_2440 (0x32440000) +#define S3C2410_GSTATUS1_2442 (0x32440aaa) #define S3C2410_GSTATUS2_WTRESET (1<<2) #define S3C2410_GSTATUS2_OFFRESET (1<<1) diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/uncompress.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/uncompress.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch/uncompress.h 2006-04-03 13:03:44.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch/uncompress.h 2006-04-11 00:31:41.000000000 +0100 @@ -82,7 +82,8 @@ static void putc(int ch) while (1) { level = uart_rd(S3C2410_UFSTAT); - if (cpuid == S3C2410_GSTATUS1_2440) { + if (cpuid == S3C2410_GSTATUS1_2440 || + cpuid == S3C2410_GSTATUS1_2442) { level &= S3C2440_UFSTAT_TXMASK; level >>= S3C2440_UFSTAT_TXSHIFT; } else { @@ -130,7 +131,7 @@ static void arch_decomp_wdog_start(void) { __raw_writel(WDOG_COUNT, S3C2410_WTDAT); __raw_writel(WDOG_COUNT, S3C2410_WTCNT); - __raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x40), S3C2410_WTCON); + __raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON); } #else diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/leds-gpio.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/leds-gpio.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/leds-gpio.h 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/leds-gpio.h 2006-04-12 08:08:13.000000000 +0100 @@ -0,0 +1,28 @@ +/* linux/include/asm-arm/arch-s3c2410/leds-gpio.h + * + * (c) 2006 Simtec Electronics + * http://armlinux.simtec.co.uk/ + * Ben Dooks + * + * S3C24XX - LEDs GPIO connector + * + * 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 __ASM_ARCH_LEDSGPIO_H +#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h" + +#define S3C24XX_LEDF_ACTLOW (1<<0) /* LED is on when GPIO low */ +#define S3C24XX_LEDF_TRISTATE (1<<1) /* tristate to turn off */ + +struct s3c24xx_led_platdata { + unsigned int gpio; + unsigned int flags; + + char *name; + char *def_trigger; +}; + +#endif /* __ASM_ARCH_LEDSGPIO_H */ diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/regs-clock.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/regs-clock.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/regs-clock.h 2006-03-20 05:53:29.000000000 +0000 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/regs-clock.h 2006-04-10 11:37:31.000000000 +0100 @@ -114,7 +114,7 @@ s3c2410_get_pll(unsigned int pllval, uns #endif /* __ASSEMBLY__ */ -#ifdef CONFIG_CPU_S3C2440 +#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442) /* extra registers */ #define S3C2440_CAMDIVN S3C2410_CLKREG(0x18) @@ -136,7 +136,9 @@ s3c2410_get_pll(unsigned int pllval, uns #define S3C2440_CAMDIVN_HCLK4_HALF (1<<9) #define S3C2440_CAMDIVN_DVSEN (1<<12) -#endif /* CONFIG_CPU_S3C2440 */ +#define S3C2442_CAMDIVN_CAMCLK_DIV3 (1<<5) + +#endif /* CONFIG_CPU_S3C2440 or CONFIG_CPU_S3C2442 */ #endif /* __ASM_ARM_REGS_CLOCK */ diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/regs-gpio.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/regs-gpio.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/regs-gpio.h 2006-04-03 13:03:44.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/regs-gpio.h 2006-04-10 10:23:49.000000000 +0100 @@ -450,12 +450,14 @@ #define S3C2410_GPD0_OUTP (0x01 << 0) #define S3C2410_GPD0_VD8 (0x02 << 0) #define S3C2400_GPD0_VFRAME (0x02 << 0) +#define S3C2442_GPD0_nSPICS1 (0x03 << 0) #define S3C2410_GPD1 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 1) #define S3C2410_GPD1_INP (0x00 << 2) #define S3C2410_GPD1_OUTP (0x01 << 2) #define S3C2410_GPD1_VD9 (0x02 << 2) #define S3C2400_GPD1_VM (0x02 << 2) +#define S3C2442_GPD1_SPICLK1 (0x03 << 2) #define S3C2410_GPD2 S3C2410_GPIONO(S3C2410_GPIO_BANKD, 2) #define S3C2410_GPD2_INP (0x00 << 4) @@ -858,6 +860,7 @@ #define S3C2410_GPG12_OUTP (0x01 << 24) #define S3C2410_GPG12_EINT20 (0x02 << 24) #define S3C2410_GPG12_XMON (0x03 << 24) +#define S3C2442_GPG12_nSPICS0 (0x03 << 24) #define S3C2410_GPG13 S3C2410_GPIONO(S3C2410_GPIO_BANKG, 13) #define S3C2410_GPG13_INP (0x00 << 26) @@ -943,6 +946,7 @@ #define S3C2410_GPH9_INP (0x00 << 18) #define S3C2410_GPH9_OUTP (0x01 << 18) #define S3C2410_GPH9_CLKOUT0 (0x02 << 18) +#define S3C2442_GPH9_nSPICS0 (0x03 << 18) #define S3C2410_GPH10 S3C2410_GPIONO(S3C2410_GPIO_BANKH, 10) #define S3C2410_GPH10_INP (0x00 << 20) @@ -1051,6 +1055,7 @@ #define S3C2410_GSTATUS1_IDMASK (0xffff0000) #define S3C2410_GSTATUS1_2410 (0x32410000) #define S3C2410_GSTATUS1_2440 (0x32440000) +#define S3C2410_GSTATUS1_2442 (0x32440aaa) #define S3C2410_GSTATUS2_WTRESET (1<<2) #define S3C2410_GSTATUS2_OFFRESET (1<<1) diff -urNp -X linux-2.6.17-rc1-mm2/Documentation/dontdiff linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/uncompress.h linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/uncompress.h --- linux-2.6.17-rc1-uartupd2/include/asm-arm/arch-s3c2410/uncompress.h 2006-04-03 13:03:44.000000000 +0100 +++ linux-2.6.17-rc1-s3c2442-3/include/asm-arm/arch-s3c2410/uncompress.h 2006-04-11 00:31:41.000000000 +0100 @@ -82,7 +82,8 @@ static void putc(int ch) while (1) { level = uart_rd(S3C2410_UFSTAT); - if (cpuid == S3C2410_GSTATUS1_2440) { + if (cpuid == S3C2410_GSTATUS1_2440 || + cpuid == S3C2410_GSTATUS1_2442) { level &= S3C2440_UFSTAT_TXMASK; level >>= S3C2440_UFSTAT_TXSHIFT; } else { @@ -130,7 +131,7 @@ static void arch_decomp_wdog_start(void) { __raw_writel(WDOG_COUNT, S3C2410_WTDAT); __raw_writel(WDOG_COUNT, S3C2410_WTCNT); - __raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x40), S3C2410_WTCON); + __raw_writel(S3C2410_WTCON_ENABLE | S3C2410_WTCON_DIV128 | S3C2410_WTCON_RSTEN | S3C2410_WTCON_PRESCALE(0x80), S3C2410_WTCON); } #else