Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 02:08:06 +0000 (19:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 18 Mar 2011 02:08:06 +0000 (19:08 -0700)
* 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm: (289 commits)
  davinci: DM644x EVM: register MUSB device earlier
  davinci: add spi devices on tnetv107x evm
  davinci: add ssp config for tnetv107x evm board
  davinci: add tnetv107x ssp platform device
  spi: add ti-ssp spi master driver
  mfd: add driver for sequencer serial port
  ARM: EXYNOS4: Implement Clock gating for System MMU
  ARM: EXYNOS4: Enhancement of System MMU driver
  ARM: EXYNOS4: Add support for gpio interrupts
  ARM: S5P: Add function to register gpio interrupt bank data
  ARM: S5P: Cleanup S5P gpio interrupt code
  ARM: EXYNOS4: Add missing GPYx banks
  ARM: S3C64XX: Fix section mismatch from cpufreq init
  ARM: EXYNOS4: Add keypad device to the SMDKV310
  ARM: EXYNOS4: Update clocks for keypad
  ARM: EXYNOS4: Update keypad base address
  ARM: EXYNOS4: Add keypad device helpers
  ARM: EXYNOS4: Add support for SATA on ARMLEX4210
  plat-nomadik: make GPIO interrupts work with cpuidle ApSleep
  mach-u300: define a dummy filter function for coh901318
  ...

Fix up various conflicts in
 - arch/arm/mach-exynos4/cpufreq.c
 - arch/arm/mach-mxs/gpio.c
 - drivers/net/Kconfig
 - drivers/tty/serial/Kconfig
 - drivers/tty/serial/Makefile
 - drivers/usb/gadget/fsl_mxc_udc.c
 - drivers/video/Kconfig

16 files changed:
1  2 
MAINTAINERS
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-exynos4/cpufreq.c
arch/arm/mach-exynos4/include/mach/memory.h
arch/arm/mach-mx3/mach-kzm_arm11_01.c
arch/arm/mach-mxs/gpio.c
arch/arm/mach-s3c2440/mach-gta02.c
arch/arm/mach-tcc8k/board-tcc8000-sdk.c
arch/arm/mm/Kconfig
drivers/mfd/Kconfig
drivers/mfd/Makefile
drivers/tty/serial/Kconfig
drivers/tty/serial/Makefile
drivers/video/Kconfig
drivers/video/Makefile

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
index 0000000000000000000000000000000000000000,a16ac35747a9c201618f5ac214acc2cb4aac59e4..a1bd258f0c4d52c00eaabe4c9619aad3a7743dff
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,570 +1,569 @@@
 -static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy,
 -                                 pm_message_t pmsg)
+ /* linux/arch/arm/mach-exynos4/cpufreq.c
+  *
+  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+  *            http://www.samsung.com
+  *
+  * EXYNOS4 - CPU frequency scaling 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 <linux/types.h>
+ #include <linux/kernel.h>
+ #include <linux/err.h>
+ #include <linux/clk.h>
+ #include <linux/io.h>
+ #include <linux/slab.h>
+ #include <linux/regulator/consumer.h>
+ #include <linux/cpufreq.h>
+ #include <mach/map.h>
+ #include <mach/regs-clock.h>
+ #include <mach/regs-mem.h>
+ #include <plat/clock.h>
+ #include <plat/pm.h>
+ static struct clk *cpu_clk;
+ static struct clk *moutcore;
+ static struct clk *mout_mpll;
+ static struct clk *mout_apll;
+ static struct regulator *arm_regulator;
+ static struct regulator *int_regulator;
+ static struct cpufreq_freqs freqs;
+ static unsigned int memtype;
+ enum exynos4_memory_type {
+       DDR2 = 4,
+       LPDDR2,
+       DDR3,
+ };
+ enum cpufreq_level_index {
+       L0, L1, L2, L3, CPUFREQ_LEVEL_END,
+ };
+ static struct cpufreq_frequency_table exynos4_freq_table[] = {
+       {L0, 1000*1000},
+       {L1, 800*1000},
+       {L2, 400*1000},
+       {L3, 100*1000},
+       {0, CPUFREQ_TABLE_END},
+ };
+ static unsigned int clkdiv_cpu0[CPUFREQ_LEVEL_END][7] = {
+       /*
+        * Clock divider value for following
+        * { DIVCORE, DIVCOREM0, DIVCOREM1, DIVPERIPH,
+        *              DIVATB, DIVPCLK_DBG, DIVAPLL }
+        */
+       /* ARM L0: 1000MHz */
+       { 0, 3, 7, 3, 3, 0, 1 },
+       /* ARM L1: 800MHz */
+       { 0, 3, 7, 3, 3, 0, 1 },
+       /* ARM L2: 400MHz */
+       { 0, 1, 3, 1, 3, 0, 1 },
+       /* ARM L3: 100MHz */
+       { 0, 0, 1, 0, 3, 1, 1 },
+ };
+ static unsigned int clkdiv_cpu1[CPUFREQ_LEVEL_END][2] = {
+       /*
+        * Clock divider value for following
+        * { DIVCOPY, DIVHPM }
+        */
+        /* ARM L0: 1000MHz */
+       { 3, 0 },
+       /* ARM L1: 800MHz */
+       { 3, 0 },
+       /* ARM L2: 400MHz */
+       { 3, 0 },
+       /* ARM L3: 100MHz */
+       { 3, 0 },
+ };
+ static unsigned int clkdiv_dmc0[CPUFREQ_LEVEL_END][8] = {
+       /*
+        * Clock divider value for following
+        * { DIVACP, DIVACP_PCLK, DIVDPHY, DIVDMC, DIVDMCD
+        *              DIVDMCP, DIVCOPY2, DIVCORE_TIMERS }
+        */
+       /* DMC L0: 400MHz */
+       { 3, 1, 1, 1, 1, 1, 3, 1 },
+       /* DMC L1: 400MHz */
+       { 3, 1, 1, 1, 1, 1, 3, 1 },
+       /* DMC L2: 266.7MHz */
+       { 7, 1, 1, 2, 1, 1, 3, 1 },
+       /* DMC L3: 200MHz */
+       { 7, 1, 1, 3, 1, 1, 3, 1 },
+ };
+ static unsigned int clkdiv_top[CPUFREQ_LEVEL_END][5] = {
+       /*
+        * Clock divider value for following
+        * { DIVACLK200, DIVACLK100, DIVACLK160, DIVACLK133, DIVONENAND }
+        */
+       /* ACLK200 L0: 200MHz */
+       { 3, 7, 4, 5, 1 },
+       /* ACLK200 L1: 200MHz */
+       { 3, 7, 4, 5, 1 },
+       /* ACLK200 L2: 160MHz */
+       { 4, 7, 5, 7, 1 },
+       /* ACLK200 L3: 133.3MHz */
+       { 5, 7, 7, 7, 1 },
+ };
+ static unsigned int clkdiv_lr_bus[CPUFREQ_LEVEL_END][2] = {
+       /*
+        * Clock divider value for following
+        * { DIVGDL/R, DIVGPL/R }
+        */
+       /* ACLK_GDL/R L0: 200MHz */
+       { 3, 1 },
+       /* ACLK_GDL/R L1: 200MHz */
+       { 3, 1 },
+       /* ACLK_GDL/R L2: 160MHz */
+       { 4, 1 },
+       /* ACLK_GDL/R L3: 133.3MHz */
+       { 5, 1 },
+ };
+ struct cpufreq_voltage_table {
+       unsigned int    index;          /* any */
+       unsigned int    arm_volt;       /* uV */
+       unsigned int    int_volt;
+ };
+ static struct cpufreq_voltage_table exynos4_volt_table[CPUFREQ_LEVEL_END] = {
+       {
+               .index          = L0,
+               .arm_volt       = 1200000,
+               .int_volt       = 1100000,
+       }, {
+               .index          = L1,
+               .arm_volt       = 1100000,
+               .int_volt       = 1100000,
+       }, {
+               .index          = L2,
+               .arm_volt       = 1000000,
+               .int_volt       = 1000000,
+       }, {
+               .index          = L3,
+               .arm_volt       = 900000,
+               .int_volt       = 1000000,
+       },
+ };
+ static unsigned int exynos4_apll_pms_table[CPUFREQ_LEVEL_END] = {
+       /* APLL FOUT L0: 1000MHz */
+       ((250 << 16) | (6 << 8) | 1),
+       /* APLL FOUT L1: 800MHz */
+       ((200 << 16) | (6 << 8) | 1),
+       /* APLL FOUT L2 : 400MHz */
+       ((200 << 16) | (6 << 8) | 2),
+       /* APLL FOUT L3: 100MHz */
+       ((200 << 16) | (6 << 8) | 4),
+ };
+ int exynos4_verify_speed(struct cpufreq_policy *policy)
+ {
+       return cpufreq_frequency_table_verify(policy, exynos4_freq_table);
+ }
+ unsigned int exynos4_getspeed(unsigned int cpu)
+ {
+       return clk_get_rate(cpu_clk) / 1000;
+ }
+ void exynos4_set_clkdiv(unsigned int div_index)
+ {
+       unsigned int tmp;
+       /* Change Divider - CPU0 */
+       tmp = __raw_readl(S5P_CLKDIV_CPU);
+       tmp &= ~(S5P_CLKDIV_CPU0_CORE_MASK | S5P_CLKDIV_CPU0_COREM0_MASK |
+               S5P_CLKDIV_CPU0_COREM1_MASK | S5P_CLKDIV_CPU0_PERIPH_MASK |
+               S5P_CLKDIV_CPU0_ATB_MASK | S5P_CLKDIV_CPU0_PCLKDBG_MASK |
+               S5P_CLKDIV_CPU0_APLL_MASK);
+       tmp |= ((clkdiv_cpu0[div_index][0] << S5P_CLKDIV_CPU0_CORE_SHIFT) |
+               (clkdiv_cpu0[div_index][1] << S5P_CLKDIV_CPU0_COREM0_SHIFT) |
+               (clkdiv_cpu0[div_index][2] << S5P_CLKDIV_CPU0_COREM1_SHIFT) |
+               (clkdiv_cpu0[div_index][3] << S5P_CLKDIV_CPU0_PERIPH_SHIFT) |
+               (clkdiv_cpu0[div_index][4] << S5P_CLKDIV_CPU0_ATB_SHIFT) |
+               (clkdiv_cpu0[div_index][5] << S5P_CLKDIV_CPU0_PCLKDBG_SHIFT) |
+               (clkdiv_cpu0[div_index][6] << S5P_CLKDIV_CPU0_APLL_SHIFT));
+       __raw_writel(tmp, S5P_CLKDIV_CPU);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STATCPU);
+       } while (tmp & 0x1111111);
+       /* Change Divider - CPU1 */
+       tmp = __raw_readl(S5P_CLKDIV_CPU1);
+       tmp &= ~((0x7 << 4) | 0x7);
+       tmp |= ((clkdiv_cpu1[div_index][0] << 4) |
+               (clkdiv_cpu1[div_index][1] << 0));
+       __raw_writel(tmp, S5P_CLKDIV_CPU1);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STATCPU1);
+       } while (tmp & 0x11);
+       /* Change Divider - DMC0 */
+       tmp = __raw_readl(S5P_CLKDIV_DMC0);
+       tmp &= ~(S5P_CLKDIV_DMC0_ACP_MASK | S5P_CLKDIV_DMC0_ACPPCLK_MASK |
+               S5P_CLKDIV_DMC0_DPHY_MASK | S5P_CLKDIV_DMC0_DMC_MASK |
+               S5P_CLKDIV_DMC0_DMCD_MASK | S5P_CLKDIV_DMC0_DMCP_MASK |
+               S5P_CLKDIV_DMC0_COPY2_MASK | S5P_CLKDIV_DMC0_CORETI_MASK);
+       tmp |= ((clkdiv_dmc0[div_index][0] << S5P_CLKDIV_DMC0_ACP_SHIFT) |
+               (clkdiv_dmc0[div_index][1] << S5P_CLKDIV_DMC0_ACPPCLK_SHIFT) |
+               (clkdiv_dmc0[div_index][2] << S5P_CLKDIV_DMC0_DPHY_SHIFT) |
+               (clkdiv_dmc0[div_index][3] << S5P_CLKDIV_DMC0_DMC_SHIFT) |
+               (clkdiv_dmc0[div_index][4] << S5P_CLKDIV_DMC0_DMCD_SHIFT) |
+               (clkdiv_dmc0[div_index][5] << S5P_CLKDIV_DMC0_DMCP_SHIFT) |
+               (clkdiv_dmc0[div_index][6] << S5P_CLKDIV_DMC0_COPY2_SHIFT) |
+               (clkdiv_dmc0[div_index][7] << S5P_CLKDIV_DMC0_CORETI_SHIFT));
+       __raw_writel(tmp, S5P_CLKDIV_DMC0);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STAT_DMC0);
+       } while (tmp & 0x11111111);
+       /* Change Divider - TOP */
+       tmp = __raw_readl(S5P_CLKDIV_TOP);
+       tmp &= ~(S5P_CLKDIV_TOP_ACLK200_MASK | S5P_CLKDIV_TOP_ACLK100_MASK |
+               S5P_CLKDIV_TOP_ACLK160_MASK | S5P_CLKDIV_TOP_ACLK133_MASK |
+               S5P_CLKDIV_TOP_ONENAND_MASK);
+       tmp |= ((clkdiv_top[div_index][0] << S5P_CLKDIV_TOP_ACLK200_SHIFT) |
+               (clkdiv_top[div_index][1] << S5P_CLKDIV_TOP_ACLK100_SHIFT) |
+               (clkdiv_top[div_index][2] << S5P_CLKDIV_TOP_ACLK160_SHIFT) |
+               (clkdiv_top[div_index][3] << S5P_CLKDIV_TOP_ACLK133_SHIFT) |
+               (clkdiv_top[div_index][4] << S5P_CLKDIV_TOP_ONENAND_SHIFT));
+       __raw_writel(tmp, S5P_CLKDIV_TOP);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STAT_TOP);
+       } while (tmp & 0x11111);
+       /* Change Divider - LEFTBUS */
+       tmp = __raw_readl(S5P_CLKDIV_LEFTBUS);
+       tmp &= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);
+       tmp |= ((clkdiv_lr_bus[div_index][0] << S5P_CLKDIV_BUS_GDLR_SHIFT) |
+               (clkdiv_lr_bus[div_index][1] << S5P_CLKDIV_BUS_GPLR_SHIFT));
+       __raw_writel(tmp, S5P_CLKDIV_LEFTBUS);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STAT_LEFTBUS);
+       } while (tmp & 0x11);
+       /* Change Divider - RIGHTBUS */
+       tmp = __raw_readl(S5P_CLKDIV_RIGHTBUS);
+       tmp &= ~(S5P_CLKDIV_BUS_GDLR_MASK | S5P_CLKDIV_BUS_GPLR_MASK);
+       tmp |= ((clkdiv_lr_bus[div_index][0] << S5P_CLKDIV_BUS_GDLR_SHIFT) |
+               (clkdiv_lr_bus[div_index][1] << S5P_CLKDIV_BUS_GPLR_SHIFT));
+       __raw_writel(tmp, S5P_CLKDIV_RIGHTBUS);
+       do {
+               tmp = __raw_readl(S5P_CLKDIV_STAT_RIGHTBUS);
+       } while (tmp & 0x11);
+ }
+ static void exynos4_set_apll(unsigned int index)
+ {
+       unsigned int tmp;
+       /* 1. MUX_CORE_SEL = MPLL, ARMCLK uses MPLL for lock time */
+       clk_set_parent(moutcore, mout_mpll);
+       do {
+               tmp = (__raw_readl(S5P_CLKMUX_STATCPU)
+                       >> S5P_CLKSRC_CPU_MUXCORE_SHIFT);
+               tmp &= 0x7;
+       } while (tmp != 0x2);
+       /* 2. Set APLL Lock time */
+       __raw_writel(S5P_APLL_LOCKTIME, S5P_APLL_LOCK);
+       /* 3. Change PLL PMS values */
+       tmp = __raw_readl(S5P_APLL_CON0);
+       tmp &= ~((0x3ff << 16) | (0x3f << 8) | (0x7 << 0));
+       tmp |= exynos4_apll_pms_table[index];
+       __raw_writel(tmp, S5P_APLL_CON0);
+       /* 4. wait_lock_time */
+       do {
+               tmp = __raw_readl(S5P_APLL_CON0);
+       } while (!(tmp & (0x1 << S5P_APLLCON0_LOCKED_SHIFT)));
+       /* 5. MUX_CORE_SEL = APLL */
+       clk_set_parent(moutcore, mout_apll);
+       do {
+               tmp = __raw_readl(S5P_CLKMUX_STATCPU);
+               tmp &= S5P_CLKMUX_STATCPU_MUXCORE_MASK;
+       } while (tmp != (0x1 << S5P_CLKSRC_CPU_MUXCORE_SHIFT));
+ }
+ static void exynos4_set_frequency(unsigned int old_index, unsigned int new_index)
+ {
+       unsigned int tmp;
+       if (old_index > new_index) {
+               /* The frequency changing to L0 needs to change apll */
+               if (freqs.new == exynos4_freq_table[L0].frequency) {
+                       /* 1. Change the system clock divider values */
+                       exynos4_set_clkdiv(new_index);
+                       /* 2. Change the apll m,p,s value */
+                       exynos4_set_apll(new_index);
+               } else {
+                       /* 1. Change the system clock divider values */
+                       exynos4_set_clkdiv(new_index);
+                       /* 2. Change just s value in apll m,p,s value */
+                       tmp = __raw_readl(S5P_APLL_CON0);
+                       tmp &= ~(0x7 << 0);
+                       tmp |= (exynos4_apll_pms_table[new_index] & 0x7);
+                       __raw_writel(tmp, S5P_APLL_CON0);
+               }
+       }
+       else if (old_index < new_index) {
+               /* The frequency changing from L0 needs to change apll */
+               if (freqs.old == exynos4_freq_table[L0].frequency) {
+                       /* 1. Change the apll m,p,s value */
+                       exynos4_set_apll(new_index);
+                       /* 2. Change the system clock divider values */
+                       exynos4_set_clkdiv(new_index);
+               } else {
+                       /* 1. Change just s value in apll m,p,s value */
+                       tmp = __raw_readl(S5P_APLL_CON0);
+                       tmp &= ~(0x7 << 0);
+                       tmp |= (exynos4_apll_pms_table[new_index] & 0x7);
+                       __raw_writel(tmp, S5P_APLL_CON0);
+                       /* 2. Change the system clock divider values */
+                       exynos4_set_clkdiv(new_index);
+               }
+       }
+ }
+ static int exynos4_target(struct cpufreq_policy *policy,
+                         unsigned int target_freq,
+                         unsigned int relation)
+ {
+       unsigned int index, old_index;
+       unsigned int arm_volt, int_volt;
+       freqs.old = exynos4_getspeed(policy->cpu);
+       if (cpufreq_frequency_table_target(policy, exynos4_freq_table,
+                                          freqs.old, relation, &old_index))
+               return -EINVAL;
+       if (cpufreq_frequency_table_target(policy, exynos4_freq_table,
+                                          target_freq, relation, &index))
+               return -EINVAL;
+       freqs.new = exynos4_freq_table[index].frequency;
+       freqs.cpu = policy->cpu;
+       if (freqs.new == freqs.old)
+               return 0;
+       /* get the voltage value */
+       arm_volt = exynos4_volt_table[index].arm_volt;
+       int_volt = exynos4_volt_table[index].int_volt;
+       cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+       /* control regulator */
+       if (freqs.new > freqs.old) {
+               /* Voltage up */
+               regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
+               regulator_set_voltage(int_regulator, int_volt, int_volt);
+       }
+       /* Clock Configuration Procedure */
+       exynos4_set_frequency(old_index, index);
+       /* control regulator */
+       if (freqs.new < freqs.old) {
+               /* Voltage down */
+               regulator_set_voltage(arm_regulator, arm_volt, arm_volt);
+               regulator_set_voltage(int_regulator, int_volt, int_volt);
+       }
+       cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+       return 0;
+ }
+ #ifdef CONFIG_PM
++static int exynos4_cpufreq_suspend(struct cpufreq_policy *policy)
+ {
+       return 0;
+ }
+ static int exynos4_cpufreq_resume(struct cpufreq_policy *policy)
+ {
+       return 0;
+ }
+ #endif
+ static int exynos4_cpufreq_cpu_init(struct cpufreq_policy *policy)
+ {
+       policy->cur = policy->min = policy->max = exynos4_getspeed(policy->cpu);
+       cpufreq_frequency_table_get_attr(exynos4_freq_table, policy->cpu);
+       /* set the transition latency value */
+       policy->cpuinfo.transition_latency = 100000;
+       /*
+        * EXYNOS4 multi-core processors has 2 cores
+        * that the frequency cannot be set independently.
+        * Each cpu is bound to the same speed.
+        * So the affected cpu is all of the cpus.
+        */
+       cpumask_setall(policy->cpus);
+       return cpufreq_frequency_table_cpuinfo(policy, exynos4_freq_table);
+ }
+ static struct cpufreq_driver exynos4_driver = {
+       .flags          = CPUFREQ_STICKY,
+       .verify         = exynos4_verify_speed,
+       .target         = exynos4_target,
+       .get            = exynos4_getspeed,
+       .init           = exynos4_cpufreq_cpu_init,
+       .name           = "exynos4_cpufreq",
+ #ifdef CONFIG_PM
+       .suspend        = exynos4_cpufreq_suspend,
+       .resume         = exynos4_cpufreq_resume,
+ #endif
+ };
+ static int __init exynos4_cpufreq_init(void)
+ {
+       cpu_clk = clk_get(NULL, "armclk");
+       if (IS_ERR(cpu_clk))
+               return PTR_ERR(cpu_clk);
+       moutcore = clk_get(NULL, "moutcore");
+       if (IS_ERR(moutcore))
+               goto out;
+       mout_mpll = clk_get(NULL, "mout_mpll");
+       if (IS_ERR(mout_mpll))
+               goto out;
+       mout_apll = clk_get(NULL, "mout_apll");
+       if (IS_ERR(mout_apll))
+               goto out;
+       arm_regulator = regulator_get(NULL, "vdd_arm");
+       if (IS_ERR(arm_regulator)) {
+               printk(KERN_ERR "failed to get resource %s\n", "vdd_arm");
+               goto out;
+       }
+       int_regulator = regulator_get(NULL, "vdd_int");
+       if (IS_ERR(int_regulator)) {
+               printk(KERN_ERR "failed to get resource %s\n", "vdd_int");
+               goto out;
+       }
+       /*
+        * Check DRAM type.
+        * Because DVFS level is different according to DRAM type.
+        */
+       memtype = __raw_readl(S5P_VA_DMC0 + S5P_DMC0_MEMCON_OFFSET);
+       memtype = (memtype >> S5P_DMC0_MEMTYPE_SHIFT);
+       memtype &= S5P_DMC0_MEMTYPE_MASK;
+       if ((memtype < DDR2) && (memtype > DDR3)) {
+               printk(KERN_ERR "%s: wrong memtype= 0x%x\n", __func__, memtype);
+               goto out;
+       } else {
+               printk(KERN_DEBUG "%s: memtype= 0x%x\n", __func__, memtype);
+       }
+       return cpufreq_register_driver(&exynos4_driver);
+ out:
+       if (!IS_ERR(cpu_clk))
+               clk_put(cpu_clk);
+       if (!IS_ERR(moutcore))
+               clk_put(moutcore);
+       if (!IS_ERR(mout_mpll))
+               clk_put(mout_mpll);
+       if (!IS_ERR(mout_apll))
+               clk_put(mout_apll);
+       if (!IS_ERR(arm_regulator))
+               regulator_put(arm_regulator);
+       if (!IS_ERR(int_regulator))
+               regulator_put(int_regulator);
+       printk(KERN_ERR "%s: failed initialization\n", __func__);
+       return -EINVAL;
+ }
+ late_initcall(exynos4_cpufreq_init);
index 0000000000000000000000000000000000000000,39b47d06f9bb844de8039263955782a685ab0438..374ef2cf7152c366fe56388909f751dac4d658c0
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,22 +1,22 @@@
 -#define PHYS_OFFSET           UL(0x40000000)
+ /* linux/arch/arm/mach-exynos4/include/mach/memory.h
+  *
+  * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
+  *            http://www.samsung.com
+  *
+  * EXYNOS4 - Memory definitions
+  *
+  * 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_MEMORY_H
+ #define __ASM_ARCH_MEMORY_H __FILE__
++#define PLAT_PHYS_OFFSET              UL(0x40000000)
+ /* Maximum of 256MiB in one bank */
+ #define MAX_PHYSMEM_BITS      32
+ #define SECTION_SIZE_BITS     28
+ #endif /* __ASM_ARCH_MEMORY_H */
Simple merge
index 61991e4dde44226810aa848d4228db0a0dc173ee,5120ab58707c74cf26d4144243fb574dde830d5e..56fa2ed15222654446a6bb317818542bbe7ecb4f
@@@ -182,11 -182,12 +182,12 @@@ static int mxs_gpio_set_wake_irq(struc
  }
  
  static struct irq_chip gpio_irq_chip = {
 -      .ack = mxs_gpio_ack_irq,
 -      .mask = mxs_gpio_mask_irq,
 -      .unmask = mxs_gpio_unmask_irq,
 -      .set_type = mxs_gpio_set_irq_type,
 -      .set_wake = mxs_gpio_set_wake_irq,
+       .name = "mxs gpio",
 +      .irq_ack = mxs_gpio_ack_irq,
 +      .irq_mask = mxs_gpio_mask_irq,
 +      .irq_unmask = mxs_gpio_unmask_irq,
 +      .irq_set_type = mxs_gpio_set_irq_type,
 +      .irq_set_wake = mxs_gpio_set_wake_irq,
  };
  
  static void mxs_set_gpio_direction(struct gpio_chip *chip, unsigned offset,
Simple merge
Simple merge
Simple merge
Simple merge
index e461be164f6775fba088416a63b71bb33e8f1d22,aa9d3d11031dcc00ddc0bcdafddd6375c5c2b908..e1aee37270f5e1f41407d6bf56357ae3c298eda6
@@@ -1585,17 -1597,18 +1585,31 @@@ config SERIAL_PCH_UAR
          which is an IOH(Input/Output Hub) for x86 embedded processor.
          Enabling PCH_DMA, this PCH UART works as DMA mode.
  
 +        This driver also can be used for OKI SEMICONDUCTOR ML7213 IOH(Input/
 +        Output Hub) which is for IVI(In-Vehicle Infotainment) use.
 +        ML7213 is companion chip for Intel Atom E6xx series.
 +        ML7213 is completely compatible for Intel EG20T PCH.
 +
 +config SERIAL_MSM_SMD
 +      bool "Enable tty device interface for some SMD ports"
 +      default n
 +      depends on MSM_SMD
 +      help
 +        Enables userspace clients to read and write to some streaming SMD
 +        ports via tty device interface for MSM chipset.
 +
+ config SERIAL_MXS_AUART
+       depends on ARCH_MXS
+       tristate "MXS AUART support"
+       select SERIAL_CORE
+       help
+         This driver supports the MXS Application UART (AUART) port.
+ config SERIAL_MXS_AUART_CONSOLE
+       bool "MXS AUART console support"
+       depends on SERIAL_MXS_AUART=y
+       select SERIAL_CORE_CONSOLE
+       help
+         Enable a MXS AUART port to be the system console.
  endmenu
index 31e868cb49b2ea401ec8004266f34ac28608ac2b,c8550719de5ac26f27635241e1046a6ae84fbb98..fee0690ef8e330c8048913fb510c37897093d494
@@@ -92,4 -92,4 +92,5 @@@ obj-$(CONFIG_SERIAL_MRST_MAX3110)     += mr
  obj-$(CONFIG_SERIAL_MFD_HSU)  += mfd.o
  obj-$(CONFIG_SERIAL_IFX6X60)          += ifx6x60.o
  obj-$(CONFIG_SERIAL_PCH_UART) += pch_uart.o
 +obj-$(CONFIG_SERIAL_MSM_SMD)  += msm_smd_tty.o
+ obj-$(CONFIG_SERIAL_MXS_AUART) += mxs-auart.o
index bfc62d1ee2f7a505d9d98a5056fc6990ae2b56d1,e0ea23f07dd1206e357f4dd60208bc569b501a94..e6a8d8c0101d6185a9adc1645e45e3d7feca7c81
@@@ -2321,17 -2365,15 +2321,26 @@@ config FB_JZ474
        help
          Framebuffer support for the JZ4740 SoC.
  
+ config FB_MXS
+       tristate "MXS LCD framebuffer support"
+       depends on FB && ARCH_MXS
+       select FB_CFB_FILLRECT
+       select FB_CFB_COPYAREA
+       select FB_CFB_IMAGEBLIT
+       help
+         Framebuffer support for the MXS SoC.
 +config FB_PUV3_UNIGFX
 +      tristate "PKUnity v3 Unigfx framebuffer support"
 +      depends on FB && UNICORE32 && ARCH_PUV3
 +      select FB_SYS_FILLRECT
 +      select FB_SYS_COPYAREA
 +      select FB_SYS_IMAGEBLIT
 +      select FB_SYS_FOPS
 +      help
 +        Choose this option if you want to use the Unigfx device as a
 +        framebuffer device. Without the support of PCI & AGP.
 +
  source "drivers/video/omap/Kconfig"
  source "drivers/video/omap2/Kconfig"
  
Simple merge