]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
authorKukjin Kim <kgene.kim@samsung.com>
Fri, 2 Mar 2012 23:57:03 +0000 (08:57 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Wed, 7 Mar 2012 09:36:33 +0000 (01:36 -0800)
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h

1  2 
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c24xx/s3c2412.c
arch/arm/mach-s3c24xx/s3c2416.c
drivers/leds/Kconfig
drivers/rtc/Kconfig

Simple merge
Simple merge
index 0000000000000000000000000000000000000000,aff6e85a97c65d7ebd5ffd26cace1e863b080cb2..c6eac98710934b23bd7a91a29826f1a600de34d0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,253 +1,251 @@@
 -#include <mach/idle.h>
 -
+ /* linux/arch/arm/mach-s3c2412/s3c2412.c
+  *
+  * Copyright (c) 2006 Simtec Electronics
+  *    Ben Dooks <ben@simtec.co.uk>
+  *
+  * http://armlinux.simtec.co.uk/.
+  *
+  * 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 <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/clk.h>
+ #include <linux/delay.h>
+ #include <linux/device.h>
+ #include <linux/syscore_ops.h>
+ #include <linux/serial_core.h>
+ #include <linux/platform_device.h>
+ #include <linux/io.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
+ #include <asm/mach/irq.h>
+ #include <mach/hardware.h>
+ #include <asm/proc-fns.h>
+ #include <asm/irq.h>
 -      s3c24xx_idle = s3c2412_idle;
+ #include <plat/cpu-freq.h>
+ #include <mach/regs-clock.h>
+ #include <plat/regs-serial.h>
+ #include <mach/regs-power.h>
+ #include <mach/regs-gpio.h>
+ #include <mach/regs-gpioj.h>
+ #include <mach/regs-dsc.h>
+ #include <plat/regs-spi.h>
+ #include <mach/regs-s3c2412.h>
+ #include <plat/s3c2412.h>
+ #include <plat/cpu.h>
+ #include <plat/devs.h>
+ #include <plat/clock.h>
+ #include <plat/pm.h>
+ #include <plat/pll.h>
+ #include <plat/nand-core.h>
+ #ifndef CONFIG_CPU_S3C2412_ONLY
+ void __iomem *s3c24xx_va_gpio2 = S3C24XX_VA_GPIO;
+ static inline void s3c2412_init_gpio2(void)
+ {
+       s3c24xx_va_gpio2 = S3C24XX_VA_GPIO + 0x10;
+ }
+ #else
+ #define s3c2412_init_gpio2() do { } while(0)
+ #endif
+ /* Initial IO mappings */
+ static struct map_desc s3c2412_iodesc[] __initdata = {
+       IODESC_ENT(CLKPWR),
+       IODESC_ENT(TIMER),
+       IODESC_ENT(WATCHDOG),
+       {
+               .virtual = (unsigned long)S3C2412_VA_SSMC,
+               .pfn     = __phys_to_pfn(S3C2412_PA_SSMC),
+               .length  = SZ_1M,
+               .type    = MT_DEVICE,
+       },
+       {
+               .virtual = (unsigned long)S3C2412_VA_EBI,
+               .pfn     = __phys_to_pfn(S3C2412_PA_EBI),
+               .length  = SZ_1M,
+               .type    = MT_DEVICE,
+       },
+ };
+ /* uart registration process */
+ void __init s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+ {
+       s3c24xx_init_uartdevs("s3c2412-uart", s3c2410_uart_resources, cfg, no);
+       /* rename devices that are s3c2412/s3c2413 specific */
+       s3c_device_sdi.name  = "s3c2412-sdi";
+       s3c_device_lcd.name  = "s3c2412-lcd";
+       s3c_nand_setname("s3c2412-nand");
+       /* alter IRQ of SDI controller */
+       s3c_device_sdi.resource[1].start = IRQ_S3C2412_SDI;
+       s3c_device_sdi.resource[1].end   = IRQ_S3C2412_SDI;
+       /* spi channel related changes, s3c2412/13 specific */
+       s3c_device_spi0.name = "s3c2412-spi";
+       s3c_device_spi0.resource[0].end = S3C24XX_PA_SPI + 0x24;
+       s3c_device_spi1.name = "s3c2412-spi";
+       s3c_device_spi1.resource[0].start = S3C24XX_PA_SPI + S3C2412_SPI1;
+       s3c_device_spi1.resource[0].end = S3C24XX_PA_SPI + S3C2412_SPI1 + 0x24;
+ }
+ /* s3c2412_idle
+  *
+  * use the standard idle call by ensuring the idle mode
+  * in power config, then issuing the idle co-processor
+  * instruction
+ */
+ static void s3c2412_idle(void)
+ {
+       unsigned long tmp;
+       /* ensure our idle mode is to go to idle */
+       tmp = __raw_readl(S3C2412_PWRCFG);
+       tmp &= ~S3C2412_PWRCFG_STANDBYWFI_MASK;
+       tmp |= S3C2412_PWRCFG_STANDBYWFI_IDLE;
+       __raw_writel(tmp, S3C2412_PWRCFG);
+       cpu_do_idle();
+ }
+ void s3c2412_restart(char mode, const char *cmd)
+ {
+       if (mode == 's')
+               soft_restart(0);
+       /* errata "Watch-dog/Software Reset Problem" specifies that
+        * this reset must be done with the SYSCLK sourced from
+        * EXTCLK instead of FOUT to avoid a glitch in the reset
+        * mechanism.
+        *
+        * See the watchdog section of the S3C2412 manual for more
+        * information on this fix.
+        */
+       __raw_writel(0x00, S3C2412_CLKSRC);
+       __raw_writel(S3C2412_SWRST_RESET, S3C2412_SWRST);
+       mdelay(1);
+ }
+ /* s3c2412_map_io
+  *
+  * register the standard cpu IO areas, and any passed in from the
+  * machine specific initialisation.
+ */
+ void __init s3c2412_map_io(void)
+ {
+       /* move base of IO */
+       s3c2412_init_gpio2();
+       /* set our idle function */
++      arm_pm_idle = s3c2412_idle;
+       /* register our io-tables */
+       iotable_init(s3c2412_iodesc, ARRAY_SIZE(s3c2412_iodesc));
+ }
+ void __init_or_cpufreq s3c2412_setup_clocks(void)
+ {
+       struct clk *xtal_clk;
+       unsigned long tmp;
+       unsigned long xtal;
+       unsigned long fclk;
+       unsigned long hclk;
+       unsigned long pclk;
+       xtal_clk = clk_get(NULL, "xtal");
+       xtal = clk_get_rate(xtal_clk);
+       clk_put(xtal_clk);
+       /* now we've got our machine bits initialised, work out what
+        * clocks we've got */
+       fclk = s3c24xx_get_pll(__raw_readl(S3C2410_MPLLCON), xtal * 2);
+       clk_mpll.rate = fclk;
+       tmp = __raw_readl(S3C2410_CLKDIVN);
+       /* work out clock scalings */
+       hclk = fclk / ((tmp & S3C2412_CLKDIVN_HDIVN_MASK) + 1);
+       hclk /= ((tmp & S3C2412_CLKDIVN_ARMDIVN) ? 2 : 1);
+       pclk = hclk / ((tmp & S3C2412_CLKDIVN_PDIVN) ? 2 : 1);
+       /* print brieft summary of clocks, etc */
+       printk("S3C2412: core %ld.%03ld MHz, memory %ld.%03ld MHz, peripheral %ld.%03ld MHz\n",
+              print_mhz(fclk), print_mhz(hclk), print_mhz(pclk));
+       s3c24xx_setup_clocks(fclk, hclk, pclk);
+ }
+ void __init s3c2412_init_clocks(int xtal)
+ {
+       /* initialise the clocks here, to allow other things like the
+        * console to use them
+        */
+       s3c24xx_register_baseclocks(xtal);
+       s3c2412_setup_clocks();
+       s3c2412_baseclk_add();
+ }
+ /* need to register the subsystem 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 s3c2412 based system)
+  * as a driver which may support both 2410 and 2440 may try and use it.
+ */
+ struct bus_type s3c2412_subsys = {
+       .name = "s3c2412-core",
+       .dev_name = "s3c2412-core",
+ };
+ static int __init s3c2412_core_init(void)
+ {
+       return subsys_system_register(&s3c2412_subsys, NULL);
+ }
+ core_initcall(s3c2412_core_init);
+ static struct device s3c2412_dev = {
+       .bus            = &s3c2412_subsys,
+ };
+ int __init s3c2412_init(void)
+ {
+       printk("S3C2412: Initialising architecture\n");
+ #ifdef CONFIG_PM
+       register_syscore_ops(&s3c2412_pm_syscore_ops);
+ #endif
+       register_syscore_ops(&s3c24xx_irq_syscore_ops);
+       return device_register(&s3c2412_dev);
+ }
index 0000000000000000000000000000000000000000,5287d2808d3ef1f1c471545cd54b64132b2f1e1f..08bb0355159db059934eac0c57458553ec1e5286
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,149 +1,146 @@@
 -#include <mach/idle.h>
+ /* linux/arch/arm/mach-s3c2416/s3c2416.c
+  *
+  * Copyright (c) 2009 Yauhen Kharuzhy <jekhor@gmail.com>,
+  *    as part of OpenInkpot project
+  * Copyright (c) 2009 Promwad Innovation Company
+  *    Yauhen Kharuzhy <yauhen.kharuzhy@promwad.com>
+  *
+  * Samsung S3C2416 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 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 <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/gpio.h>
+ #include <linux/platform_device.h>
+ #include <linux/serial_core.h>
+ #include <linux/device.h>
+ #include <linux/syscore_ops.h>
+ #include <linux/clk.h>
+ #include <linux/io.h>
+ #include <asm/mach/arch.h>
+ #include <asm/mach/map.h>
+ #include <asm/mach/irq.h>
+ #include <mach/hardware.h>
+ #include <asm/proc-fns.h>
+ #include <asm/irq.h>
 -      /* s3c24xx_idle = s3c2416_idle; */
 -
+ #include <mach/regs-s3c2443-clock.h>
+ #include <plat/gpio-core.h>
+ #include <plat/gpio-cfg.h>
+ #include <plat/gpio-cfg-helpers.h>
+ #include <plat/s3c2416.h>
+ #include <plat/devs.h>
+ #include <plat/cpu.h>
+ #include <plat/sdhci.h>
+ #include <plat/pm.h>
+ #include <plat/iic-core.h>
+ #include <plat/fb-core.h>
+ #include <plat/nand-core.h>
+ #include <plat/adc-core.h>
+ static struct map_desc s3c2416_iodesc[] __initdata = {
+       IODESC_ENT(WATCHDOG),
+       IODESC_ENT(CLKPWR),
+       IODESC_ENT(TIMER),
+ };
+ struct bus_type s3c2416_subsys = {
+       .name = "s3c2416-core",
+       .dev_name = "s3c2416-core",
+ };
+ static struct device s3c2416_dev = {
+       .bus            = &s3c2416_subsys,
+ };
+ void s3c2416_restart(char mode, const char *cmd)
+ {
+       if (mode == 's')
+               soft_restart(0);
+       __raw_writel(S3C2443_SWRST_RESET, S3C2443_SWRST);
+ }
+ int __init s3c2416_init(void)
+ {
+       printk(KERN_INFO "S3C2416: Initializing architecture\n");
+       /* change WDT IRQ number */
+       s3c_device_wdt.resource[1].start = IRQ_S3C2443_WDT;
+       s3c_device_wdt.resource[1].end   = IRQ_S3C2443_WDT;
+       /* the i2c devices are directly compatible with s3c2440 */
+       s3c_i2c0_setname("s3c2440-i2c");
+       s3c_i2c1_setname("s3c2440-i2c");
+       s3c_fb_setname("s3c2443-fb");
+       s3c_adc_setname("s3c2416-adc");
+ #ifdef CONFIG_PM
+       register_syscore_ops(&s3c2416_pm_syscore_ops);
+ #endif
+       register_syscore_ops(&s3c24xx_irq_syscore_ops);
+       return device_register(&s3c2416_dev);
+ }
+ void __init s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no)
+ {
+       s3c24xx_init_uartdevs("s3c2440-uart", s3c2410_uart_resources, cfg, no);
+       s3c_nand_setname("s3c2412-nand");
+ }
+ /* s3c2416_map_io
+  *
+  * register the standard cpu IO areas, and any passed in from the
+  * machine specific initialisation.
+  */
+ void __init s3c2416_map_io(void)
+ {
+       s3c24xx_gpiocfg_default.set_pull = samsung_gpio_setpull_updown;
+       s3c24xx_gpiocfg_default.get_pull = samsung_gpio_getpull_updown;
+       /* initialize device information early */
+       s3c2416_default_sdhci0();
+       s3c2416_default_sdhci1();
+       iotable_init(s3c2416_iodesc, ARRAY_SIZE(s3c2416_iodesc));
+ }
+ /* need to register the subsystem 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 s3c2416 based system)
+  * as a driver which may support both 2443 and 2440 may try and use it.
+ */
+ static int __init s3c2416_core_init(void)
+ {
+       return subsys_system_register(&s3c2416_subsys, NULL);
+ }
+ core_initcall(s3c2416_core_init);
Simple merge
Simple merge